From 505b14bcc96bf4d267e2b8f5f42af6d235d9a3bf Mon Sep 17 00:00:00 2001 From: "SLW\\ARNAUA" Date: Tue, 31 Jan 2023 10:04:59 +0100 Subject: [PATCH] app-id added and management zone was re-onboarded --- .../CD_XCC/management-zone/default.json | 155 +++--------------- .../management-zone/management-zone.yaml | 7 +- .../alerting-profile/alerting-profile.yaml | 0 .../alerting-profile/default.json | 0 .../calculated-metrics-service/README.md | 0 .../conditional-naming-processgroup/README.md | 0 .../conditional-naming-processgroup.yaml | 0 .../template.json | 0 .../conditional-naming-service/README.md | 0 .../conditional-naming-service.yaml | 0 .../conditional-naming-service/template.json | 0 .../custom-service-java/README.md | 0 .../custom-service-java.yaml | 0 .../custom-service-java/template-1-1.json | 0 .../dashboard/README.md | 0 .../dashboard/dashboard.yaml | 0 .../dashboard/default.json | 0 .../CD_XCC_old/management-zone/README.md | 4 + .../CD_XCC_old/management-zone/default.json | 140 ++++++++++++++++ .../management-zone/management-zone.yaml | 6 + .../notification/README.md | 0 .../notification/email.json | 0 .../notification/itsm.json | 0 .../notification/msTeams.json | 0 .../notification/notification.yaml | 0 .../synthetic-monitor/README.md | 0 .../synthetic-monitor/default.json | 0 .../synthetic-monitor/synthetic-monitor.yaml | 0 28 files changed, 181 insertions(+), 131 deletions(-) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/alerting-profile/alerting-profile.yaml (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/alerting-profile/default.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/calculated-metrics-service/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/conditional-naming-processgroup/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/conditional-naming-processgroup/conditional-naming-processgroup.yaml (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/conditional-naming-processgroup/template.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/conditional-naming-service/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/conditional-naming-service/conditional-naming-service.yaml (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/conditional-naming-service/template.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/custom-service-java/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/custom-service-java/custom-service-java.yaml (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/custom-service-java/template-1-1.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/dashboard/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/dashboard/dashboard.yaml (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/dashboard/default.json (100%) create mode 100644 BMW-Dynatrace-config/CD_XCC_old/management-zone/README.md create mode 100644 BMW-Dynatrace-config/CD_XCC_old/management-zone/default.json create mode 100644 BMW-Dynatrace-config/CD_XCC_old/management-zone/management-zone.yaml rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/notification/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/notification/email.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/notification/itsm.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/notification/msTeams.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/notification/notification.yaml (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/synthetic-monitor/README.md (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/synthetic-monitor/default.json (100%) rename BMW-Dynatrace-config/{CD_XCC => CD_XCC_old}/synthetic-monitor/synthetic-monitor.yaml (100%) diff --git a/BMW-Dynatrace-config/CD_XCC/management-zone/default.json b/BMW-Dynatrace-config/CD_XCC/management-zone/default.json index a2a87a06..7087e1f1 100644 --- a/BMW-Dynatrace-config/CD_XCC/management-zone/default.json +++ b/BMW-Dynatrace-config/CD_XCC/management-zone/default.json @@ -1,140 +1,39 @@ { "dimensionalRules": [], "name": "{{.name}}", - "rules": [ - { - "conditions": [ + "entitySelectorBasedRules": [ { - "comparisonInfo": { - "negate": false, - "operator": "EQUALS", - "type": "TAG", - "value": { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - } - }, - "key": { - "attribute": "SERVICE_TAGS" - } - } - ], - "enabled": true, - "propagationTypes": [ - "SERVICE_TO_PROCESS_GROUP_LIKE", - "SERVICE_TO_HOST_LIKE" - ], - "type": "SERVICE" - }, - { - "conditions": [ + "enabled": true, + "entitySelector": "type(Service),tag({{.compassIDs}})" + }, { - "comparisonInfo": { - "negate": false, - "operator": "EQUALS", - "type": "TAG", - "value": { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - } - }, - "key": { - "attribute": "PROCESS_GROUP_TAGS" - } - } - ], - "enabled": true, - "propagationTypes": [ - "PROCESS_GROUP_TO_HOST" - ], - "type": "PROCESS_GROUP" - }, - { - "conditions": [ + "enabled": true, + "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))" + }, { - "comparisonInfo": { - "negate": false, - "operator": "EQUALS", - "type": "TAG", - "value": { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - } - }, - "key": { - "attribute": "HOST_TAGS" - } - } - ], - "enabled": true, - "type": "HOST" - }, - { - "conditions": [ + "enabled": true, + "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})" + }, { - "comparisonInfo": { - "caseSensitive": true, - "negate": false, - "operator": "CONTAINS", - "type": "STRING", - "value": "{{.tag}}" - }, - "key": { - "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME" - } - } - ], - "enabled": true, - "propagationTypes": [], - "type": "CLOUD_APPLICATION_NAMESPACE" - }, - { - "conditions": [ + "enabled": true, + "entitySelector": "type(HOST),tag({{.compassIDs}})" + }, { - "comparisonInfo": { - "caseSensitive": true, - "negate": false, - "operator": "CONTAINS", - "type": "STRING", - "value": "{{.tag}}" + "enabled": true, + "entitySelector": "type(Service),tag({{.appIDs}})" }, - "key": { - "attribute": "CLOUD_APPLICATION_NAME" - } - } - ], - "enabled": true, - "propagationTypes": [], - "type": "CLOUD_APPLICATION" - }, - { - "conditions": [ { - "comparisonInfo": { - "negate": false, - "operator": "EQUALS", - "type": "TAG", - "value": { - "context": "CONTEXTLESS", - "key": "app-id", - "value": "APP-18886" - } - }, - "key": { - "attribute": "SERVICE_TAGS", - "type": "STATIC" - } + "enabled": true, + "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.appIDs}}))" + }, + { + "enabled": true, + "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.appIDs}})" + }, + { + "enabled": true, + "entitySelector": "type(HOST),tag({{.appIDs}})" } - ], - "enabled": true, - "propagationTypes": [ - "SERVICE_TO_PROCESS_GROUP_LIKE", - "SERVICE_TO_HOST_LIKE" - ], - "type": "SERVICE" - } - ] + ], + "rules": [] } \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_XCC/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_XCC/management-zone/management-zone.yaml index 80bc766a..d79313aa 100644 --- a/BMW-Dynatrace-config/CD_XCC/management-zone/management-zone.yaml +++ b/BMW-Dynatrace-config/CD_XCC/management-zone/management-zone.yaml @@ -1,6 +1,7 @@ config: -- CDXCC: default.json +- CDnewComponentTag: default.json -CDXCC: +CDnewComponentTag: - name: CD_XCC -- tag: XCC +- compassIDs: \"compass-id:xcc-campaigns\",\"compass-id:xcc-settings\",\"compass-id:xcc-statistics\",\"compass-id:xcc-cmgr\",\"compass-id:xcc-users\",\"compass-id:xcc-next-campaigns\",\"compass-id:xcc-next-legacy-facade\" +- appIDs: \"app-id:APP-18886\" diff --git a/BMW-Dynatrace-config/CD_XCC/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_XCC_old/alerting-profile/alerting-profile.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/alerting-profile/alerting-profile.yaml rename to BMW-Dynatrace-config/CD_XCC_old/alerting-profile/alerting-profile.yaml diff --git a/BMW-Dynatrace-config/CD_XCC/alerting-profile/default.json b/BMW-Dynatrace-config/CD_XCC_old/alerting-profile/default.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/alerting-profile/default.json rename to BMW-Dynatrace-config/CD_XCC_old/alerting-profile/default.json diff --git a/BMW-Dynatrace-config/CD_XCC/calculated-metrics-service/README.md b/BMW-Dynatrace-config/CD_XCC_old/calculated-metrics-service/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/calculated-metrics-service/README.md rename to BMW-Dynatrace-config/CD_XCC_old/calculated-metrics-service/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_XCC_old/conditional-naming-processgroup/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/conditional-naming-processgroup/README.md rename to BMW-Dynatrace-config/CD_XCC_old/conditional-naming-processgroup/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_XCC_old/conditional-naming-processgroup/conditional-naming-processgroup.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/conditional-naming-processgroup/conditional-naming-processgroup.yaml rename to BMW-Dynatrace-config/CD_XCC_old/conditional-naming-processgroup/conditional-naming-processgroup.yaml diff --git a/BMW-Dynatrace-config/CD_XCC/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_XCC_old/conditional-naming-processgroup/template.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/conditional-naming-processgroup/template.json rename to BMW-Dynatrace-config/CD_XCC_old/conditional-naming-processgroup/template.json diff --git a/BMW-Dynatrace-config/CD_XCC/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_XCC_old/conditional-naming-service/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/conditional-naming-service/README.md rename to BMW-Dynatrace-config/CD_XCC_old/conditional-naming-service/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_XCC_old/conditional-naming-service/conditional-naming-service.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/conditional-naming-service/conditional-naming-service.yaml rename to BMW-Dynatrace-config/CD_XCC_old/conditional-naming-service/conditional-naming-service.yaml diff --git a/BMW-Dynatrace-config/CD_XCC/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_XCC_old/conditional-naming-service/template.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/conditional-naming-service/template.json rename to BMW-Dynatrace-config/CD_XCC_old/conditional-naming-service/template.json diff --git a/BMW-Dynatrace-config/CD_XCC/custom-service-java/README.md b/BMW-Dynatrace-config/CD_XCC_old/custom-service-java/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/custom-service-java/README.md rename to BMW-Dynatrace-config/CD_XCC_old/custom-service-java/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_XCC_old/custom-service-java/custom-service-java.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/custom-service-java/custom-service-java.yaml rename to BMW-Dynatrace-config/CD_XCC_old/custom-service-java/custom-service-java.yaml diff --git a/BMW-Dynatrace-config/CD_XCC/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_XCC_old/custom-service-java/template-1-1.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/custom-service-java/template-1-1.json rename to BMW-Dynatrace-config/CD_XCC_old/custom-service-java/template-1-1.json diff --git a/BMW-Dynatrace-config/CD_XCC/dashboard/README.md b/BMW-Dynatrace-config/CD_XCC_old/dashboard/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/dashboard/README.md rename to BMW-Dynatrace-config/CD_XCC_old/dashboard/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_XCC_old/dashboard/dashboard.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/dashboard/dashboard.yaml rename to BMW-Dynatrace-config/CD_XCC_old/dashboard/dashboard.yaml diff --git a/BMW-Dynatrace-config/CD_XCC/dashboard/default.json b/BMW-Dynatrace-config/CD_XCC_old/dashboard/default.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/dashboard/default.json rename to BMW-Dynatrace-config/CD_XCC_old/dashboard/default.json diff --git a/BMW-Dynatrace-config/CD_XCC_old/management-zone/README.md b/BMW-Dynatrace-config/CD_XCC_old/management-zone/README.md new file mode 100644 index 00000000..ffe9d6e3 --- /dev/null +++ b/BMW-Dynatrace-config/CD_XCC_old/management-zone/README.md @@ -0,0 +1,4 @@ + +### How to configure management zones? + +Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Management+Zones) page to configure your management zones. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_XCC_old/management-zone/default.json b/BMW-Dynatrace-config/CD_XCC_old/management-zone/default.json new file mode 100644 index 00000000..a2a87a06 --- /dev/null +++ b/BMW-Dynatrace-config/CD_XCC_old/management-zone/default.json @@ -0,0 +1,140 @@ +{ + "dimensionalRules": [], + "name": "{{.name}}", + "rules": [ + { + "conditions": [ + { + "comparisonInfo": { + "negate": false, + "operator": "EQUALS", + "type": "TAG", + "value": { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + } + }, + "key": { + "attribute": "SERVICE_TAGS" + } + } + ], + "enabled": true, + "propagationTypes": [ + "SERVICE_TO_PROCESS_GROUP_LIKE", + "SERVICE_TO_HOST_LIKE" + ], + "type": "SERVICE" + }, + { + "conditions": [ + { + "comparisonInfo": { + "negate": false, + "operator": "EQUALS", + "type": "TAG", + "value": { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + } + }, + "key": { + "attribute": "PROCESS_GROUP_TAGS" + } + } + ], + "enabled": true, + "propagationTypes": [ + "PROCESS_GROUP_TO_HOST" + ], + "type": "PROCESS_GROUP" + }, + { + "conditions": [ + { + "comparisonInfo": { + "negate": false, + "operator": "EQUALS", + "type": "TAG", + "value": { + "context": "CONTEXTLESS", + "key": "Component", + "value": "{{.tag}}" + } + }, + "key": { + "attribute": "HOST_TAGS" + } + } + ], + "enabled": true, + "type": "HOST" + }, + { + "conditions": [ + { + "comparisonInfo": { + "caseSensitive": true, + "negate": false, + "operator": "CONTAINS", + "type": "STRING", + "value": "{{.tag}}" + }, + "key": { + "attribute": "CLOUD_APPLICATION_NAMESPACE_NAME" + } + } + ], + "enabled": true, + "propagationTypes": [], + "type": "CLOUD_APPLICATION_NAMESPACE" + }, + { + "conditions": [ + { + "comparisonInfo": { + "caseSensitive": true, + "negate": false, + "operator": "CONTAINS", + "type": "STRING", + "value": "{{.tag}}" + }, + "key": { + "attribute": "CLOUD_APPLICATION_NAME" + } + } + ], + "enabled": true, + "propagationTypes": [], + "type": "CLOUD_APPLICATION" + }, + { + "conditions": [ + { + "comparisonInfo": { + "negate": false, + "operator": "EQUALS", + "type": "TAG", + "value": { + "context": "CONTEXTLESS", + "key": "app-id", + "value": "APP-18886" + } + }, + "key": { + "attribute": "SERVICE_TAGS", + "type": "STATIC" + } + } + ], + "enabled": true, + "propagationTypes": [ + "SERVICE_TO_PROCESS_GROUP_LIKE", + "SERVICE_TO_HOST_LIKE" + ], + "type": "SERVICE" + } + ] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_XCC_old/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_XCC_old/management-zone/management-zone.yaml new file mode 100644 index 00000000..80bc766a --- /dev/null +++ b/BMW-Dynatrace-config/CD_XCC_old/management-zone/management-zone.yaml @@ -0,0 +1,6 @@ +config: +- CDXCC: default.json + +CDXCC: +- name: CD_XCC +- tag: XCC diff --git a/BMW-Dynatrace-config/CD_XCC/notification/README.md b/BMW-Dynatrace-config/CD_XCC_old/notification/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/notification/README.md rename to BMW-Dynatrace-config/CD_XCC_old/notification/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/notification/email.json b/BMW-Dynatrace-config/CD_XCC_old/notification/email.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/notification/email.json rename to BMW-Dynatrace-config/CD_XCC_old/notification/email.json diff --git a/BMW-Dynatrace-config/CD_XCC/notification/itsm.json b/BMW-Dynatrace-config/CD_XCC_old/notification/itsm.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/notification/itsm.json rename to BMW-Dynatrace-config/CD_XCC_old/notification/itsm.json diff --git a/BMW-Dynatrace-config/CD_XCC/notification/msTeams.json b/BMW-Dynatrace-config/CD_XCC_old/notification/msTeams.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/notification/msTeams.json rename to BMW-Dynatrace-config/CD_XCC_old/notification/msTeams.json diff --git a/BMW-Dynatrace-config/CD_XCC/notification/notification.yaml b/BMW-Dynatrace-config/CD_XCC_old/notification/notification.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/notification/notification.yaml rename to BMW-Dynatrace-config/CD_XCC_old/notification/notification.yaml diff --git a/BMW-Dynatrace-config/CD_XCC/synthetic-monitor/README.md b/BMW-Dynatrace-config/CD_XCC_old/synthetic-monitor/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/synthetic-monitor/README.md rename to BMW-Dynatrace-config/CD_XCC_old/synthetic-monitor/README.md diff --git a/BMW-Dynatrace-config/CD_XCC/synthetic-monitor/default.json b/BMW-Dynatrace-config/CD_XCC_old/synthetic-monitor/default.json similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/synthetic-monitor/default.json rename to BMW-Dynatrace-config/CD_XCC_old/synthetic-monitor/default.json diff --git a/BMW-Dynatrace-config/CD_XCC/synthetic-monitor/synthetic-monitor.yaml b/BMW-Dynatrace-config/CD_XCC_old/synthetic-monitor/synthetic-monitor.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_XCC/synthetic-monitor/synthetic-monitor.yaml rename to BMW-Dynatrace-config/CD_XCC_old/synthetic-monitor/synthetic-monitor.yaml