From af9b818ce4a31317eae890ffe03063398f31036b Mon Sep 17 00:00:00 2001 From: ermisw Date: Fri, 22 Oct 2021 14:57:13 +0200 Subject: [PATCH] new onboard.sh script --- .../alerting-profile/alerting-profile.yaml | 37 +++ .../alerting-profile/default.json | 25 -- .../calculated-metrics-service/README.md | 0 .../conditional-naming-processgroup/README.md | 0 .../conditional-naming-processgroup.yaml | 1 - .../template.json | 0 .../conditional-naming-service/README.md | 0 .../conditional-naming-service.yaml | 1 - .../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 | 109 ++++++ .../dashboard/default.json | 59 +++- .../management-zone/README.md | 0 .../management-zone/default.json | 23 ++ .../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 | 102 ++++++ .../synthetic-monitor/README.md | 0 .../synthetic-monitor/default.json | 0 .../synthetic-monitor/synthetic-monitor.yaml | 10 + .../alerting-profile/alerting-profile.yaml | 32 +- .../CD_MSGSVC/alerting-profile/default.json | 25 -- .../conditional-naming-processgroup.yaml | 5 +- .../conditional-naming-service.yaml | 5 +- .../CD_MSGSVC/dashboard/dashboard.yaml | 120 +++---- .../CD_MSGSVC/dashboard/default.json | 59 +++- .../CD_MSGSVC/management-zone/default.json | 121 +------ .../management-zone/management-zone.yaml | 6 +- .../CD_MSGSVC/notification/notification.yaml | 64 ++-- .../synthetic-monitor/synthetic-monitor.yaml | 8 +- .../alerting-profile/alerting-profile.yaml | 43 --- .../conditional-naming-processgroup.yaml | 8 - .../conditional-naming-service.yaml | 8 - .../CD_TEST_EW/dashboard/dashboard.yaml | 125 ------- .../CD_TEST_EW/management-zone/default.json | 120 ------- .../management-zone/management-zone.yaml | 7 - .../CD_TEST_EW/notification/notification.yaml | 102 ------ .../synthetic-monitor/synthetic-monitor.yaml | 10 - .../alerting-profile/alerting-profile.yaml | 43 --- .../CD_TEST_EW2/alerting-profile/default.json | 103 ------ .../calculated-metrics-service/README.md | 4 - .../conditional-naming-processgroup/README.md | 4 - .../template.json | 29 -- .../conditional-naming-service/README.md | 4 - .../conditional-naming-service/template.json | 29 -- .../CD_TEST_EW2/custom-service-java/README.md | 4 - .../custom-service-java.yaml | 9 - .../custom-service-java/template-1-1.json | 23 -- .../CD_TEST_EW2/dashboard/README.md | 4 - .../CD_TEST_EW2/dashboard/dashboard.yaml | 125 ------- .../CD_TEST_EW2/dashboard/default.json | 309 ------------------ .../CD_TEST_EW2/management-zone/README.md | 4 - .../CD_TEST_EW2/management-zone/default.json | 114 ------- .../management-zone/management-zone.yaml | 7 - .../CD_TEST_EW2/notification/README.md | 4 - .../CD_TEST_EW2/notification/email.json | 13 - .../CD_TEST_EW2/notification/itsm.json | 20 -- .../CD_TEST_EW2/notification/msTeams.json | 11 - .../notification/notification.yaml | 102 ------ .../CD_TEST_EW2/synthetic-monitor/README.md | 4 - .../synthetic-monitor/default.json | 82 ----- .../synthetic-monitor/synthetic-monitor.yaml | 10 - environment.yaml | 32 +- onboard.sh | 39 +-- .../alerting-profile/alerting-profile.yaml | 6 - .../alerting-profile/default.json | 25 -- .../conditional-naming-processgroup.yaml | 1 - .../conditional-naming-service.yaml | 1 - .../dashboard/dashboard.yaml | 16 - .../CD_managementZone/dashboard/default.json | 59 +++- .../management-zone/default.json | 121 +------ .../management-zone/management-zone.yaml | 3 +- 78 files changed, 575 insertions(+), 2030 deletions(-) create mode 100644 BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/alerting-profile.yaml rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/alerting-profile/default.json (73%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/calculated-metrics-service/README.md (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/conditional-naming-processgroup/README.md (100%) rename BMW-Dynatrace-config/{CD_TEST_EW2 => CD_InfotainmentInCarExperienceServices}/conditional-naming-processgroup/conditional-naming-processgroup.yaml (88%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/conditional-naming-processgroup/template.json (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/conditional-naming-service/README.md (100%) rename BMW-Dynatrace-config/{CD_TEST_EW2 => CD_InfotainmentInCarExperienceServices}/conditional-naming-service/conditional-naming-service.yaml (88%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/conditional-naming-service/template.json (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/custom-service-java/README.md (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/custom-service-java/custom-service-java.yaml (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/custom-service-java/template-1-1.json (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/dashboard/README.md (100%) create mode 100644 BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/dashboard.yaml rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/dashboard/default.json (88%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/management-zone/README.md (100%) create mode 100644 BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/default.json create mode 100644 BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/management-zone.yaml rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/notification/README.md (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/notification/email.json (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/notification/itsm.json (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/notification/msTeams.json (100%) create mode 100644 BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/notification.yaml rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/synthetic-monitor/README.md (100%) rename BMW-Dynatrace-config/{CD_TEST_EW => CD_InfotainmentInCarExperienceServices}/synthetic-monitor/default.json (100%) create mode 100644 BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/synthetic-monitor.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/alerting-profile.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/conditional-naming-processgroup.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/conditional-naming-service.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/dashboard/dashboard.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/management-zone/default.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/management-zone/management-zone.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/notification/notification.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/synthetic-monitor.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/alerting-profile.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/default.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/calculated-metrics-service/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/template.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/template.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/custom-service-java.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/template-1-1.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/dashboard/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/dashboard/dashboard.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/dashboard/default.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/management-zone/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/management-zone/default.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/management-zone/management-zone.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/notification/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/notification/email.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/notification/itsm.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/notification/msTeams.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/notification/notification.yaml delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/README.md delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/default.json delete mode 100644 BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/synthetic-monitor.yaml diff --git a/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/alerting-profile.yaml new file mode 100644 index 00000000..75eb5fd4 --- /dev/null +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/alerting-profile.yaml @@ -0,0 +1,37 @@ +config: +- CDnewComponentTag: default.json + + +#Prod alerting profiles for EMEA/NA/CN +CDnewComponentTag.EMEA-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "false" +CDnewComponentTag.NA-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "false" +CDnewComponentTag.CN-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "false" + +#INT alerting profiles for EMEA/NA/CN +CDnewComponentTag.EMEA-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "false" +CDnewComponentTag.NA-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "false" +CDnewComponentTag.CN-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/default.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/default.json similarity index 73% rename from BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/default.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/default.json index 681a4c64..bb81115c 100644 --- a/BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/default.json +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/alerting-profile/default.json @@ -10,11 +10,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -29,11 +24,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -48,11 +38,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -67,11 +52,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -86,11 +66,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", diff --git a/BMW-Dynatrace-config/CD_TEST_EW/calculated-metrics-service/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/calculated-metrics-service/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/calculated-metrics-service/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/calculated-metrics-service/README.md diff --git a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/README.md diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml similarity index 88% rename from BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/conditional-naming-processgroup.yaml rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml index be5821ec..fb9502e8 100644 --- a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/conditional-naming-processgroup.yaml +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/conditional-naming-processgroup.yaml @@ -4,5 +4,4 @@ config: CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: newComponentTag - skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/template.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/template.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-processgroup/template.json diff --git a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/README.md diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/conditional-naming-service.yaml similarity index 88% rename from BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/conditional-naming-service.yaml rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/conditional-naming-service.yaml index be5821ec..fb9502e8 100644 --- a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/conditional-naming-service.yaml +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/conditional-naming-service.yaml @@ -4,5 +4,4 @@ config: CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: newComponentTag - skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/template.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/template.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/conditional-naming-service/template.json diff --git a/BMW-Dynatrace-config/CD_TEST_EW/custom-service-java/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/custom-service-java/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/custom-service-java/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/custom-service-java/README.md diff --git a/BMW-Dynatrace-config/CD_TEST_EW/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/custom-service-java/custom-service-java.yaml similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/custom-service-java/custom-service-java.yaml rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/custom-service-java/custom-service-java.yaml diff --git a/BMW-Dynatrace-config/CD_TEST_EW/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/custom-service-java/template-1-1.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/custom-service-java/template-1-1.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/custom-service-java/template-1-1.json diff --git a/BMW-Dynatrace-config/CD_TEST_EW/dashboard/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/dashboard/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/README.md diff --git a/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/dashboard.yaml new file mode 100644 index 00000000..ebce24f9 --- /dev/null +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/dashboard.yaml @@ -0,0 +1,109 @@ +config: +- CDnewComponentTag-PROD: default.json +- CDnewComponentTag-E2E: default.json +- CDnewComponentTag-INT: default.json +- CDnewComponentTag-TEST: default.json + +#PROD dashboards for EMEA/NA/CN Prod +CDnewComponentTag-PROD: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "true" +CDnewComponentTag-PROD.EMEA-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "false" +CDnewComponentTag-PROD.NA-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "false" +CDnewComponentTag-PROD.CN-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: PROD +- skipDeployment: "false" + +#E2E dashboards for EMEA/NA/CN Prod +CDnewComponentTag-E2E: +- name: CD_InfotainmentInCarExperienceServices E2E +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: E2E +- skipDeployment: "true" +CDnewComponentTag-E2E.EMEA-Prod: +- name: CD_InfotainmentInCarExperienceServices E2E +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: E2E +- skipDeployment: "false" +CDnewComponentTag-E2E.NA-Prod: +- name: CD_InfotainmentInCarExperienceServices E2E +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: E2E +- skipDeployment: "false" +CDnewComponentTag-E2E.CN-Prod: +- name: CD_InfotainmentInCarExperienceServices E2E +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: E2E +- skipDeployment: "false" + +#INT dashboards for EMEA/NA/CN PreProd +CDnewComponentTag-INT: +- name: CD_InfotainmentInCarExperienceServices INT +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "true" +CDnewComponentTag-INT.EMEA-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "false" +CDnewComponentTag-INT.NA-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "false" +CDnewComponentTag-INT.CN-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: INT +- skipDeployment: "false" + +#TEST dashboards for EMEA/NA/CN PreProd +CDnewComponentTag-TEST: +- name: CD_InfotainmentInCarExperienceServices TEST +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: TEST +- skipDeployment: "true" +CDnewComponentTag-TEST.EMEA-PreProd: +- name: CD_InfotainmentInCarExperienceServices TEST +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: TEST +- skipDeployment: "false" +CDnewComponentTag-TEST.NA-PreProd: +- name: CD_InfotainmentInCarExperienceServices TEST +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: TEST +- skipDeployment: "false" +CDnewComponentTag-TEST.CN-PreProd: +- name: CD_InfotainmentInCarExperienceServices TEST +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- env: TEST +- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/dashboard/default.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/default.json similarity index 88% rename from BMW-Dynatrace-config/CD_TEST_EW/dashboard/default.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/default.json index ef07d18c..189767ed 100644 --- a/BMW-Dynatrace-config/CD_TEST_EW/dashboard/default.json +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/dashboard/default.json @@ -13,7 +13,7 @@ "timeframe": "-24h to now" }, "tags": [ - "{{.tag}}" + "{{.mzName}}" ], "preset": true }, @@ -28,7 +28,12 @@ "width": 1064, "height": 304 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "MIXED", "customName": "Failure rate (HTTP 4xx/5xx errors)", @@ -72,8 +77,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -106,7 +110,12 @@ "width": 1064, "height": 38 }, - "tileFilter": {} + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + } }, { "name": "Markdown", @@ -131,7 +140,12 @@ "width": 1064, "height": 304 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "MIXED", "customName": "Response time, Request Count and Number of Errors", @@ -189,8 +203,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -219,7 +232,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "DATABASE", "customName": "Databases", @@ -233,8 +251,7 @@ "filtersPerEntityType": { "DATABASE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -251,7 +268,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "SERVICE", "customName": "Services", @@ -265,8 +287,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -283,7 +304,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "HOST", "customName": "Hosts", @@ -297,8 +323,7 @@ "filtersPerEntityType": { "HOST": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } diff --git a/BMW-Dynatrace-config/CD_TEST_EW/management-zone/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/management-zone/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/README.md diff --git a/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/default.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/default.json new file mode 100644 index 00000000..fc96de39 --- /dev/null +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/default.json @@ -0,0 +1,23 @@ +{ + "dimensionalRules": [], + "name": "{{.name}}", + "entitySelectorBasedRules": [ + { + "enabled": true, + "entitySelector": "type(Service),tag({{.compassIDs}})" + }, + { + "enabled": true, + "entitySelector": "type(SERVICE),databaseName.exists(),toRelationship.calls(type(SERVICE),tag({{.compassIDs}}))" + }, + { + "enabled": true, + "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})" + }, + { + "enabled": true, + "entitySelector": "type(HOST),tag({{.compassIDs}})" + } + ], + "rules": [] +} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/management-zone.yaml new file mode 100644 index 00000000..f921bcde --- /dev/null +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/management-zone/management-zone.yaml @@ -0,0 +1,6 @@ +config: +- CDnewComponentTag: default.json + +CDnewComponentTag: +- name: CD_InfotainmentInCarExperienceServices +- compassIDs: \"compass-id:ambient-music\",\"compass-id:festive-mode\" diff --git a/BMW-Dynatrace-config/CD_TEST_EW/notification/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/notification/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/README.md diff --git a/BMW-Dynatrace-config/CD_TEST_EW/notification/email.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/email.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/notification/email.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/email.json diff --git a/BMW-Dynatrace-config/CD_TEST_EW/notification/itsm.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/itsm.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/notification/itsm.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/itsm.json diff --git a/BMW-Dynatrace-config/CD_TEST_EW/notification/msTeams.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/msTeams.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/notification/msTeams.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/msTeams.json diff --git a/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/notification.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/notification.yaml new file mode 100644 index 00000000..4b796d77 --- /dev/null +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/notification/notification.yaml @@ -0,0 +1,102 @@ +config: +- CDnewComponentTag: msTeams.json +- CDnewComponentTagITSM: itsm.json + +# Notification System for EMEA/NA/CN Prod msTeams +CDnewComponentTag.EMEA-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://empty +- skipDeployment: "true" +CDnewComponentTag.NA-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://empty +- skipDeployment: "true" +CDnewComponentTag.CN-Prod: +- name: CD_InfotainmentInCarExperienceServices PROD +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://empty +- skipDeployment: "true" + +# Notification System for EMEA/NA/CN PreProd msTeams +CDnewComponentTag.EMEA-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://empty +- skipDeployment: "true" +CDnewComponentTag.NA-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://empty +- skipDeployment: "true" +CDnewComponentTag.CN-PreProd: +- name: CD_InfotainmentInCarExperienceServices INT +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://empty +- skipDeployment: "true" + + +# Notification System for EMEA/NA/CN Prod ITSM +CDnewComponentTagITSM.EMEA-Prod: +- name: CD_InfotainmentInCarExperienceServices ITSM PROD +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11906401" +- appdid: "TEST123" +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + +CDnewComponentTagITSM.NA-Prod: +- name: CD_InfotainmentInCarExperienceServices ITSM PROD +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11906401" +- appdid: "TEST123" +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + + +CDnewComponentTagITSM.CN-Prod: +- name: CD_InfotainmentInCarExperienceServices ITSM PROD +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11906401" +- appdid: "TEST123" +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + +CDnewComponentTagITSM.EMEA-PreProd: +- name: CD_InfotainmentInCarExperienceServices ITSM INT +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11906401" +- appdid: "TEST123" +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + +CDnewComponentTagITSM.NA-PreProd: +- name: CD_InfotainmentInCarExperienceServices ITSM INT +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11906401" +- appdid: "TEST123" +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + + +CDnewComponentTagITSM.CN-PreProd: +- name: CD_InfotainmentInCarExperienceServices ITSM INT +- alertingProfile: CD_InfotainmentInCarExperienceServices/alerting-profile/CDnewComponentTag.id +- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 +- contractid: "10APP11906401" +- appdid: "TEST123" +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- DTEnvironment: https://xxu26128.live.dynatrace.com +- skipDeployment: "true" + diff --git a/BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/README.md b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/README.md similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/README.md rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/README.md diff --git a/BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/default.json b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/default.json similarity index 100% rename from BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/default.json rename to BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/default.json diff --git a/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/synthetic-monitor.yaml b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/synthetic-monitor.yaml new file mode 100644 index 00000000..bfd5f856 --- /dev/null +++ b/BMW-Dynatrace-config/CD_InfotainmentInCarExperienceServices/synthetic-monitor/synthetic-monitor.yaml @@ -0,0 +1,10 @@ +config: +- newComponentTag: default.json + +newComponentTag: +- name: CD_InfotainmentInCarExperienceServices - +- mzName: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.name +- mzId: CD_InfotainmentInCarExperienceServices/management-zone/CDnewComponentTag.id +- endpoint: +- location: +- skipDeployment: "true" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/alerting-profile.yaml index 4ce191f1..acb15c14 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/alerting-profile.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/alerting-profile.yaml @@ -1,43 +1,37 @@ config: -- CDMSGSVC: default.json +- CDnewComponentTag: default.json #Prod alerting profiles for EMEA/NA/CN -CDMSGSVC.EMEA-Prod: +CDnewComponentTag.EMEA-Prod: - name: CD_MSGSVC PROD -- tag: MSGSVC -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" -CDMSGSVC.NA-Prod: +CDnewComponentTag.NA-Prod: - name: CD_MSGSVC PROD -- tag: MSGSVC -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" -CDMSGSVC.CN-Prod: +CDnewComponentTag.CN-Prod: - name: CD_MSGSVC PROD -- tag: MSGSVC -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" #INT alerting profiles for EMEA/NA/CN -CDMSGSVC.EMEA-PreProd: +CDnewComponentTag.EMEA-PreProd: - name: CD_MSGSVC INT -- tag: MSGSVC -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" -CDMSGSVC.NA-PreProd: +CDnewComponentTag.NA-PreProd: - name: CD_MSGSVC INT -- tag: MSGSVC -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" -CDMSGSVC.CN-PreProd: +CDnewComponentTag.CN-PreProd: - name: CD_MSGSVC INT -- tag: MSGSVC -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/default.json b/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/default.json index 681a4c64..bb81115c 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/default.json +++ b/BMW-Dynatrace-config/CD_MSGSVC/alerting-profile/default.json @@ -10,11 +10,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -29,11 +24,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -48,11 +38,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -67,11 +52,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -86,11 +66,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/conditional-naming-processgroup.yaml index 601c6f96..fb9502e8 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/conditional-naming-processgroup.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-processgroup/conditional-naming-processgroup.yaml @@ -1,8 +1,7 @@ config: -- CDMSGSVC: template.json +- CDnewComponentTag: template.json -CDMSGSVC: +CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: MSGSVC - skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/conditional-naming-service.yaml index 601c6f96..fb9502e8 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/conditional-naming-service.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/conditional-naming-service/conditional-naming-service.yaml @@ -1,8 +1,7 @@ config: -- CDMSGSVC: template.json +- CDnewComponentTag: template.json -CDMSGSVC: +CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: MSGSVC - skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_MSGSVC/dashboard/dashboard.yaml index 5710cc48..6f09f47b 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/dashboard.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/dashboard/dashboard.yaml @@ -1,125 +1,109 @@ config: -- CDMSGSVC-PROD: default.json -- CDMSGSVC-E2E: default.json -- CDMSGSVC-INT: default.json -- CDMSGSVC-TEST: default.json +- CDnewComponentTag-PROD: default.json +- CDnewComponentTag-E2E: default.json +- CDnewComponentTag-INT: default.json +- CDnewComponentTag-TEST: default.json #PROD dashboards for EMEA/NA/CN Prod -CDMSGSVC-PROD: +CDnewComponentTag-PROD: - name: CD_MSGSVC PROD -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "true" -CDMSGSVC-PROD.EMEA-Prod: +CDnewComponentTag-PROD.EMEA-Prod: - name: CD_MSGSVC PROD -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" -CDMSGSVC-PROD.NA-Prod: +CDnewComponentTag-PROD.NA-Prod: - name: CD_MSGSVC PROD -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" -CDMSGSVC-PROD.CN-Prod: +CDnewComponentTag-PROD.CN-Prod: - name: CD_MSGSVC PROD -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" #E2E dashboards for EMEA/NA/CN Prod -CDMSGSVC-E2E: +CDnewComponentTag-E2E: - name: CD_MSGSVC E2E -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: E2E - skipDeployment: "true" -CDMSGSVC-E2E.EMEA-Prod: +CDnewComponentTag-E2E.EMEA-Prod: - name: CD_MSGSVC E2E -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: E2E - skipDeployment: "false" -CDMSGSVC-E2E.NA-Prod: +CDnewComponentTag-E2E.NA-Prod: - name: CD_MSGSVC E2E -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: E2E - skipDeployment: "false" -CDMSGSVC-E2E.CN-Prod: +CDnewComponentTag-E2E.CN-Prod: - name: CD_MSGSVC E2E -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: E2E - skipDeployment: "false" #INT dashboards for EMEA/NA/CN PreProd -CDMSGSVC-INT: +CDnewComponentTag-INT: - name: CD_MSGSVC INT -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "true" -CDMSGSVC-INT.EMEA-PreProd: +CDnewComponentTag-INT.EMEA-PreProd: - name: CD_MSGSVC INT -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" -CDMSGSVC-INT.NA-PreProd: +CDnewComponentTag-INT.NA-PreProd: - name: CD_MSGSVC INT -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" -CDMSGSVC-INT.CN-PreProd: +CDnewComponentTag-INT.CN-PreProd: - name: CD_MSGSVC INT -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" #TEST dashboards for EMEA/NA/CN PreProd -CDMSGSVC-TEST: +CDnewComponentTag-TEST: - name: CD_MSGSVC TEST -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: TEST - skipDeployment: "true" -CDMSGSVC-TEST.EMEA-PreProd: +CDnewComponentTag-TEST.EMEA-PreProd: - name: CD_MSGSVC TEST -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: TEST - skipDeployment: "false" -CDMSGSVC-TEST.NA-PreProd: +CDnewComponentTag-TEST.NA-PreProd: - name: CD_MSGSVC TEST -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: TEST - skipDeployment: "false" -CDMSGSVC-TEST.CN-PreProd: +CDnewComponentTag-TEST.CN-PreProd: - name: CD_MSGSVC TEST -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id -- tag: MSGSVC +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - env: TEST - skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/default.json b/BMW-Dynatrace-config/CD_MSGSVC/dashboard/default.json index ef07d18c..189767ed 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/dashboard/default.json +++ b/BMW-Dynatrace-config/CD_MSGSVC/dashboard/default.json @@ -13,7 +13,7 @@ "timeframe": "-24h to now" }, "tags": [ - "{{.tag}}" + "{{.mzName}}" ], "preset": true }, @@ -28,7 +28,12 @@ "width": 1064, "height": 304 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "MIXED", "customName": "Failure rate (HTTP 4xx/5xx errors)", @@ -72,8 +77,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -106,7 +110,12 @@ "width": 1064, "height": 38 }, - "tileFilter": {} + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + } }, { "name": "Markdown", @@ -131,7 +140,12 @@ "width": 1064, "height": 304 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "MIXED", "customName": "Response time, Request Count and Number of Errors", @@ -189,8 +203,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -219,7 +232,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "DATABASE", "customName": "Databases", @@ -233,8 +251,7 @@ "filtersPerEntityType": { "DATABASE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -251,7 +268,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "SERVICE", "customName": "Services", @@ -265,8 +287,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -283,7 +304,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "HOST", "customName": "Hosts", @@ -297,8 +323,7 @@ "filtersPerEntityType": { "HOST": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } diff --git a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json index bffa0c3b..fc96de39 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json +++ b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/default.json @@ -1,114 +1,23 @@ { "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, + "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})" + }, + { + "enabled": true, + "entitySelector": "type(HOST),tag({{.compassIDs}})" + } ], - "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" - } - ] + "rules": [] } \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml index 0ffefabb..3c737c2e 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/management-zone/management-zone.yaml @@ -1,6 +1,6 @@ config: -- CDMSGSVC: default.json +- CDnewComponentTag: default.json -CDMSGSVC: +CDnewComponentTag: - name: CD_MSGSVC -- tag: MSGSVC +- compassIDs: \"compass-id:msgsvc\" diff --git a/BMW-Dynatrace-config/CD_MSGSVC/notification/notification.yaml b/BMW-Dynatrace-config/CD_MSGSVC/notification/notification.yaml index 4c18b3b2..ded39418 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/notification/notification.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/notification/notification.yaml @@ -1,102 +1,102 @@ config: -- CDMSGSVC: msTeams.json -- CDMSGSVCITSM: itsm.json +- CDnewComponentTag: msTeams.json +- CDnewComponentTagITSM: itsm.json # Notification System for EMEA/NA/CN Prod msTeams -CDMSGSVC.EMEA-Prod: +CDnewComponentTag.EMEA-Prod: - name: CD_MSGSVC PROD -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://empty - skipDeployment: "true" -CDMSGSVC.NA-Prod: +CDnewComponentTag.NA-Prod: - name: CD_MSGSVC PROD -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://empty - skipDeployment: "true" -CDMSGSVC.CN-Prod: +CDnewComponentTag.CN-Prod: - name: CD_MSGSVC PROD -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://empty - skipDeployment: "true" # Notification System for EMEA/NA/CN PreProd msTeams -CDMSGSVC.EMEA-PreProd: +CDnewComponentTag.EMEA-PreProd: - name: CD_MSGSVC INT -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://empty - skipDeployment: "true" -CDMSGSVC.NA-PreProd: +CDnewComponentTag.NA-PreProd: - name: CD_MSGSVC INT -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://empty - skipDeployment: "true" -CDMSGSVC.CN-PreProd: +CDnewComponentTag.CN-PreProd: - name: CD_MSGSVC INT -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://empty - skipDeployment: "true" # Notification System for EMEA/NA/CN Prod ITSM -CDMSGSVCITSM.EMEA-Prod: +CDnewComponentTagITSM.EMEA-Prod: - name: CD_MSGSVC ITSM PROD -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11906401" - appdid: "TEST123" -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" -CDMSGSVCITSM.NA-Prod: +CDnewComponentTagITSM.NA-Prod: - name: CD_MSGSVC ITSM PROD -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11906401" - appdid: "TEST123" -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" -CDMSGSVCITSM.CN-Prod: +CDnewComponentTagITSM.CN-Prod: - name: CD_MSGSVC ITSM PROD -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11906401" - appdid: "TEST123" -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" -CDMSGSVCITSM.EMEA-PreProd: +CDnewComponentTagITSM.EMEA-PreProd: - name: CD_MSGSVC ITSM INT -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11906401" - appdid: "TEST123" -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" -CDMSGSVCITSM.NA-PreProd: +CDnewComponentTagITSM.NA-PreProd: - name: CD_MSGSVC ITSM INT -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11906401" - appdid: "TEST123" -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" -CDMSGSVCITSM.CN-PreProd: +CDnewComponentTagITSM.CN-PreProd: - name: CD_MSGSVC ITSM INT -- alertingProfile: CD_MSGSVC/alerting-profile/CDMSGSVC.id +- alertingProfile: CD_MSGSVC/alerting-profile/CDnewComponentTag.id - webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 - contractid: "10APP11906401" - appdid: "TEST123" -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.id - DTEnvironment: https://xxu26128.live.dynatrace.com - skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/synthetic-monitor.yaml b/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/synthetic-monitor.yaml index ce190ee9..bf007c7f 100644 --- a/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/synthetic-monitor.yaml +++ b/BMW-Dynatrace-config/CD_MSGSVC/synthetic-monitor/synthetic-monitor.yaml @@ -1,10 +1,10 @@ config: -- MSGSVC: default.json +- newComponentTag: default.json -MSGSVC: +newComponentTag: - name: CD_MSGSVC - -- mzName: CD_MSGSVC/management-zone/CDMSGSVC.name -- mzId: CD_MSGSVC/management-zone/CDMSGSVC.id +- mzName: CD_MSGSVC/management-zone/CDnewComponentTag.name +- mzId: CD_MSGSVC/management-zone/CDnewComponentTag.id - endpoint: - location: - skipDeployment: "true" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/alerting-profile.yaml deleted file mode 100644 index 46f0b9ab..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/alerting-profile/alerting-profile.yaml +++ /dev/null @@ -1,43 +0,0 @@ -config: -- CDTEST_EW: default.json - - -#Prod alerting profiles for EMEA/NA/CN -CDTEST_EW.EMEA-Prod: -- name: CD_TEST_EW PROD -- tag: TEST_EW -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- env: PROD -- skipDeployment: "false" -CDTEST_EW.NA-Prod: -- name: CD_TEST_EW PROD -- tag: TEST_EW -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- env: PROD -- skipDeployment: "false" -CDTEST_EW.CN-Prod: -- name: CD_TEST_EW PROD -- tag: TEST_EW -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- env: PROD -- skipDeployment: "false" - -#INT alerting profiles for EMEA/NA/CN -CDTEST_EW.EMEA-PreProd: -- name: CD_TEST_EW INT -- tag: TEST_EW -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- env: INT -- skipDeployment: "false" -CDTEST_EW.NA-PreProd: -- name: CD_TEST_EW INT -- tag: TEST_EW -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- env: INT -- skipDeployment: "false" -CDTEST_EW.CN-PreProd: -- name: CD_TEST_EW INT -- tag: TEST_EW -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- env: INT -- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/conditional-naming-processgroup.yaml deleted file mode 100644 index 245ea929..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-processgroup/conditional-naming-processgroup.yaml +++ /dev/null @@ -1,8 +0,0 @@ -config: -- CDTEST_EW: template.json - -CDTEST_EW: -- name: MyProcessNamingRule -- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: TEST_EW -- skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/conditional-naming-service.yaml b/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/conditional-naming-service.yaml deleted file mode 100644 index 245ea929..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/conditional-naming-service/conditional-naming-service.yaml +++ /dev/null @@ -1,8 +0,0 @@ -config: -- CDTEST_EW: template.json - -CDTEST_EW: -- name: MyProcessNamingRule -- nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: TEST_EW -- skipDeployment: "true" diff --git a/BMW-Dynatrace-config/CD_TEST_EW/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_TEST_EW/dashboard/dashboard.yaml deleted file mode 100644 index cf7624c2..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/dashboard/dashboard.yaml +++ /dev/null @@ -1,125 +0,0 @@ -config: -- CDTEST_EW-PROD: default.json -- CDTEST_EW-E2E: default.json -- CDTEST_EW-INT: default.json -- CDTEST_EW-TEST: default.json - -#PROD dashboards for EMEA/NA/CN Prod -CDTEST_EW-PROD: -- name: CD_TEST_EW PROD -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: PROD -- skipDeployment: "true" -CDTEST_EW-PROD.EMEA-Prod: -- name: CD_TEST_EW PROD -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: PROD -- skipDeployment: "false" -CDTEST_EW-PROD.NA-Prod: -- name: CD_TEST_EW PROD -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: PROD -- skipDeployment: "false" -CDTEST_EW-PROD.CN-Prod: -- name: CD_TEST_EW PROD -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: PROD -- skipDeployment: "false" - -#E2E dashboards for EMEA/NA/CN Prod -CDTEST_EW-E2E: -- name: CD_TEST_EW E2E -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: E2E -- skipDeployment: "true" -CDTEST_EW-E2E.EMEA-Prod: -- name: CD_TEST_EW E2E -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: E2E -- skipDeployment: "false" -CDTEST_EW-E2E.NA-Prod: -- name: CD_TEST_EW E2E -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: E2E -- skipDeployment: "false" -CDTEST_EW-E2E.CN-Prod: -- name: CD_TEST_EW E2E -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: E2E -- skipDeployment: "false" - -#INT dashboards for EMEA/NA/CN PreProd -CDTEST_EW-INT: -- name: CD_TEST_EW INT -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: INT -- skipDeployment: "true" -CDTEST_EW-INT.EMEA-PreProd: -- name: CD_TEST_EW INT -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: INT -- skipDeployment: "false" -CDTEST_EW-INT.NA-PreProd: -- name: CD_TEST_EW INT -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: INT -- skipDeployment: "false" -CDTEST_EW-INT.CN-PreProd: -- name: CD_TEST_EW INT -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: INT -- skipDeployment: "false" - -#TEST dashboards for EMEA/NA/CN PreProd -CDTEST_EW-TEST: -- name: CD_TEST_EW TEST -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: TEST -- skipDeployment: "true" -CDTEST_EW-TEST.EMEA-PreProd: -- name: CD_TEST_EW TEST -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: TEST -- skipDeployment: "false" -CDTEST_EW-TEST.NA-PreProd: -- name: CD_TEST_EW TEST -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: TEST -- skipDeployment: "false" -CDTEST_EW-TEST.CN-PreProd: -- name: CD_TEST_EW TEST -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- tag: TEST_EW -- env: TEST -- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/management-zone/default.json b/BMW-Dynatrace-config/CD_TEST_EW/management-zone/default.json deleted file mode 100644 index a52d6376..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/management-zone/default.json +++ /dev/null @@ -1,120 +0,0 @@ -{ - "dimensionalRules": [], - "name": "{{.name}}", - "entitySelectorBasedRules": [ - { - "enabled": true, - "entitySelector": "type(Service),tag({{.compassIDs}})" - } - ], - "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" - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_TEST_EW/management-zone/management-zone.yaml deleted file mode 100644 index 7238bbff..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/management-zone/management-zone.yaml +++ /dev/null @@ -1,7 +0,0 @@ -config: -- CDTEST_EW: default.json - -CDTEST_EW: -- name: CD_TEST_EW -- tag: TEST_EW -- compassIDs: '\"compass-id:am-cns\",\"compass-id:am-proxy\"' \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW/notification/notification.yaml b/BMW-Dynatrace-config/CD_TEST_EW/notification/notification.yaml deleted file mode 100644 index 4f321bd6..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/notification/notification.yaml +++ /dev/null @@ -1,102 +0,0 @@ -config: -- CDTEST_EW: msTeams.json -- CDTEST_EWITSM: itsm.json - -# Notification System for EMEA/NA/CN Prod msTeams -CDTEST_EW.EMEA-Prod: -- name: CD_TEST_EW PROD -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://empty -- skipDeployment: "true" -CDTEST_EW.NA-Prod: -- name: CD_TEST_EW PROD -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://empty -- skipDeployment: "true" -CDTEST_EW.CN-Prod: -- name: CD_TEST_EW PROD -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://empty -- skipDeployment: "true" - -# Notification System for EMEA/NA/CN PreProd msTeams -CDTEST_EW.EMEA-PreProd: -- name: CD_TEST_EW INT -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://empty -- skipDeployment: "true" -CDTEST_EW.NA-PreProd: -- name: CD_TEST_EW INT -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://empty -- skipDeployment: "true" -CDTEST_EW.CN-PreProd: -- name: CD_TEST_EW INT -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://empty -- skipDeployment: "true" - - -# Notification System for EMEA/NA/CN Prod ITSM -CDTEST_EWITSM.EMEA-Prod: -- name: CD_TEST_EW ITSM PROD -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - -CDTEST_EWITSM.NA-Prod: -- name: CD_TEST_EW ITSM PROD -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - - -CDTEST_EWITSM.CN-Prod: -- name: CD_TEST_EW ITSM PROD -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - -CDTEST_EWITSM.EMEA-PreProd: -- name: CD_TEST_EW ITSM INT -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - -CDTEST_EWITSM.NA-PreProd: -- name: CD_TEST_EW ITSM INT -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - - -CDTEST_EWITSM.CN-PreProd: -- name: CD_TEST_EW ITSM INT -- alertingProfile: CD_TEST_EW/alerting-profile/CDTEST_EW.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - diff --git a/BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/synthetic-monitor.yaml b/BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/synthetic-monitor.yaml deleted file mode 100644 index edf12a13..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW/synthetic-monitor/synthetic-monitor.yaml +++ /dev/null @@ -1,10 +0,0 @@ -config: -- TEST_EW: default.json - -TEST_EW: -- name: CD_TEST_EW - -- mzName: CD_TEST_EW/management-zone/CDTEST_EW.name -- mzId: CD_TEST_EW/management-zone/CDTEST_EW.id -- endpoint: -- location: -- skipDeployment: "true" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/alerting-profile.yaml b/BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/alerting-profile.yaml deleted file mode 100644 index 19c60ade..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/alerting-profile.yaml +++ /dev/null @@ -1,43 +0,0 @@ -config: -- CDnewComponentTag: default.json - - -#Prod alerting profiles for EMEA/NA/CN -CDnewComponentTag.EMEA-Prod: -- name: CD_TEST_EW2 PROD -- tag: newComponentTag -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- env: PROD -- skipDeployment: "false" -CDnewComponentTag.NA-Prod: -- name: CD_TEST_EW2 PROD -- tag: newComponentTag -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- env: PROD -- skipDeployment: "false" -CDnewComponentTag.CN-Prod: -- name: CD_TEST_EW2 PROD -- tag: newComponentTag -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- env: PROD -- skipDeployment: "false" - -#INT alerting profiles for EMEA/NA/CN -CDnewComponentTag.EMEA-PreProd: -- name: CD_TEST_EW2 INT -- tag: newComponentTag -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- env: INT -- skipDeployment: "false" -CDnewComponentTag.NA-PreProd: -- name: CD_TEST_EW2 INT -- tag: newComponentTag -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- env: INT -- skipDeployment: "false" -CDnewComponentTag.CN-PreProd: -- name: CD_TEST_EW2 INT -- tag: newComponentTag -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- env: INT -- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/default.json b/BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/default.json deleted file mode 100644 index 681a4c64..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/alerting-profile/default.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "displayName": "{{.name}}", - "eventTypeFilters": [], - "managementZoneId": "{{.mzId}}", - "mzId": "{{.mzId}}", - "rules": [ - { - "delayInMinutes": 0, - "severityLevel": "AVAILABILITY", - "tagFilter": { - "includeMode": "INCLUDE_ALL", - "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, - { - "context": "CONTEXTLESS", - "key": "Environment", - "value": "{{.env}}" - } - ] - } - }, - { - "delayInMinutes": 10, - "severityLevel": "ERROR", - "tagFilter": { - "includeMode": "INCLUDE_ALL", - "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, - { - "context": "CONTEXTLESS", - "key": "Environment", - "value": "{{.env}}" - } - ] - } - }, - { - "delayInMinutes": 30, - "severityLevel": "PERFORMANCE", - "tagFilter": { - "includeMode": "INCLUDE_ALL", - "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, - { - "context": "CONTEXTLESS", - "key": "Environment", - "value": "{{.env}}" - } - ] - } - }, - { - "delayInMinutes": 30, - "severityLevel": "RESOURCE_CONTENTION", - "tagFilter": { - "includeMode": "INCLUDE_ALL", - "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, - { - "context": "CONTEXTLESS", - "key": "Environment", - "value": "{{.env}}" - } - ] - } - }, - { - "delayInMinutes": 10, - "severityLevel": "CUSTOM_ALERT", - "tagFilter": { - "includeMode": "INCLUDE_ALL", - "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, - { - "context": "CONTEXTLESS", - "key": "Environment", - "value": "{{.env}}" - } - ] - } - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/calculated-metrics-service/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/calculated-metrics-service/README.md deleted file mode 100644 index f958f929..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/calculated-metrics-service/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure custom metrics? - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Calculated+Metrics) page to configure your custom metrics. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/README.md deleted file mode 100644 index 8c10d2b4..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure process groups? - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Process+Group+Naming) page to configure your process groups. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/template.json b/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/template.json deleted file mode 100644 index 7c039808..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-processgroup/template.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "displayName": "{{.name}}", - "enabled": true, - "metadata": { - "clusterVersion": "1.214.107.20210407-223952", - "configurationVersions": [ - 0 - ] - }, - "nameFormat": "{{.nameFormat}}", - "rules": [ - { - "comparisonInfo": { - "negate": false, - "operator": "EQUALS", - "type": "TAG", - "value": { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - } - }, - "key": { - "attribute": "PROCESS_GROUP_TAGS" - } - } - ], - "type": "PROCESS_GROUP" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/README.md deleted file mode 100644 index 93dc620b..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure service naming - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Service+Naming) page to configure your service naming. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/template.json b/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/template.json deleted file mode 100644 index 5d4fac56..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/conditional-naming-service/template.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "displayName": "{{.name}}", - "enabled": true, - "metadata": { - "clusterVersion": "1.214.107.20210407-223952", - "configurationVersions": [ - 0 - ] - }, - "nameFormat": "{{.nameFormat}}", - "rules": [ - { - "comparisonInfo": { - "negate": false, - "operator": "EQUALS", - "type": "TAG", - "value": { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - } - }, - "key": { - "attribute": "SERVICE_TAGS" - } - } - ], - "type": "SERVICE" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/README.md deleted file mode 100644 index a467a6f8..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure custom services? - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Custom+Services) page to configure your custom services. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/custom-service-java.yaml deleted file mode 100644 index 25f8a028..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/custom-service-java.yaml +++ /dev/null @@ -1,9 +0,0 @@ -config: -- customService1: template-1-1.json - -customService1: -- name: myJOYNRService -- className: com.bmw.cc.conn.this.is.just.an.exampleClasss -- methodName: exampleJoynrMethod -- returnType: void -- skipDeployment: "true" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/template-1-1.json deleted file mode 100644 index b3003515..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/custom-service-java/template-1-1.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "enabled": true, - "name": "{{.name}}", - "processGroups": [], - "queueEntryPoint": false, - "queueEntryPointType": null, - "rules": [ - { - "annotations": [], - "className": "{{.className}}", - "enabled": true, - "fileName": "", - "matcher": "EQUALS", - "methodRules": [ - { - "argumentTypes": [], - "methodName": "{{.methodName}}", - "returnType": "{{.returnType}}" - } - ] - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/README.md deleted file mode 100644 index 2b6d5717..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure dashboards? - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Dashboards) page to configure your dashboards. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/dashboard.yaml b/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/dashboard.yaml deleted file mode 100644 index f3f33424..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/dashboard.yaml +++ /dev/null @@ -1,125 +0,0 @@ -config: -- CDnewComponentTag-PROD: default.json -- CDnewComponentTag-E2E: default.json -- CDnewComponentTag-INT: default.json -- CDnewComponentTag-TEST: default.json - -#PROD dashboards for EMEA/NA/CN Prod -CDnewComponentTag-PROD: -- name: CD_TEST_EW2 PROD -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: PROD -- skipDeployment: "true" -CDnewComponentTag-PROD.EMEA-Prod: -- name: CD_TEST_EW2 PROD -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: PROD -- skipDeployment: "false" -CDnewComponentTag-PROD.NA-Prod: -- name: CD_TEST_EW2 PROD -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: PROD -- skipDeployment: "false" -CDnewComponentTag-PROD.CN-Prod: -- name: CD_TEST_EW2 PROD -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: PROD -- skipDeployment: "false" - -#E2E dashboards for EMEA/NA/CN Prod -CDnewComponentTag-E2E: -- name: CD_TEST_EW2 E2E -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: E2E -- skipDeployment: "true" -CDnewComponentTag-E2E.EMEA-Prod: -- name: CD_TEST_EW2 E2E -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: E2E -- skipDeployment: "false" -CDnewComponentTag-E2E.NA-Prod: -- name: CD_TEST_EW2 E2E -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: E2E -- skipDeployment: "false" -CDnewComponentTag-E2E.CN-Prod: -- name: CD_TEST_EW2 E2E -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: E2E -- skipDeployment: "false" - -#INT dashboards for EMEA/NA/CN PreProd -CDnewComponentTag-INT: -- name: CD_TEST_EW2 INT -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: INT -- skipDeployment: "true" -CDnewComponentTag-INT.EMEA-PreProd: -- name: CD_TEST_EW2 INT -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: INT -- skipDeployment: "false" -CDnewComponentTag-INT.NA-PreProd: -- name: CD_TEST_EW2 INT -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: INT -- skipDeployment: "false" -CDnewComponentTag-INT.CN-PreProd: -- name: CD_TEST_EW2 INT -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: INT -- skipDeployment: "false" - -#TEST dashboards for EMEA/NA/CN PreProd -CDnewComponentTag-TEST: -- name: CD_TEST_EW2 TEST -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: TEST -- skipDeployment: "true" -CDnewComponentTag-TEST.EMEA-PreProd: -- name: CD_TEST_EW2 TEST -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: TEST -- skipDeployment: "false" -CDnewComponentTag-TEST.NA-PreProd: -- name: CD_TEST_EW2 TEST -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: TEST -- skipDeployment: "false" -CDnewComponentTag-TEST.CN-PreProd: -- name: CD_TEST_EW2 TEST -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- tag: newComponentTag -- env: TEST -- skipDeployment: "false" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/default.json b/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/default.json deleted file mode 100644 index ef07d18c..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/dashboard/default.json +++ /dev/null @@ -1,309 +0,0 @@ -{ - "metadata": { - "configurationVersions": [ - 3 - ], - "clusterVersion": "1.214.107.20210407-223952" - }, - "dashboardMetadata": { - "name": "{{.name}}", - "shared": true, - "owner": "Ignacio.Goldman@partner.bmwgroup.com", - "dashboardFilter": { - "timeframe": "-24h to now" - }, - "tags": [ - "{{.tag}}" - ], - "preset": true - }, - "tiles": [ - { - "name": "Custom chart", - "tileType": "CUSTOM_CHARTING", - "configured": true, - "bounds": { - "top": 228, - "left": 38, - "width": 1064, - "height": 304 - }, - "tileFilter": {}, - "filterConfig": { - "type": "MIXED", - "customName": "Failure rate (HTTP 4xx/5xx errors)", - "defaultName": "Custom chart", - "chartConfig": { - "legendShown": true, - "type": "TIMESERIES", - "series": [ - { - "metric": "builtin:service.errors.fourxx.rate", - "aggregation": "AVG", - "type": "BAR", - "entityType": "SERVICE", - "dimensions": [], - "sortAscending": false, - "sortColumn": false, - "aggregationRate": "TOTAL" - }, - { - "metric": "builtin:service.errors.fivexx.rate", - "aggregation": "AVG", - "type": "BAR", - "entityType": "SERVICE", - "dimensions": [], - "sortAscending": false, - "sortColumn": true, - "aggregationRate": "TOTAL" - } - ], - "resultMetadata": { - "nullbuiltin:service.errors.fivexx.rate|AVG|TOTAL|BAR|SERVICE": { - "lastModified": 1617956393463, - "customColor": "#ff0000" - }, - "nullbuiltin:service.errors.fourxx.rate|AVG|TOTAL|BAR|SERVICE": { - "lastModified": 1617956441725, - "customColor": "#fff29a" - } - } - }, - "filtersPerEntityType": { - "SERVICE": { - "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" - ] - } - } - } - }, - { - "name": "Problems", - "tileType": "OPEN_PROBLEMS", - "configured": true, - "bounds": { - "top": 38, - "left": 950, - "width": 152, - "height": 152 - }, - "tileFilter": { - "managementZone": { - "id": "{{.mzId}}", - "name": "{{.mzName}}" - } - } - }, - { - "name": "Overall Health", - "tileType": "HEADER", - "configured": true, - "bounds": { - "top": 0, - "left": 38, - "width": 1064, - "height": 38 - }, - "tileFilter": {} - }, - { - "name": "Markdown", - "tileType": "MARKDOWN", - "configured": true, - "bounds": { - "top": 532, - "left": 38, - "width": 1064, - "height": 38 - }, - "tileFilter": {}, - "markdown": "---\n" - }, - { - "name": "Custom chart", - "tileType": "CUSTOM_CHARTING", - "configured": true, - "bounds": { - "top": 570, - "left": 38, - "width": 1064, - "height": 304 - }, - "tileFilter": {}, - "filterConfig": { - "type": "MIXED", - "customName": "Response time, Request Count and Number of Errors", - "defaultName": "Custom chart", - "chartConfig": { - "legendShown": true, - "type": "TIMESERIES", - "series": [ - { - "metric": "builtin:service.response.time", - "aggregation": "AVG", - "type": "LINE", - "entityType": "SERVICE", - "dimensions": [], - "sortAscending": false, - "sortColumn": false, - "aggregationRate": "TOTAL" - }, - { - "metric": "builtin:service.requestCount.total", - "aggregation": "NONE", - "type": "BAR", - "entityType": "SERVICE", - "dimensions": [], - "sortAscending": false, - "sortColumn": false, - "aggregationRate": "TOTAL" - }, - { - "metric": "builtin:service.errors.total.count", - "aggregation": "NONE", - "type": "BAR", - "entityType": "SERVICE", - "dimensions": [], - "sortAscending": false, - "sortColumn": true, - "aggregationRate": "TOTAL" - } - ], - "resultMetadata": { - "nullbuiltin:service.requestCount.total|NONE|TOTAL|BAR|SERVICE": { - "lastModified": 1595275720776, - "customColor": "#008cdb" - }, - "nullbuiltin:service.errors.total.count|NONE|TOTAL|BAR|SERVICE": { - "lastModified": 1595275955999, - "customColor": "#ef651f" - }, - "nullbuiltin:service.response.time|AVG|TOTAL|LINE|SERVICE": { - "lastModified": 1595275686773, - "customColor": "#b4e5f9" - } - } - }, - "filtersPerEntityType": { - "SERVICE": { - "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" - ] - } - } - } - }, - { - "name": "Markdown", - "tileType": "MARKDOWN", - "configured": true, - "bounds": { - "top": 190, - "left": 38, - "width": 1064, - "height": 38 - }, - "tileFilter": {}, - "markdown": "---\n" - }, - { - "name": "", - "tileType": "DATABASES_OVERVIEW", - "configured": true, - "bounds": { - "top": 38, - "left": 646, - "width": 190, - "height": 152 - }, - "tileFilter": {}, - "filterConfig": { - "type": "DATABASE", - "customName": "Databases", - "defaultName": "Databases", - "chartConfig": { - "legendShown": true, - "type": "TIMESERIES", - "series": [], - "resultMetadata": {} - }, - "filtersPerEntityType": { - "DATABASE": { - "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" - ] - } - } - }, - "chartVisible": true - }, - { - "name": "", - "tileType": "SERVICES", - "configured": true, - "bounds": { - "top": 38, - "left": 342, - "width": 190, - "height": 152 - }, - "tileFilter": {}, - "filterConfig": { - "type": "SERVICE", - "customName": "Services", - "defaultName": "Services", - "chartConfig": { - "legendShown": true, - "type": "TIMESERIES", - "series": [], - "resultMetadata": {} - }, - "filtersPerEntityType": { - "SERVICE": { - "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" - ] - } - } - }, - "chartVisible": true - }, - { - "name": "", - "tileType": "HOSTS", - "configured": true, - "bounds": { - "top": 38, - "left": 38, - "width": 190, - "height": 152 - }, - "tileFilter": {}, - "filterConfig": { - "type": "HOST", - "customName": "Hosts", - "defaultName": "Hosts", - "chartConfig": { - "legendShown": true, - "type": "TIMESERIES", - "series": [], - "resultMetadata": {} - }, - "filtersPerEntityType": { - "HOST": { - "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" - ] - } - } - }, - "chartVisible": true - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/README.md deleted file mode 100644 index ffe9d6e3..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### 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_TEST_EW2/management-zone/default.json b/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/default.json deleted file mode 100644 index bffa0c3b..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/default.json +++ /dev/null @@ -1,114 +0,0 @@ -{ - "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" - } - ] -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/management-zone.yaml b/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/management-zone.yaml deleted file mode 100644 index 9c8762c1..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/management-zone/management-zone.yaml +++ /dev/null @@ -1,7 +0,0 @@ -config: -- CDnewComponentTag: default.json - -CDnewComponentTag: -- name: CD_TEST_EW2 -- tag: newComponentTag -- compassID1: diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/notification/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/notification/README.md deleted file mode 100644 index 5ba3825a..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/notification/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure notification systems? - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Problem+Notification+Integrations) page to configure your notification systems. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/notification/email.json b/BMW-Dynatrace-config/CD_TEST_EW2/notification/email.json deleted file mode 100644 index 486642a7..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/notification/email.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "active": true, - "alertingProfile": "{{.alertingProfile}}", - "bccReceivers": [], - "body": "{ProblemDetailsHTML}", - "ccReceivers": [], - "name": "{{.name}}", - "receivers": [ - "{{.receivers}}" - ], - "subject": "{State} Problem {ProblemID}: {ImpactedEntity}", - "type": "EMAIL" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/notification/itsm.json b/BMW-Dynatrace-config/CD_TEST_EW2/notification/itsm.json deleted file mode 100644 index 677ef0ea..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/notification/itsm.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "acceptAnyCertificate": false, - "active": true, - "alertingProfile": "{{.alertingProfile}}", - "headers": [ - { - "name": "Authorization", - "value": "{{.Env.SecretAuthHeader}}" - }, - { - "name": "x-apikey", - "value": "{{.Env.SecretXAPIKey}}" - } - ], - "name": "{{.name}}", - "notifyEventMergesEnabled": false, - "payload": "[\n{\n \"attributes\": {\n \"CLASS\": \"BusinessTransaction\",\n \"source\": \"MgmtZone: {{.mzName}}\",\n \"severity\": \"MINOR\",\n \"origin\": \"{{.appdid}}\",\n \"sub_origin\": \"Dynatrace SaaS - {ImpactedEntity}\",\n \"adapter_host\": \"{{ .DTEnvironment }}\",\n \"msg\": \"{ProblemDetailsText}\",\n \"contract_id\": \"{{.contractid}}\",\n \"ars_esc\": \"Yes\",\n \"ars_delay_time\": \"0\",\n \"hostname\": \"test\",\n \"sub_source\": \"Environment: CoCo_EMEA_Prod\",\n \"server_loc\": \"\",\n \"event_id\": \"AI001\",\n \"dd_plus\": \"{ProblemSeverity}\",\n \"dd1\": \"{ProblemURL}\",\n \"dd2\": \"{PID}\"\n }\n}\n]", - "type": "WEBHOOK", - "url": "{{.webhook}}" -} diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/notification/msTeams.json b/BMW-Dynatrace-config/CD_TEST_EW2/notification/msTeams.json deleted file mode 100644 index 33e92cf6..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/notification/msTeams.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "acceptAnyCertificate": false, - "active": true, - "alertingProfile": "{{.alertingProfile}}", - "headers": [], - "name": "{{.name}}", - "notifyEventMergesEnabled": false, - "payload": "{\n\"title\":\"{ProblemTitle}\",\n\"text\":\"{ProblemDetailsHTML}\",\n\"themeColor\":\"EA4300\"\n}", - "type": "WEBHOOK", - "url": "{{.webhook}}" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/notification/notification.yaml b/BMW-Dynatrace-config/CD_TEST_EW2/notification/notification.yaml deleted file mode 100644 index 3750ff42..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/notification/notification.yaml +++ /dev/null @@ -1,102 +0,0 @@ -config: -- CDnewComponentTag: msTeams.json -- CDnewComponentTagITSM: itsm.json - -# Notification System for EMEA/NA/CN Prod msTeams -CDnewComponentTag.EMEA-Prod: -- name: CD_TEST_EW2 PROD -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://empty -- skipDeployment: "true" -CDnewComponentTag.NA-Prod: -- name: CD_TEST_EW2 PROD -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://empty -- skipDeployment: "true" -CDnewComponentTag.CN-Prod: -- name: CD_TEST_EW2 PROD -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://empty -- skipDeployment: "true" - -# Notification System for EMEA/NA/CN PreProd msTeams -CDnewComponentTag.EMEA-PreProd: -- name: CD_TEST_EW2 INT -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://empty -- skipDeployment: "true" -CDnewComponentTag.NA-PreProd: -- name: CD_TEST_EW2 INT -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://empty -- skipDeployment: "true" -CDnewComponentTag.CN-PreProd: -- name: CD_TEST_EW2 INT -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://empty -- skipDeployment: "true" - - -# Notification System for EMEA/NA/CN Prod ITSM -CDnewComponentTagITSM.EMEA-Prod: -- name: CD_TEST_EW2 ITSM PROD -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - -CDnewComponentTagITSM.NA-Prod: -- name: CD_TEST_EW2 ITSM PROD -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - - -CDnewComponentTagITSM.CN-Prod: -- name: CD_TEST_EW2 ITSM PROD -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - -CDnewComponentTagITSM.EMEA-PreProd: -- name: CD_TEST_EW2 ITSM INT -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - -CDnewComponentTagITSM.NA-PreProd: -- name: CD_TEST_EW2 ITSM INT -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - - -CDnewComponentTagITSM.CN-PreProd: -- name: CD_TEST_EW2 ITSM INT -- alertingProfile: CD_TEST_EW2/alerting-profile/CDnewComponentTag.id -- webhook: https://apim-beta-prod.bmwgroup.com/evtmgmt/eventproxy/v1 -- contractid: "10APP11906401" -- appdid: "TEST123" -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- DTEnvironment: https://xxu26128.live.dynatrace.com -- skipDeployment: "true" - diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/README.md b/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/README.md deleted file mode 100644 index 04d7949f..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/README.md +++ /dev/null @@ -1,4 +0,0 @@ - -### How to configure synthetics? - -Please refer to [this](https://atc.bmwgroup.net/confluence/display/OPMAAS/Documentation+%7C+Synthetic+Monitors) page to configure your synthetics. \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/default.json b/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/default.json deleted file mode 100644 index cf83039b..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/default.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "anomalyDetection": { - "loadingTimeThresholds": { - "enabled": false, - "thresholds": [ - { - "type": "TOTAL", - "valueMs": 0 - } - ] - }, - "outageHandling": { - "globalOutage": true, - "localOutage": false, - "localOutagePolicy": { - "affectedLocations": 1, - "consecutiveRuns": 3 - } - } - }, - "automaticallyAssignedApps": [], - "enabled": true, - "frequencyMin": 1, - "locations": [ - "{{.location}}" - ], - "managementZones": [ - { - "id": "{{.mzId}}", - "name": "{{.mzName}}" - } - ], - "manuallyAssignedApps": [], - "name": "{{.name}}", - "requests": [ - { - "entityId": "HTTP_CHECK_STEP-0BA53EC80CD7EE5A", - "name": "{{.name}}", - "sequenceNumber": 1 - } - ], - "script": { - "requests": [ - { - "configuration": { - "acceptAnyCertificate": true, - "followRedirects": true, - "requestHeaders": [ - { - "name": "accept", - "value": "application/json" - }, - { - "name": "Content-Type", - "value": "application/json" - }, - { - "name": "api_key", - "value": "355DE89C-7B72-4EA3-BDD8-157C79EB2C23" - } - ] - }, - "description": "{{.name}}", - "method": "GET", - "url": "{{.endpoint}}", - "validation": { - "rules": [ - { - "passIfFound": true, - "type": "httpStatusesList", - "value": "200" - } - ], - "rulesChaining": "or" - } - } - ], - "version": "1.0" - }, - "tags": [], - "type": "HTTP" -} \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/synthetic-monitor.yaml b/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/synthetic-monitor.yaml deleted file mode 100644 index 6bd8030c..00000000 --- a/BMW-Dynatrace-config/CD_TEST_EW2/synthetic-monitor/synthetic-monitor.yaml +++ /dev/null @@ -1,10 +0,0 @@ -config: -- newComponentTag: default.json - -newComponentTag: -- name: CD_TEST_EW2 - -- mzName: CD_TEST_EW2/management-zone/CDnewComponentTag.name -- mzId: CD_TEST_EW2/management-zone/CDnewComponentTag.id -- endpoint: -- location: -- skipDeployment: "true" \ No newline at end of file diff --git a/environment.yaml b/environment.yaml index b2c189ed..f4440ef8 100644 --- a/environment.yaml +++ b/environment.yaml @@ -8,22 +8,22 @@ EMEA-PreProd: - env-url: "https://qqk70169.live.dynatrace.com" - env-token-name: "qqk70169_TOKEN" -#NA-Prod: -# - name: "NA-Prod" -# - env-url: "https://wgv50241.live.dynatrace.com" -# - env-token-name: "wgv50241_TOKEN" +NA-Prod: + - name: "NA-Prod" + - env-url: "https://wgv50241.live.dynatrace.com" + - env-token-name: "wgv50241_TOKEN" -#NA-PreProd: -# - name: "NA-PreProd" -# - env-url: "https://onb44935.live.dynatrace.com" -# - env-token-name: "onb44935_TOKEN" +NA-PreProd: + - name: "NA-PreProd" + - env-url: "https://onb44935.live.dynatrace.com" + - env-token-name: "onb44935_TOKEN" -#CN-Prod: -# - name: "CN-Prod" -# - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b@PROXY" -# - env-token-name: "CN_Prod_TOKEN" +CN-Prod: + - name: "CN-Prod" + - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/b921f1b9-c00e-4031-b9d1-f5a0d530757b@PROXY" + - env-token-name: "CN_Prod_TOKEN" -#CN-PreProd: -# - name: "CN-PreProd" -# - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35@PROXY" -# - env-token-name: "CN_PreProd_TOKEN" \ No newline at end of file +CN-PreProd: + - name: "CN-PreProd" + - env-url: "https://dynatracemgd-tsp.bmwgroup.net/e/ab88c03b-b7fc-45f0-9115-9e9ecc0ced35@PROXY" + - env-token-name: "CN_PreProd_TOKEN" \ No newline at end of file diff --git a/onboard.sh b/onboard.sh index 00a7cd45..6ba7f031 100755 --- a/onboard.sh +++ b/onboard.sh @@ -1,18 +1,5 @@ #!/bin/bash -#function test { echo "param1 $1"; } -function join { local IFS="$1"; shift; echo "$*"; } -function join_by { local d=${1-} f=${2-}; if shift 2; then printf %s "$f" "${@/#/$d}"; fi; } - -joinByString() { - local separator="$1" - shift - local first="$1" - shift - printf "%s" "$first" "${@/#/$separator}" -} - - # Help command if [ "$1" == "-h" ]; then echo "Usage: `basename $0` " @@ -45,28 +32,21 @@ declare -a config_arr=( IFS=',' read -a compassIDs <<< $2 -delimeterZ=',' -#result=$(joinByString ${delimeterZ} ${compassIDs[@]}) - -separator="\\\"" +separator="\\\\\"compass-id:" joined="" for item in "${compassIDs[@]}"; do # printf "$item" joined="$joined$separator$item" - separator="\\\",\\\"" + separator="\\\\\",\\\\\"compass-id:" done -lastdel="\"" -result="$joined$lastdel" +lastdel="\\\\\"" +compassIDs_result="$joined$lastdel" -echo "Result: $result" -joinByString , ${compassIDs[@]} -#echo join_by , "${compassIDs[@]}" - -#result=$(join , ${compassIDs[@]}) -#echo "Result" + $result +#echo "Result: $compassIDs_result" + for i in "${config_arr[@]}" do @@ -76,12 +56,7 @@ for i in "${config_arr[@]}" cp -R onboarding/CD_managementZone/$i BMW-Dynatrace-config/$1/ if [ -f "BMW-Dynatrace-config/$1/$i/$i.yaml" ]; then sed -i "s/CD_managementZone/$1/g" BMW-Dynatrace-config/$1/$i/$i.yaml - - #compassIds=$2.split(',').join(',') - - sed -i "s/newCompassIds/$compassIds/g" BMW-Dynatrace-config/$1/$i/$i.yaml - - #sed -i "s/newComponentTag/$2/g" BMW-Dynatrace-config/$1/$i/$i.yaml + sed -i "s/newCompassIds/$compassIDs_result/g" BMW-Dynatrace-config/$1/$i/$i.yaml fi else diff --git a/onboarding/CD_managementZone/alerting-profile/alerting-profile.yaml b/onboarding/CD_managementZone/alerting-profile/alerting-profile.yaml index 02d9748a..0cd69ee9 100644 --- a/onboarding/CD_managementZone/alerting-profile/alerting-profile.yaml +++ b/onboarding/CD_managementZone/alerting-profile/alerting-profile.yaml @@ -5,19 +5,16 @@ config: #Prod alerting profiles for EMEA/NA/CN CDnewComponentTag.EMEA-Prod: - name: CD_managementZone PROD -- tag: newComponentTag - mzId: CD_managementZone/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" CDnewComponentTag.NA-Prod: - name: CD_managementZone PROD -- tag: newComponentTag - mzId: CD_managementZone/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" CDnewComponentTag.CN-Prod: - name: CD_managementZone PROD -- tag: newComponentTag - mzId: CD_managementZone/management-zone/CDnewComponentTag.id - env: PROD - skipDeployment: "false" @@ -25,19 +22,16 @@ CDnewComponentTag.CN-Prod: #INT alerting profiles for EMEA/NA/CN CDnewComponentTag.EMEA-PreProd: - name: CD_managementZone INT -- tag: newComponentTag - mzId: CD_managementZone/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" CDnewComponentTag.NA-PreProd: - name: CD_managementZone INT -- tag: newComponentTag - mzId: CD_managementZone/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" CDnewComponentTag.CN-PreProd: - name: CD_managementZone INT -- tag: newComponentTag - mzId: CD_managementZone/management-zone/CDnewComponentTag.id - env: INT - skipDeployment: "false" \ No newline at end of file diff --git a/onboarding/CD_managementZone/alerting-profile/default.json b/onboarding/CD_managementZone/alerting-profile/default.json index 681a4c64..bb81115c 100644 --- a/onboarding/CD_managementZone/alerting-profile/default.json +++ b/onboarding/CD_managementZone/alerting-profile/default.json @@ -10,11 +10,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -29,11 +24,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -48,11 +38,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -67,11 +52,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", @@ -86,11 +66,6 @@ "tagFilter": { "includeMode": "INCLUDE_ALL", "tagFilters": [ - { - "context": "CONTEXTLESS", - "key": "Component", - "value": "{{.tag}}" - }, { "context": "CONTEXTLESS", "key": "Environment", diff --git a/onboarding/CD_managementZone/conditional-naming-processgroup/conditional-naming-processgroup.yaml b/onboarding/CD_managementZone/conditional-naming-processgroup/conditional-naming-processgroup.yaml index be5821ec..fb9502e8 100644 --- a/onboarding/CD_managementZone/conditional-naming-processgroup/conditional-naming-processgroup.yaml +++ b/onboarding/CD_managementZone/conditional-naming-processgroup/conditional-naming-processgroup.yaml @@ -4,5 +4,4 @@ config: CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: newComponentTag - skipDeployment: "true" diff --git a/onboarding/CD_managementZone/conditional-naming-service/conditional-naming-service.yaml b/onboarding/CD_managementZone/conditional-naming-service/conditional-naming-service.yaml index be5821ec..fb9502e8 100644 --- a/onboarding/CD_managementZone/conditional-naming-service/conditional-naming-service.yaml +++ b/onboarding/CD_managementZone/conditional-naming-service/conditional-naming-service.yaml @@ -4,5 +4,4 @@ config: CDnewComponentTag: - name: MyProcessNamingRule - nameFormat: "{ProcessGroup:KubernetesNamespace/regex-example}" -- tag: newComponentTag - skipDeployment: "true" diff --git a/onboarding/CD_managementZone/dashboard/dashboard.yaml b/onboarding/CD_managementZone/dashboard/dashboard.yaml index 1b75b656..8aa0aaba 100644 --- a/onboarding/CD_managementZone/dashboard/dashboard.yaml +++ b/onboarding/CD_managementZone/dashboard/dashboard.yaml @@ -9,28 +9,24 @@ CDnewComponentTag-PROD: - name: CD_managementZone PROD - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: PROD - skipDeployment: "true" CDnewComponentTag-PROD.EMEA-Prod: - name: CD_managementZone PROD - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: PROD - skipDeployment: "false" CDnewComponentTag-PROD.NA-Prod: - name: CD_managementZone PROD - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: PROD - skipDeployment: "false" CDnewComponentTag-PROD.CN-Prod: - name: CD_managementZone PROD - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: PROD - skipDeployment: "false" @@ -39,28 +35,24 @@ CDnewComponentTag-E2E: - name: CD_managementZone E2E - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: E2E - skipDeployment: "true" CDnewComponentTag-E2E.EMEA-Prod: - name: CD_managementZone E2E - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: E2E - skipDeployment: "false" CDnewComponentTag-E2E.NA-Prod: - name: CD_managementZone E2E - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: E2E - skipDeployment: "false" CDnewComponentTag-E2E.CN-Prod: - name: CD_managementZone E2E - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: E2E - skipDeployment: "false" @@ -69,28 +61,24 @@ CDnewComponentTag-INT: - name: CD_managementZone INT - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: INT - skipDeployment: "true" CDnewComponentTag-INT.EMEA-PreProd: - name: CD_managementZone INT - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: INT - skipDeployment: "false" CDnewComponentTag-INT.NA-PreProd: - name: CD_managementZone INT - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: INT - skipDeployment: "false" CDnewComponentTag-INT.CN-PreProd: - name: CD_managementZone INT - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: INT - skipDeployment: "false" @@ -99,27 +87,23 @@ CDnewComponentTag-TEST: - name: CD_managementZone TEST - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: TEST - skipDeployment: "true" CDnewComponentTag-TEST.EMEA-PreProd: - name: CD_managementZone TEST - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: TEST - skipDeployment: "false" CDnewComponentTag-TEST.NA-PreProd: - name: CD_managementZone TEST - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: TEST - skipDeployment: "false" CDnewComponentTag-TEST.CN-PreProd: - name: CD_managementZone TEST - mzName: CD_managementZone/management-zone/CDnewComponentTag.name - mzId: CD_managementZone/management-zone/CDnewComponentTag.id -- tag: newComponentTag - env: TEST - skipDeployment: "false" \ No newline at end of file diff --git a/onboarding/CD_managementZone/dashboard/default.json b/onboarding/CD_managementZone/dashboard/default.json index ef07d18c..189767ed 100644 --- a/onboarding/CD_managementZone/dashboard/default.json +++ b/onboarding/CD_managementZone/dashboard/default.json @@ -13,7 +13,7 @@ "timeframe": "-24h to now" }, "tags": [ - "{{.tag}}" + "{{.mzName}}" ], "preset": true }, @@ -28,7 +28,12 @@ "width": 1064, "height": 304 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "MIXED", "customName": "Failure rate (HTTP 4xx/5xx errors)", @@ -72,8 +77,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -106,7 +110,12 @@ "width": 1064, "height": 38 }, - "tileFilter": {} + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + } }, { "name": "Markdown", @@ -131,7 +140,12 @@ "width": 1064, "height": 304 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "MIXED", "customName": "Response time, Request Count and Number of Errors", @@ -189,8 +203,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -219,7 +232,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "DATABASE", "customName": "Databases", @@ -233,8 +251,7 @@ "filtersPerEntityType": { "DATABASE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -251,7 +268,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "SERVICE", "customName": "Services", @@ -265,8 +287,7 @@ "filtersPerEntityType": { "SERVICE": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } @@ -283,7 +304,12 @@ "width": 190, "height": 152 }, - "tileFilter": {}, + "tileFilter": { + "managementZone": { + "id": "{{.mzId}}", + "name": "{{.mzName}}" + } + }, "filterConfig": { "type": "HOST", "customName": "Hosts", @@ -297,8 +323,7 @@ "filtersPerEntityType": { "HOST": { "AUTO_TAGS": [ - "Environment:{{.env}}", - "Component:{{.tag}}" + "Environment:{{.env}}" ] } } diff --git a/onboarding/CD_managementZone/management-zone/default.json b/onboarding/CD_managementZone/management-zone/default.json index bffa0c3b..fc96de39 100644 --- a/onboarding/CD_managementZone/management-zone/default.json +++ b/onboarding/CD_managementZone/management-zone/default.json @@ -1,114 +1,23 @@ { "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, + "entitySelector": "type(PROCESS_GROUP_INSTANCE),tag({{.compassIDs}})" + }, + { + "enabled": true, + "entitySelector": "type(HOST),tag({{.compassIDs}})" + } ], - "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" - } - ] + "rules": [] } \ No newline at end of file diff --git a/onboarding/CD_managementZone/management-zone/management-zone.yaml b/onboarding/CD_managementZone/management-zone/management-zone.yaml index 9706f1d8..a57bf4b7 100644 --- a/onboarding/CD_managementZone/management-zone/management-zone.yaml +++ b/onboarding/CD_managementZone/management-zone/management-zone.yaml @@ -3,5 +3,4 @@ config: CDnewComponentTag: - name: CD_managementZone -- tag: newComponentTag -- compassID1: newCompassIds +- compassIDs: newCompassIds