From b4214de6cdbf36f7c52bba96b7b6895477098f80 Mon Sep 17 00:00:00 2001
From: "SLW\\ARNAUA" <Arnel.Arnautovic@nttdata.com>
Date: Mon, 6 Mar 2023 10:40:27 +0100
Subject: [PATCH] modified files in DE-<3,4,7> folders, renamed templates and
 slos folders

---
 DE-3/TP_Mobile_Send2VehicleMGU.yaml           |   6 -
 DE-4/TP_Mobile_Login.yaml                     |  23 ----
 DE-4/TP_Mobile_Mapping.yaml                   |  49 --------
 DE-4/TP_Mobile_VehicleList.yaml               |  17 ---
 DE-7/TP_Mobile_Remote360.yaml                 |  36 ------
 DE-7/TP_Mobile_RemoteServices.yaml            |  45 -------
 DE-7/TP_Mobile_VehicleData.yaml               |  19 ---
 .../TP_Mobile_Send2VehicleLegacy.yaml         |   0
 convert.py                                    |   3 +-
 .../terraform-template-2.j2                   |   0
 .../terraform-template-3.j2                   |   0
 .../terraform-template-4.j2                   |   0
 .../terraform-template.j2                     |   0
 .../slo/TP_Mobile_Send2VehicleMGU.tf          | 110 ------------------
 .../TP_Template.yaml                          |   0
 15 files changed, 1 insertion(+), 307 deletions(-)
 rename {DE-7 => DE-XX}/TP_Mobile_Send2VehicleLegacy.yaml (100%)
 rename {templates => jinja-templates}/terraform-template-2.j2 (100%)
 rename {templates => jinja-templates}/terraform-template-3.j2 (100%)
 rename {templates => jinja-templates}/terraform-template-4.j2 (100%)
 rename {templates => jinja-templates}/terraform-template.j2 (100%)
 delete mode 100644 output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf
 rename slos/TP_Template copy 9.yaml => slo-templates/TP_Template.yaml (100%)

diff --git a/DE-3/TP_Mobile_Send2VehicleMGU.yaml b/DE-3/TP_Mobile_Send2VehicleMGU.yaml
index cc84cca..112b33e 100644
--- a/DE-3/TP_Mobile_Send2VehicleMGU.yaml
+++ b/DE-3/TP_Mobile_Send2VehicleMGU.yaml
@@ -30,9 +30,3 @@ slo_definition:
       keyRequests:
       - "/v3/motorist/[UUID]/trips"
       - "/v2/motorist/[UUID]/trips"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "TripService - PROD"
-      keyRequests:
-      - "/v3/motorist/[UUID]/trips"
-      - "/v2/motorist/[UUID]/trips"
diff --git a/DE-4/TP_Mobile_Login.yaml b/DE-4/TP_Mobile_Login.yaml
index 1dff98b..2cff4de 100644
--- a/DE-4/TP_Mobile_Login.yaml
+++ b/DE-4/TP_Mobile_Login.yaml
@@ -29,15 +29,6 @@ slo_definition:
     - service: "btc-connected-oauth-service - PROD"
       keyRequests:
       - "POST /api/v1/oauth/token/identifier"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-      - service: "btc-user-composite-service - PROD"
-        keyRequests:
-        - "GET /api/v1/presentation/oauth/config"
-        - "GET /api/v1/presentation/profile-tab"
-      - service: "btc-connected-oauth-service - PROD"
-        keyRequests:
-        - "POST /api/v1/oauth/token/identifier"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -53,17 +44,3 @@ slo_definition:
       - "POST /api/v2/cop/login/sms"
       - "POST /api/v2/cop/sso"
       - "GET /api/v1/cop/logout"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-user-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/presentation/profile-account"
