CTO-221: Remove non-useful timeseries from persistance and remote wri…

…te (#316)
mojaloop · Jul 18, 2024 · a8c9c65 · a8c9c65
1 parent f9e9cdf
commit a8c9c65
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 19 deletions.
diff --git a/terraform/gitops/generate-files/templates/monitoring/install/values-prom-operator.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/install/values-prom-operator.yaml.tpl
@@ -36,7 +36,7 @@ prometheus:
   - name: central-monitoring
     url: ${central_observability_endpoint}/api/v1/push
     headers:
-      X-Scope-OrgID: ${central_observability_tenant_id}    
+      X-Scope-OrgID: ${central_observability_tenant_id} 
 %{endif ~} 
 
 %{if enable_central_observability_read ~}
@@ -63,6 +63,19 @@ kubelet:
       targetLabel: kubernetes_io_hostname
       replacement: $${1}
       action: replace
+    metricRelabelings:      
+    - sourceLabels: ['__name__']
+      regex: 'apiserver_request_duration_seconds_bucket|apiserver_request_sli_duration_seconds_bucket'
+      action: drop
+    - sourceLabels: ['__name__']
+      regex: 'apiserver_request_body_size_bytes_bucket|apiserver_response_sizes_bucket'
+      action: drop      
+    - sourceLabels: ['__name__']
+      regex: 'etcd_request_duration_seconds_bucket'
+      action: drop
+
+kubeApiServer:
+  enabled: false	
 
 commonLabels:
   build: argocd

diff --git a/terraform/gitops/generate-files/templates/monitoring/post-config/dashboards/k8s.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/post-config/dashboards/k8s.yaml.tpl
@@ -23,22 +23,6 @@ spec:
 ---
 apiVersion: grafana.integreatly.org/v1beta1
 kind: GrafanaDashboard
-metadata:
-  name: k8s-addons-trivy-operator
-spec:
-  folder: kubernetes
-  instanceSelector:
-    matchLabels:
-      dashboards: "grafana"
-  datasources:
-    - inputName: "DS_PROMETHEUS"
-      datasourceName: "Prometheus"       
-  grafanaCom:
-    id: 16337
-    revision: 12
----
-apiVersion: grafana.integreatly.org/v1beta1
-kind: GrafanaDashboard
 metadata:
   name: k8s-system-api-server
 spec:

diff --git a/...orm/gitops/generate-files/templates/monitoring/post-config/dashboards/prometheus.yaml.tpl b/...orm/gitops/generate-files/templates/monitoring/post-config/dashboards/prometheus.yaml.tpl
@@ -41,4 +41,18 @@ spec:
     matchLabels:
       dashboards: "grafana"
   url: "https://raw.githubusercontent.com/mojaloop/helm/${grafana_dashboard_tag}/monitoring/dashboards/infrastructure/prometheus-remote-write.json"
+---
+apiVersion: grafana.integreatly.org/v1beta1
+kind: GrafanaDashboard
+metadata:
+  name: mojaloop-prometheus-stats
+spec:
+  folder: monitoring
+  datasources:
+    - inputName: "DS_PROMETHEUS"
+      datasourceName: "Prometheus" 
+  instanceSelector:
+    matchLabels:
+      dashboards: "grafana"
+  url: "https://raw.githubusercontent.com/mojaloop/helm/${grafana_dashboard_tag}/monitoring/dashboards/infrastructure/mojaloop-prometheus-stats.json"
 ---
diff --git a/terraform/k8s/default-config/common-vars.yaml b/terraform/k8s/default-config/common-vars.yaml
@@ -24,7 +24,7 @@ prometheus_operator_version: 8.22.8
 prometheus_process_exporter_version: 0.4.2
 grafana_operator_version: 3.5.11
 grafana_version: 10.2.3
-grafana_dashboard_tag: v16.3.0-snapshot.21 # TODO: update once v16.1.x is published
+grafana_dashboard_tag: v16.3.0-snapshot.24 # TODO: update once v16.1.x is published
 tempo_chart_version: 3.1.0
 loki_chart_version: 2.13.0
 loki_ingester_pvc_size: 10Gi

diff --git a/terraform/k8s/default-config/mojaloop-vars.yaml b/terraform/k8s/default-config/mojaloop-vars.yaml
@@ -7,7 +7,7 @@ mcm_ingress_internal_lb: false
 mojaloop_ingress_internal_lb: true
 finance_portal_ingress_internal_lb: true
 onboarding_collection_tag: 15.2.0
-grafana_dashboard_tag: v16.3.0-snapshot.21 # TODO: update once v16.1.x is published
+grafana_dashboard_tag: v16.3.0-snapshot.24 # TODO: update once v16.1.x is published
 enable_istio_injection: true
 central_ledger_handler_transfer_position_batch_processing_enabled: false
 central_ledger_handler_transfer_position_batch_size: 100