Use safer defaults

Author: pacho-rh

components/monitoring/prometheus/base/monitoringstack/monitoringstack.yaml

@@ -42,9 +42,7 @@ spec:
           audience: # added by overlays
         tokenUrl: https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
       url: # added by overlays
-      writeRelabelConfigs:
-      - action: LabelKeep
-        regex: ""
+      # writeRelabelConfigs:  # added by overlays
 ---
 # Grant permission to Federate In-Cluster Prometheus
 apiVersion: rbac.authorization.k8s.io/v1
@@ -80,8 +78,7 @@ spec:
       app.kubernetes.io/managed-by: observability-operator
       app.kubernetes.io/name: appstudio-federate-ms-prometheus
   endpoints:
-  - params:
-      'match[]': []  # scrape only required metrics from in-cluster prometheus
+  - params: {}  # added by overlays
     relabelings:
     # override the target's address by the prometheus-k8s service name.
     - action: replace

components/monitoring/prometheus/production/base/monitoringstack/endpoints-params-match.yaml renamed to components/monitoring/prometheus/production/base/monitoringstack/endpoints-params.yaml

@@ -1,7 +1,8 @@
 ---
 - op: replace
-  path: /spec/endpoints/0/params/match[]
-  value:  # scrape only required metrics from in-cluster prometheus
+  path: /spec/endpoints/0/params
+  value:
+    'match[]':  # scrape only required metrics from in-cluster prometheus
     - '{__name__="pipeline_service_schedule_overhead_percentage_sum"}'
     - '{__name__="pipeline_service_schedule_overhead_percentage_count"}'
     - '{__name__="pipeline_service_execution_overhead_percentage_sum"}'

components/monitoring/prometheus/production/base/monitoringstack/kustomization.yaml

@@ -7,7 +7,7 @@ patches:
     target:
       name: appstudio-federate-smon
       kind: ServiceMonitor
-  - path: endpoints-params-match.yaml
+  - path: endpoints-params.yaml
     target:
       name: appstudio-federate-smon
       kind: ServiceMonitor
@@ -19,7 +19,7 @@ patches:
     target:
       name: appstudio-federate-ms
       kind: MonitoringStack
-  - path: writeRelabelConfigs-regex.yaml
+  - path: writeRelabelConfigs.yaml
     target:
       name: appstudio-federate-ms
       kind: MonitoringStack

components/monitoring/prometheus/production/base/monitoringstack/writeRelabelConfigs-regex.yaml

@@ -0,0 +1,18 @@
+---
+- op: replace
+  path: /spec/prometheusConfig/remoteWrite/0/writeRelabelConfigs
+  value:
+  - action: LabelKeep
+    regex: "__name__|source_environment|source_cluster|namespace|app|pod|container|\
+      label_pipelines_appstudio_openshift_io_type|health_status|dest_namespace|\
+      controller|service|reason|phase|type|resource|resourcequota|le|app|image|\
+      commit_hash|job|operation|tokenName|rateLimited|state|persistentvolumeclaim|\
+      storageclass|volumename|release_reason|instance|result|deployment_reason|\
+      validation_reason|strategy|succeeded|target|name|method|code|sp|le|\
+      unexpected_status|failure|hostname|label_app_kubernetes_io_managed_by|status|\
+      pipeline|pipelinename|pipelinerun|schedule|check|grpc_service|grpc_code|\
+      grpc_method|lease|lease_holder|deployment|platform|mode|cpu|role|node|kind|\
+      verb|request_kind|tested_cluster|resource_type|exported_job|http_method|\
+      http_route|http_status_code|gin_errors|rule_result|rule_execution_cause|\
+      policy_name|policy_background_mode|rule_type|policy_type|policy_validation_mode|\
+      resource_request_operation|resource_kind|policy_change_type|event_type"

components/monitoring/prometheus/production/base/monitoringstack/writeRelabelConfigs.yaml

@@ -1,7 +1,8 @@
 ---
 - op: replace
-  path: /spec/endpoints/0/params/match[]
-  value:  # scrape only required metrics from in-cluster prometheus
+  path: /spec/endpoints/0/params
+  value:
+    'match[]':  # scrape only required metrics from in-cluster prometheus
     - '{__name__="pipeline_service_schedule_overhead_percentage_sum"}'
     - '{__name__="pipeline_service_schedule_overhead_percentage_count"}'
     - '{__name__="pipeline_service_execution_overhead_percentage_sum"}'

components/monitoring/prometheus/staging/base/monitoringstack/endpoints-params-match.yaml renamed to components/monitoring/prometheus/staging/base/monitoringstack/endpoints-params.yaml

@@ -7,7 +7,7 @@ patches:
     target:
       name: appstudio-federate-smon
       kind: ServiceMonitor
-  - path: endpoints-params-match.yaml
+  - path: endpoints-params.yaml
     target:
       name: appstudio-federate-smon
       kind: ServiceMonitor
@@ -19,7 +19,7 @@ patches:
     target:
       name: appstudio-federate-ms
       kind: MonitoringStack
-  - path: writeRelabelConfigs-regex.yaml
+  - path: writeRelabelConfigs.yaml
     target:
       name: appstudio-federate-ms
       kind: MonitoringStack

components/monitoring/prometheus/staging/base/monitoringstack/kustomization.yaml

@@ -0,0 +1,18 @@
+---
+- op: replace
+  path: /spec/prometheusConfig/remoteWrite/0/writeRelabelConfigs
+  value:
+  - action: LabelKeep
+    regex: "__name__|source_environment|source_cluster|namespace|app|pod|container|\
+      label_pipelines_appstudio_openshift_io_type|health_status|dest_namespace|\
+      controller|service|reason|phase|type|resource|resourcequota|le|app|image|\
+      commit_hash|job|operation|tokenName|rateLimited|state|persistentvolumeclaim|\
+      storageclass|volumename|release_reason|instance|result|deployment_reason|\
+      validation_reason|strategy|succeeded|target|name|method|code|sp|le|\
+      unexpected_status|failure|hostname|label_app_kubernetes_io_managed_by|status|\
+      pipeline|pipelinename|pipelinerun|schedule|check|grpc_service|grpc_code|\
+      grpc_method|lease|lease_holder|deployment|platform|mode|cpu|role|node|kind|\
+      verb|request_kind|tested_cluster|resource_type|exported_job|http_method|\
+      http_route|http_status_code|gin_errors|rule_result|rule_execution_cause|\
+      policy_name|policy_background_mode|rule_type|policy_type|policy_validation_mode|\
+      resource_request_operation|resource_kind|policy_change_type|event_type"