-      - "GET /api/v2/presentation/profile-account"
-      - "POST /api/v2/presentation/profile-account"
-      - "GET /api/v1/presentation/profile-tab/contacts"
-    - service: "btc-cn-connected-oauth-service - PROD"
-      keyRequests:
-      - "POST /api/v2/cop/login/pwd"
-      - "POST /api/v2/cop/login/sms"
-      - "POST /api/v2/cop/sso"
-      - "GET /api/v1/cop/logout"
diff --git a/DE-4/TP_Mobile_Mapping.yaml b/DE-4/TP_Mobile_Mapping.yaml
index 96a03c1..9a156d1 100644
--- a/DE-4/TP_Mobile_Mapping.yaml
+++ b/DE-4/TP_Mobile_Mapping.yaml
@@ -28,24 +28,6 @@ slo_definition:
       - "POST /api/v3/mappings/resend-security-code"
       - "GET /api/v3/images/<image>"
       - "DELETE /api/v3/mappings"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-user-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v2/presentation/users/validate"
-    - service: "vehicle-mapping-composite-service - PROD"
-      keyRequests:
-      - "POST /api/v2/vehicles/<VIN>/primary"
-      - "POST /api/v2/vehicles/<VIN>/primary/map"
-      - "POST /api/v1/vehicles/<VIN>/validate-security-code"
-      - "POST /api/v1/vehicles/<VIN>/resend-security-code"
-      - "DELETE /api/v1/vehicles/<VIN>"
-      - "POST /api/v3/mappings/create"
-      - "POST /api/v3/mappings/continue"
-      - "POST /api/v3/mappings/validate-security-code"
-      - "POST /api/v3/mappings/resend-security-code"
-      - "GET /api/v3/images/<image>"
-      - "DELETE /api/v3/mappings"
   NA-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -66,25 +48,6 @@ slo_definition:
       - "GET /api/v3/images/<image>"
       - "DELETE /api/v3/mappings"
       - "POST /api/v2/vehicles/<VIN>/secondary"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-user-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v2/presentation/users/validate"
-    - service: "vehicle-mapping-composite-service - PROD"
-      keyRequests:
-      - "POST /api/v2/vehicles/<VIN>/primary"
-      - "POST /api/v2/vehicles/<VIN>/primary/map"
-      - "POST /api/v1/vehicles/<VIN>/validate-security-code"
-      - "POST /api/v1/vehicles/<VIN>/resend-security-code"
-      - "DELETE /api/v1/vehicles/<VIN>"
-      - "POST /api/v3/mappings/create"
-      - "POST /api/v3/mappings/continue"
-      - "POST /api/v3/mappings/validate-security-code"
-      - "POST /api/v3/mappings/resend-security-code"
-      - "GET /api/v3/images/<image>"
-      - "DELETE /api/v3/mappings"
-      - "POST /api/v2/vehicles/<VIN>/secondary"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -98,15 +61,3 @@ slo_definition:
       - "POST /api/v1/vehicles/<VIN>/validate-security-code"
       - "POST /api/v1/vehicles/<VIN>/resend-security-code"
       - "DELETE /api/v1/vehicles/<VIN>"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-user-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v2/presentation/users/validate"
-    - service: "vehicle-mapping-composite-service - PROD"
-      keyRequests:
-      - "POST /api/v2/vehicles/<VIN>/primary"
-      - "POST /api/v2/vehicles/<VIN>/primary/map"
-      - "POST /api/v1/vehicles/<VIN>/validate-security-code"
-      - "POST /api/v1/vehicles/<VIN>/resend-security-code"
-      - "DELETE /api/v1/vehicles/<VIN>"
diff --git a/DE-4/TP_Mobile_VehicleList.yaml b/DE-4/TP_Mobile_VehicleList.yaml
index c0d18d8..2c6ab62 100644
--- a/DE-4/TP_Mobile_VehicleList.yaml
+++ b/DE-4/TP_Mobile_VehicleList.yaml
@@ -16,12 +16,6 @@ slo_definition:
       keyRequests:
       - "GET /api/v2/vehicles"
       - "GET /api/v4/vehicles"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v2/vehicles"
-      - "GET /api/v4/vehicles"
   NA-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -29,20 +23,9 @@ slo_definition:
       keyRequests:
       - "GET /api/v2/vehicles"
       - "GET /api/v4/vehicles"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v2/vehicles"
