jenkinsfile online editiert mit Bitbucket

added xibix verteiler

createKeyRequestReport.py

@@ -12,7 +12,8 @@ import dynatraceAPI
 # import types
 from KRParser import krparser
 #from key_request_parser import krparser
-
+import time
+#from datetime import datetime
 warnings.filterwarnings("ignore")
 
 
@@ -54,10 +55,11 @@ def write_to_excel(ignored, noData1M, noData1W, all_TP_slos):
     
 def getStats(krs):
     
-    
+    ts = time.time()
+    epoch = datetime.datetime.now().timestamp()
     tmpIgnoredList=[]
     for kr in [a for a in krs if len(a.keyRequests) == 0]:
-        tmpIgnoredList.append([kr.metadata["sloName"], kr.metadata["sloId"], kr.metadata["env"],"","","","",kr.metadata["filter"], kr.metadata["metricExpression"]])
+        tmpIgnoredList.append([kr.metadata["sloName"], kr.metadata["sloId"], kr.metadata["env"],"","","","","",kr.metadata["filter"], kr.metadata["metricExpression"], "", epoch])
     
     
     
@@ -65,24 +67,28 @@ def getStats(krs):
     for kr in [s for s in krs if s.hasNoData("1M")==True]:
          for k in kr.getKeyRequestByHasData("1M"):
              noData1M.append([kr.metadata["sloName"], kr.metadata["sloId"], kr.metadata["env"], k["displayName"], k["entityId"],k["services"][0]["displayName"] if len(k["services"]) > 0 else "", 
-                              [x for x in k["services"][0]["tags"] if x['key']=="compass-id"][0]["value"] if len(k["services"]) > 0 and len(k["services"][0]["tags"]) > 0 and len([x for x in k["services"][0]["tags"] if x['key']=="compass-id"]) > 0 else "", 
+                              [x for x in k["services"][0]["tags"] if x['key']=="compass-id"][0]["value"] if len(k["services"]) > 0 and len(k["services"][0]["tags"]) > 0 and len([x for x in k["services"][0]["tags"] if x['key']=="compass-id"]) > 0 else "",
+                              k["_mInSloDef"],
                               kr.metadata["filter"], 
-                              kr.metadata["metricExpression"]])
+                              kr.metadata["metricExpression"],
+                              kr.matchedGroups._list[0]['pattern'], epoch])
     
     noData1W=[]
     for kr in [s for s in krs if s.hasNoData("1W")==True]:
          for k in kr.getKeyRequestByHasData("1W"):
              noData1W.append([kr.metadata["sloName"], kr.metadata["sloId"], kr.metadata["env"], k["displayName"], k["entityId"], k["services"][0]["displayName"] if len(k["services"]) > 0 else "", 
                               [x for x in k["services"][0]["tags"] if x['key']=="compass-id"][0]["value"] if len(k["services"]) > 0 and len(k["services"][0]["tags"]) > 0 and len([x for x in k["services"][0]["tags"] if x['key']=="compass-id"]) > 0 else "", 
+                              k["_mInSloDef"],
                               kr.metadata["filter"], 
-                              kr.metadata["metricExpression"]])         
+                              kr.metadata["metricExpression"],
+                              kr.matchedGroups._list[0]['pattern'], epoch])         
              
     # noData1W=[]
     # for kr in [s for s in krs if s.hasNoData1WKeyRequests()==True]:
     #     for k in kr.getNoData1WKeyRequests():
     #          noData1W.append([kr.metadata["sloName"],  kr.metadata["env"], k["displayName"], k["entityId"], kr.metadata["filter"], kr.metadata["metricExpression"]])        
     
-    columns =['slo', 'sloID', 'env', 'displayName','entityId','service','compass-id','filter', 'metricExpression']
+    columns =['slo', 'sloID', 'env', 'displayName','entityId','service','compass-id','InSloDef','filter', 'metricExpression','pattern', 'timestamp']
     ignored=pd.DataFrame(tmpIgnoredList, columns=columns)
     noData_1M=pd.DataFrame(noData1M, columns = columns)
     noData_1W=pd.DataFrame(noData1W, columns = columns)
