From bd5d658539eed3e4a7c328cc74c49d75a4bcd2cd Mon Sep 17 00:00:00 2001 From: rforstner Date: Fri, 21 Jan 2022 14:18:45 +0100 Subject: [PATCH] adding new script --- createReport.py | 20 +++++++++++++++++--- environment.yaml | 4 ++-- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/createReport.py b/createReport.py index ba94ca2..97b4132 100644 --- a/createReport.py +++ b/createReport.py @@ -184,7 +184,7 @@ def main(): DTURL = url.get('env-url') - + ###Calc daily SLO df = pd.DataFrame() for index, row in days.iterrows(): temp_df = getSLO(DTTOKEN,DTURL,row['startTime'],row['endTime']) @@ -197,12 +197,26 @@ def main(): df = df[['Date', 'id', 'enabled', 'name', 'description', 'evaluatedPercentage', 'errorBudget', 'status', 'error', 'target','warning', 'evaluationType', 'timeframe', 'metricExpression', 'filter']] except Exception as e: print("Could not rearrange columns: " + str(e)) - - writer = pd.ExcelWriter("./"+ item +'.xlsx') + writer = pd.ExcelWriter("./"+ item +'_daily.xlsx') df.to_excel(writer, sheet_name=str(item).split(" ")[0]) writer.save() + + ###Calc Overall SLO + df = getSLO(DTTOKEN,DTURL,days['startTime'].min(),days['endTime'].max()) + df['StartDate'] = fromDate + df['EndDate'] = toDate + try: + df = df[['StartDate', 'EndDate', 'id', 'enabled', 'name', 'description', 'evaluatedPercentage', 'errorBudget', 'status', 'error', 'target','warning', 'evaluationType', 'timeframe', 'metricExpression', 'filter']] + except Exception as e: + print("Could not rearrange columns: " + str(e)) + + writer = pd.ExcelWriter("./"+ item +'_total.xlsx') + df.to_excel(writer, sheet_name=str(item).split(" ")[0]) + writer.save() + + else: print("token not found, skipping " + item) diff --git a/environment.yaml b/environment.yaml index b8043ad..bdb214e 100644 --- a/environment.yaml +++ b/environment.yaml @@ -13,12 +13,12 @@ euprod: - env-url: "https://onb44935.live.dynatrace.com" - env-token-name: "NAPREPROD_TOKEN_VAR" - jenkins: "https://jaws.bmwgroup.net/opapm/" -naprod: +#naprod: - name: "naprod" - env-url: "https://wgv50241.live.dynatrace.com" - env-token-name: "NAPROD_TOKEN_VAR" - jenkins: "https://jaws.bmwgroup.net/opapm/" -cnprod: +#cnprod: - name: "cnprod" - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b" - env-token-name: "CNPROD_TOKEN_VAR"