-      - "GET /api/v4/vehicles"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
     - service: "btc-vehicle-composite-service - PROD"
       keyRequests:
       - "GET /api/v1/vehicles"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/vehicles"
diff --git a/DE-7/TP_Mobile_Remote360.yaml b/DE-7/TP_Mobile_Remote360.yaml
index 5a3b8bc..acb62d2 100644
--- a/DE-7/TP_Mobile_Remote360.yaml
+++ b/DE-7/TP_Mobile_Remote360.yaml
@@ -22,18 +22,6 @@ slo_definition:
       - "GET /api/v1/vehicle/<VIN>/egomodelurl"
       - "GET /api/v1/vehicle/<VIN>/key"
       - "GET /api/v1/recordings/vehicle/<VIN>"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "remote-360-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/events/[UUID]"
-      - "POST /api/v1/events/[UUID]/cancel"
-      - "POST /api/v1/event/execute"
-      - "GET /api/v1/download/[UUID]/<fileName>"
-      - "POST /api/v1/download/[UUID]/<fileName>/confirm"
-      - "GET /api/v1/vehicle/<VIN>/egomodelurl"
-      - "GET /api/v1/vehicle/<VIN>/key"
-      - "GET /api/v1/recordings/vehicle/<VIN>"
   NA-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -47,18 +35,6 @@ slo_definition:
       - "GET /api/v1/vehicle/<VIN>/egomodelurl"
       - "GET /api/v1/vehicle/<VIN>/key"
       - "GET /api/v1/recordings/vehicle/<VIN>" 
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "remote-360-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/events/[UUID]"
-      - "POST /api/v1/events/[UUID]/cancel"
-      - "POST /api/v1/event/execute"
-      - "GET /api/v1/download/[UUID]/<fileName>"
-      - "POST /api/v1/download/[UUID]/<fileName>/confirm"
-      - "GET /api/v1/vehicle/<VIN>/egomodelurl"
-      - "GET /api/v1/vehicle/<VIN>/key"
-      - "GET /api/v1/recordings/vehicle/<VIN>"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -72,15 +48,3 @@ slo_definition:
       - "GET /api/v1/vehicle/<VIN>/egomodelurl"
       - "GET /api/v1/vehicle/<VIN>/key"
       - "GET /api/v1/recordings/vehicle/<VIN>"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "remote-360-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/events/[UUID]"
-      - "POST /api/v1/events/[UUID]/cancel"
-      - "POST /api/v1/event/execute"
-      - "GET /api/v1/download/[UUID]/<fileName>"
-      - "POST /api/v1/download/[UUID]/<fileName>/confirm"
-      - "GET /api/v1/vehicle/<VIN>/egomodelurl"
-      - "GET /api/v1/vehicle/<VIN>/key"
-      - "GET /api/v1/recordings/vehicle/<VIN>"
diff --git a/DE-7/TP_Mobile_RemoteServices.yaml b/DE-7/TP_Mobile_RemoteServices.yaml
index a1fb98b..415a4c9 100644
--- a/DE-7/TP_Mobile_RemoteServices.yaml
+++ b/DE-7/TP_Mobile_RemoteServices.yaml
@@ -24,20 +24,6 @@ slo_definition:
       - "POST /api/v2/presentation/remote-commands/eventPosition"
       - "GET /api/v1/presentation/remote-history/<VIN>"
       - "POST /api/v2/presentation/remote-commands/eventStatus"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-remote-commands-composite-service - PROD"
-      keyRequests:
-      - "POST /api/v2/presentation/remote-commands/<VIN>/door-lock"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/door-unlock"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/climate-now"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/climate-timer"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/light-flash"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/charging-profile"
-      - "POST /api/v2/presentation/remote-commands/eventPosition"
-      - "GET /api/v1/presentation/remote-history/<VIN>"
-      - "POST /api/v2/presentation/remote-commands/eventStatus"
   NA-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -56,23 +42,6 @@ slo_definition:
       - "GET /api/v1/presentation/remote-history/<VIN>"
       - "GET /api/v2/presentation/remote-history/<VIN>"
       - "POST /api/v2/presentation/remote-commands/eventStatus"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-remote-commands-composite-service - PROD"
