arnaua
/
keyrequest_monitor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: arnaua:73b1bebee5bcfcdb6e0323aaa1125b9c39732f8b
Branches Tags
arnaua:master
...
compare: arnaua:df854a7ecf208e6c376e8e0a3b64ac983165105d
Branches Tags
arnaua:master

10 Commits
73b1bebee5 ... df854a7ecf

Author SHA1 Message Date
Andreas Danzer (DE-701) df854a7ecf jenkinsfile online editiert mit Bitbucket 
added xibix verteiler
 2023-07-07 15:00:08 +00:00
SLW\ARNAUA 63a0eeaeab OPMAAS-4466 - Change recipient for reports 2023-06-21 14:50:24 +02:00
ermisw 66540edb3b fix 2023-06-20 16:05:36 +02:00
ermisw 234c0b22fc fix 2023-06-20 15:50:34 +02:00
ermisw 9c00ea09f5 Merge branch 'master' of https://atc.bmwgroup.net/bitbucket/scm/opapm/keyrequest_monitor 2023-06-20 15:48:17 +02:00
ermisw 585ea28bd1 OPMAAS-4180 2023-06-20 15:46:26 +02:00
Andreas Danzer (DE-701) a3684d481b jenkinsfile online editiert mit Bitbucket 
updated reciever
 2023-06-12 11:39:30 +00:00
ermisw e5c27650ce dependency fix 2023-05-16 09:15:18 +02:00
ermisw d23baf77be some fixes 2023-05-16 09:02:23 +02:00
ermisw 9e1d6ee3d8 added other environments 2023-05-09 10:02:48 +02:00
3 changed files with 28 additions and 21 deletions
Show Stats Expand all files Collapse all files

23
createKeyRequestReport.py
View File

@ -12,7 +12,8 @@ import dynatraceAPI
# import types # import types
from KRParser import krparser from KRParser import krparser
#from key_request_parser import krparser #from key_request_parser import krparser
import time
#from datetime import datetime
warnings.filterwarnings("ignore") warnings.filterwarnings("ignore")
@ -54,10 +55,11 @@ def write_to_excel(ignored, noData1M, noData1W, all_TP_slos):
def getStats(krs): def getStats(krs):
ts = time.time()
epoch = datetime.datetime.now().timestamp()
tmpIgnoredList=[] tmpIgnoredList=[]
for kr in [a for a in krs if len(a.keyRequests) == 0]: 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])
@ -66,23 +68,27 @@ def getStats(krs):
for k in kr.getKeyRequestByHasData("1M"): 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 "", 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["filter"],
kr.metadata["metricExpression"]]) kr.metadata["metricExpression"],
kr.matchedGroups._list[0]['pattern'], epoch])
noData1W=[] noData1W=[]
for kr in [s for s in krs if s.hasNoData("1W")==True]: for kr in [s for s in krs if s.hasNoData("1W")==True]:
for k in kr.getKeyRequestByHasData("1W"): 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 "", 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 "", [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["filter"],
kr.metadata["metricExpression"]]) kr.metadata["metricExpression"],
kr.matchedGroups._list[0]['pattern'], epoch])
# noData1W=[] # noData1W=[]
# for kr in [s for s in krs if s.hasNoData1WKeyRequests()==True]: # for kr in [s for s in krs if s.hasNoData1WKeyRequests()==True]:
# for k in kr.getNoData1WKeyRequests(): # for k in kr.getNoData1WKeyRequests():
# noData1W.append([kr.metadata["sloName"], kr.metadata["env"], k["displayName"], k["entityId"], kr.metadata["filter"], kr.metadata["metricExpression"]]) # 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) ignored=pd.DataFrame(tmpIgnoredList, columns=columns)
noData_1M=pd.DataFrame(noData1M, columns = columns) noData_1M=pd.DataFrame(noData1M, columns = columns)
noData_1W=pd.DataFrame(noData1W, columns = columns) noData_1W=pd.DataFrame(noData1W, columns = columns)
@ -94,9 +100,10 @@ def getStats(krs):
k["count"]["1W"], k["count"]["1M"], k["count"]["1W"], k["count"]["1M"],
k["services"][0]["displayName"] if len(k["services"]) > 0 else "", 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 "",
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) all_TP_slos=pd.DataFrame(allTPSlos, columns = columns_ext)
return ignored, noData_1M, noData_1W, all_TP_slos return ignored, noData_1M, noData_1W, all_TP_slos

20
environment.yaml
View File

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

4
jenkinsfile
View File

@ -57,7 +57,7 @@
emailext subject: env.JOB_NAME, emailext subject: env.JOB_NAME,
mimeType: 'text/html', mimeType: 'text/html',
body: tmp_body, 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', //to: 'ermis.wieger@nttdata.com',
replyTo: 'coco-apm@bmw.de', replyTo: 'coco-apm@bmw.de',
attachmentsPattern: '*.xlsx' attachmentsPattern: '*.xlsx'
@ -75,7 +75,7 @@
failure { failure {
emailext subject: "${env.JOB_NAME} build ${env.BUILD_ID} failed", emailext subject: "${env.JOB_NAME} build ${env.BUILD_ID} failed",
body: "QM report failed, see logs for details: ${env.BUILD_URL}", 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 { always {
cleanWs() cleanWs()