Merge pull request #370 from mojaloop/fix/monitoring-outofsync

fix monitoring OutOfSync loop
mojaloop · Oct 7, 2024 · b7b5759 · b7b5759
2 parents 2c2f569 + 05e3b89
commit b7b5759
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/...aform/gitops/generate-files/templates/monitoring/install/values-grafana-operator.yaml.tpl b/...aform/gitops/generate-files/templates/monitoring/install/values-grafana-operator.yaml.tpl
@@ -4,4 +4,8 @@ operator:
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING
-    values: ["enabled"]     
+    values: ["enabled"]
+  resources:
+    requests:
+      cpu: 20m
+      memory: 100Mi
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
@@ -11,7 +11,7 @@ alertmanager:
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING
-    values: ["enabled"]       
+    values: ["enabled"]
 prometheus:
   persistence:
     enabled: true
@@ -37,23 +37,27 @@ prometheus:
   - name: central-monitoring
     url: ${central_observability_endpoint}/api/v1/push
     headers:
-      X-Scope-OrgID: ${central_observability_tenant_id} 
-%{endif ~} 
+      X-Scope-OrgID: ${central_observability_tenant_id}
+%{endif ~}
 
 %{if enable_central_observability_read ~}
   remoteRead:
   - name: central-monitoring
     url: ${central_observability_endpoint}/prometheus/api/v1/read
     headers:
-      X-Scope-OrgID: ${central_observability_tenant_id}    
-%{endif ~} 
+      X-Scope-OrgID: ${central_observability_tenant_id}
+%{endif ~}
 
 
 operator:
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING
-    values: ["enabled"]       
+    values: ["enabled"]
+  resources:
+    requests:
+      cpu: 20m
+      memory: 100Mi
 kubelet:
   serviceMonitor:
     relabelings:
@@ -64,19 +68,19 @@ kubelet:
       targetLabel: kubernetes_io_hostname
       replacement: $${1}
       action: replace
-    metricRelabelings:      
+    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      
+      action: drop
     - sourceLabels: ['__name__']
       regex: 'etcd_request_duration_seconds_bucket'
       action: drop
 
 kubeApiServer:
-  enabled: false	
+  enabled: false
 
 commonLabels:
   build: argocd
@@ -85,14 +89,14 @@ commonAnnotations:
 
 node-exporter:
   serviceMonitor:
-    relabelings: 
+    relabelings:
     - sourceLabels: [__meta_kubernetes_pod_node_name]
       targetLabel: nodename
   tolerations:
     - operator: "Exists"
 blackboxExporter:
-  enabled: false    
+  enabled: false
   nodeAffinityPreset:
     type: hard
     key: workload-class.mojaloop.io/MONITORING
-    values: ["enabled"]     
+    values: ["enabled"]
diff --git a/terraform/gitops/generate-files/templates/monitoring/monitoring-install.yaml.tpl b/terraform/gitops/generate-files/templates/monitoring/monitoring-install.yaml.tpl
@@ -29,6 +29,14 @@ spec:
       kind: StatefulSet
       jqPathExpressions:
         - ".spec.volumeClaimTemplates[]?"
+    - group: admissionregistration.k8s.io
+      kind: MutatingWebhookConfiguration
+      jqPathExpressions:
+        - .webhooks[]?.clientConfig.caBundle
+    - group: admissionregistration.k8s.io
+      kind: ValidatingWebhookConfiguration
+      jqPathExpressions:
+        - .webhooks[]?.clientConfig.caBundle
   syncPolicy:
     automated:
       prune: true