-      keyRequests:
-      - "POST /api/v2/presentation/remote-commands/<VIN>/door-lock"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/door-unlock"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/climate-now"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/climate-timer"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/light-flash"
-      - "POST /api/v3/presentation/remote-commands/<VIN>/horn-blow"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/horn-blow"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/charging-profile"
-      - "POST /api/v2/presentation/remote-commands/eventPosition"
-      - "GET /api/v1/presentation/remote-history/<VIN>"
-      - "GET /api/v2/presentation/remote-history/<VIN>"
-      - "POST /api/v2/presentation/remote-commands/eventStatus"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -88,17 +57,3 @@ slo_definition:
       - "POST /api/v2/presentation/remote-commands/<VIN>/light-flash",
       - "POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder",
       - "GET /api/v1/presentation/remote-history/<VIN>"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-remote-commands-composite-service - PROD"
-      keyRequests:
-      - "POST /api/v2/presentation/remote-commands/eventStatus"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/door-lock"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/door-unlock"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/climate-now"
-      - "GET /api/v2/presentation/remote-history/<VIN>"
-      - "POST /api/v2/presentation/remote-commands/<VIN>/horn-blow",
-      - "POST /api/v2/presentation/remote-commands/<VIN>/climate-timer",
-      - "POST /api/v2/presentation/remote-commands/<VIN>/light-flash",
-      - "POST /api/v2/presentation/remote-commands/<VIN>/vehicle-finder",
-      - "GET /api/v1/presentation/remote-history/<VIN>"
diff --git a/DE-7/TP_Mobile_VehicleData.yaml b/DE-7/TP_Mobile_VehicleData.yaml
index 9c20e35..293b0ba 100644
--- a/DE-7/TP_Mobile_VehicleData.yaml
+++ b/DE-7/TP_Mobile_VehicleData.yaml
@@ -18,14 +18,6 @@ slo_definition:
     - service: "VehicleService - PROD"
       keyRequests:
       - "GET /v1/vehicle/<VIN>"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/vehicles/<VIN>/state"
-    - service: "VehicleService - PROD"
-      keyRequests: 
-      - "GET /v1/vehicle/<VIN>"
   NA-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
@@ -33,20 +25,9 @@ slo_definition:
       keyRequests:
       - "GET /api/v2/vehicles"
       - "GET /api/v4/vehicles"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v2/vehicles"
-      - "GET /api/v4/vehicles"
   CN-Prod:
   - metric: "builtin:service.keyRequest.errors.server.successCount"
     filter:
     - service: "btc-vehicle-composite-service - PROD"
       keyRequests:
       - "GET /api/v1/vehicles"
-  - metric: "builtin:service.keyRequest.count.server"
-    filter:
-    - service: "btc-vehicle-composite-service - PROD"
-      keyRequests:
-      - "GET /api/v1/vehicles"
diff --git a/DE-7/TP_Mobile_Send2VehicleLegacy.yaml b/DE-XX/TP_Mobile_Send2VehicleLegacy.yaml
similarity index 100%
rename from DE-7/TP_Mobile_Send2VehicleLegacy.yaml
rename to DE-XX/TP_Mobile_Send2VehicleLegacy.yaml
diff --git a/convert.py b/convert.py
index a11d32c..876c732 100644
--- a/convert.py
+++ b/convert.py
@@ -9,9 +9,8 @@ from nested_lookup import nested_lookup
 from pathlib import Path
 
 # defines
-SLOS_FOLDER_BASENAME = os.path.basename("slos")
 OUTPUT_FOLDER_BASENAME = os.path.basename("output")