@@ -94,9 +100,10 @@ def getStats(krs):
                               k["count"]["1W"], k["count"]["1M"], 
                               k["services"][0]["displayName"] if len(k["services"]) > 0 else "", 
                               [x for x in k["services"][0]["tags"] if x['key']=="compass-id"][0]["value"] if len(k["services"]) > 0 and len(k["services"][0]["tags"]) > 0 and len([x for x in k["services"][0]["tags"] if x['key']=="compass-id"]) > 0 else "", 
-                              kr.metadata["filter"], kr.metadata["metricExpression"]])
+                              k["_mInSloDef"],
+                              kr.metadata["filter"], kr.metadata["metricExpression"], kr.matchedGroups._list[0]['pattern'], epoch])
             
-    columns_ext =['slo', 'sloID', 'env', 'displayName','entityId','Count_1W', 'Count_1M','service','compass-id','filter', 'metricExpression']
+    columns_ext =['slo', 'sloID', 'env', 'displayName','entityId','Count_1W', 'Count_1M','service','compass-id','InSloDef', 'filter', 'metricExpression', 'pattern', 'timestamp']
     all_TP_slos=pd.DataFrame(allTPSlos, columns = columns_ext)
 
     return ignored, noData_1M, noData_1W, all_TP_slos

environment.yaml

@@ -4,16 +4,16 @@ euprod:
     - env-url: "https://xxu26128.live.dynatrace.com"
     - env-token-name: "EUPROD_TOKEN_VAR"
     - jenkins: "https://jaws.bmwgroup.net/opapm/"
-# naprod:
-#     - name: "naprod"
-#     - env-url: "https://wgv50241.live.dynatrace.com"
-#     - env-token-name: "NAPROD_TOKEN_VAR"
-#     - jenkins: "https://jaws.bmwgroup.net/opapm/"
-# cnprod:
-#     - name: "cnprod"
-#     - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
-#     - env-token-name: "CNPROD_TOKEN_VAR"
-#     - jenkins: "https://jaws-china.bmwgroup.net/opmaas/"
+naprod:
+    - name: "naprod"
+    - env-url: "https://wgv50241.live.dynatrace.com"
+    - env-token-name: "NAPROD_TOKEN_VAR"
+    - jenkins: "https://jaws.bmwgroup.net/opapm/"
+cnprod:
+    - name: "cnprod"
+    - env-url: "https://dyna-synth-cn.bmwgroup.com.cn/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b"
+    - env-token-name: "CNPROD_TOKEN_VAR"
+    - jenkins: "https://jaws-china.bmwgroup.net/opmaas/"
 # #cnpreprod:
 #     - name: "cnpreprod"
 #     - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35"

jenkinsfile

@@ -57,7 +57,7 @@
                         emailext subject: env.JOB_NAME,
                             mimeType: 'text/html',
                             body: tmp_body,
-                            to: 'ermis.wieger@nttdata.com, Andreas.DB.Danzer@bmwgroup.com, Mohammed.Abadel@bmw.de',
+                            to: 'omt-xibix@list.bmw.com, mohammed.abadel@bmw.de , Andreas.DB.Danzer@bmwgroup.com, Ermis.Wieger@nttdata.com',
                             //to: 'ermis.wieger@nttdata.com',
                           	replyTo: 'coco-apm@bmw.de',
                             attachmentsPattern: '*.xlsx'
@@ -75,7 +75,7 @@
         failure {
             emailext subject: "${env.JOB_NAME} build ${env.BUILD_ID} failed",
 				body: "QM report failed, see logs for details: ${env.BUILD_URL}", 
-				to: 'ermis.wieger@nttdata.com'
+				to: 'ops-xibix@list.bmw.com, omo-xibix@list.bmw.com, omo@bmwgroup.com, Ermis.Wieger@nttdata.com, '
         }
         always { 
             cleanWs()