From 8785c3bd5987210565caa3e18c09c1e3eca06264 Mon Sep 17 00:00:00 2001 From: Patryk Gudalewicz Date: Mon, 11 Jul 2022 12:09:44 +0200 Subject: [PATCH] Additional tags in report added --- README.md | 2 +- createReport.py | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 374d4ca..29d46ab 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Dynatrace Reporting Pipeline -This repository is used as a template to create automated Dynatrace reports through Jenkins (JAWS) which are sent as attachement through mail. +This report is containing all services (MRP) with tag starting from "[Kubernetes]app.bmwgroup.com/" *** ## Jenkins environments EMEA & NA: https://jaws.bmwgroup.net/opapm/ diff --git a/createReport.py b/createReport.py index 919e691..21a04dd 100644 --- a/createReport.py +++ b/createReport.py @@ -56,8 +56,12 @@ def GatherReportingInfo(DTAPIToken, DTENV,friendlyName): strnow = now.strftime("%Y%m%d_%H%M") for entity in entityList: if any(tag["stringRepresentation"].startswith('[Kubernetes]app.bmwgroup.com/') for tag in entity["tags"]): - tagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]app.bmwgroup.com/')), None) - row={'Tag':tagval["stringRepresentation"],'ServiceName':entity['displayName'],'ServiceId':entity['entityId']} + kubernetesttagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]app.bmwgroup.com/')), None) + appidtagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]app-id')), None) + appnametagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('app-name')), None) + compassidtagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('compass-id')), None) + msidtagval = next((tag for tag in entity["tags"] if tag["stringRepresentation"].startswith('[Kubernetes]ms-id')), None) + row={'Kubernetes Tag':kubernetesttagval["stringRepresentation"],'AppId':appidtagval["value"],'AppName':appnametagval["value"],'CompassId':compassidtagval["value"],'MsId':msidtagval["value"],'ServiceName':entity['displayName'],'ServiceId':entity['entityId']} mgmt = mgmt.append(row,ignore_index=True) mgmt.to_csv(friendlyName + '_TaggedEntities_' + strnow +'.csv',encoding='utf-8')