-TEMPLATE_FOLDER_BASENAME = os.path.basename("templates")
+TEMPLATE_FOLDER_BASENAME = os.path.basename("jinja-templates")
 TEMPLATE_FILES = {
     "terraform-template.j2":  ["builtin:service.keyRequest.errors.fivexx.rate"],
     "terraform-template-2.j2":["builtin:service.keyRequest.errors.server.successCount"],
diff --git a/templates/terraform-template-2.j2 b/jinja-templates/terraform-template-2.j2
similarity index 100%
rename from templates/terraform-template-2.j2
rename to jinja-templates/terraform-template-2.j2
diff --git a/templates/terraform-template-3.j2 b/jinja-templates/terraform-template-3.j2
similarity index 100%
rename from templates/terraform-template-3.j2
rename to jinja-templates/terraform-template-3.j2
diff --git a/templates/terraform-template-4.j2 b/jinja-templates/terraform-template-4.j2
similarity index 100%
rename from templates/terraform-template-4.j2
rename to jinja-templates/terraform-template-4.j2
diff --git a/templates/terraform-template.j2 b/jinja-templates/terraform-template.j2
similarity index 100%
rename from templates/terraform-template.j2
rename to jinja-templates/terraform-template.j2
diff --git a/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf b/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf
deleted file mode 100644
index b552a76..0000000
--- a/output/EMEA_Prod/slo/TP_Mobile_Send2VehicleMGU.tf
+++ /dev/null
@@ -1,110 +0,0 @@
-module TP_Mobile_Send2VehicleMGU {
-    
-    source                      = "../../_dynatrace-base-modules/dynatrace-service-level-objective"
-    
-    name                        = "TP_Mobile_Send2VehicleMGU" 
-
-    description                 = "2.0 SLO Mobile" 
-    
-    # entity selector object 
-    filter                      = ""
-            
-    # metric expression of the calculation as done in data explorer ui
-    metric_expression           = <<EOT
-    (100)*((builtin:service.keyRequest.errors.server.successCount:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-        fromRelationship.isServiceMethodOfService(
-            type(~"SERVICE~"),entityName.in(
-                ~"T~",
-				~"r~",
-				~"i~",
-				~"p~",
-				~"S~",
-				~"e~",
-				~"r~",
-				~"v~",
-				~"i~",
-				~"c~",
-				~"e~",
-				~" ~",
-				~"-~",
-				~" ~",
-				~"P~",
-				~"R~",
-				~"O~",
-				~"D~"
-                )
-            ),entityName.in(
-                ~"/~",
-				~"v~",
-				~"3~",
-				~"/~",
-				~"m~",
-				~"o~",
-				~"t~",
-				~"o~",
-				~"r~",
-				~"i~",
-				~"s~",
-				~"t~",
-				~"/~",
-				~"[~",
-				~"U~",
-				~"U~",
-				~"I~",
-				~"D~",
-				~"]~",
-				~"/~",
-				~"t~",
-				~"r~",
-				~"i~",
-				~"p~",
-				~"s~",
-				~"/~",
-				~"v~",
-				~"2~",
-				~"/~",
-				~"m~",
-				~"o~",
-				~"t~",
-				~"o~",
-				~"r~",
-				~"i~",
-				~"s~",
-				~"t~",
-				~"/~",
-				~"[~",
-				~"U~",
-				~"U~",
-				~"I~",
-				~"D~",
-				~"]~",
-				~"/~",
-				~"t~",
-				~"r~",
-				~"i~",
-				~"p~",
-				~"s~"
-                )"))))
-                 ):splitBy())
-	/
-	(builtin:service.keyRequest.count.server:filter(and(or(in("dt.entity.service_method",entitySelector("type(service_method),
-        fromRelationship.isServiceMethodOfService(
-            type(~"SERVICE~"),entityName.in(
-                ~"~"
-                )
-            ),entityName.in(
-                ~"~"
-                )"))))):splitBy()))
-    EOT
- 
-    # if not set (removed) it's defaulted to "-1d" 
-    timeframe                   = "-1d"   
-
-    # currently the only possible value
-    evaluation                  = "AGGREGATE"           
-
-    # target and warning percentage of the SLO as double
-    target                      = 98               # if not set(removed) it's defaulted to 98
-    warning                     = 99               # if not set(removed) it's defaulted to 99
-
-}
\ No newline at end of file
diff --git a/slos/TP_Template copy 9.yaml b/slo-templates/TP_Template.yaml
similarity index 100%
rename from slos/TP_Template copy 9.yaml
rename to slo-templates/TP_Template.yaml