Update control-plane and add monitoring values

Signed-off-by: Ian Stanton <ian@tembo.io>
tembo-io · May 30, 2024 · 04c9306 · 04c9306
1 parent 5598924
commit 04c9306
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/charts/tembo/values.yaml b/charts/tembo/values.yaml
@@ -272,7 +272,7 @@ cpService:
 
   image:
     repository: quay.io/coredb/cp-service
-    tag: "9d09130"
+    tag: "7b85118"
     pullPolicy: IfNotPresent
 
   resources:
@@ -341,7 +341,7 @@ cpWebserver:
 
   image:
     repository: quay.io/coredb/cp-service
-    tag: "9d09130"
+    tag: "7b85118"
     pullPolicy: IfNotPresent
 
   # We should reconfigure the defaults
@@ -407,7 +407,7 @@ cpReconciler:
 
   image:
     repository: quay.io/coredb/cp-service
-    tag: "9d09130"
+    tag: "7b85118"
     pullPolicy: IfNotPresent
 
   resources:
@@ -478,7 +478,7 @@ cpMetricsWatcher:
 
   image:
     repository: quay.io/coredb/cp-service
-    tag: "9d09130"
+    tag: "7b85118"
     pullPolicy: IfNotPresent
 
   resources:

diff --git a/values.yaml b/values.yaml
@@ -59,3 +59,53 @@ tembo:
         value: ~
       - name: METRONOME_SECRET_KEY
         value: ~
+monitoring:
+  kube-prometheus-stack:
+    alertmanager:
+      alertmanagerSpec:
+        image:
+          tag: "v0.25.1"
+    grafana:
+      image:
+        tag: "10.2.3"
+    kube-state-metrics:
+      metricLabelsAllowlist:
+        - namespaces=[tembo.io/organization_id,tembo.io/instance_id]
+      metricAnnotationsAllowList:
+        - namespaces=[tembo.io/organization_id,tembo.io/instance_id]
+        - pods=[tembo.io/organization_id,tembo.io/instance_id]
+    prometheus:
+      prometheusSpec:
+        resources:
+          limits:
+            memory: 10Gi
+          requests:
+            memory: 5Gi
+  promtail:
+    config:
+      snippets:
+        extraRelabelConfigs:
+          - action: replace
+            source_labels:
+              - __meta_kubernetes_pod_annotation_tembo_io_organization_id
+            target_label: tembo_organization_id
+          - action: replace
+            source_labels:
+              - __meta_kubernetes_pod_annotation_tembo_io_instance_id
+            target_label: tembo_instance_id
+        pipelineStages:
+          - cri: { }
+          - match:
+              selector: '{tembo_organization_id=~".+"}'
+              stages:
+                - labelallow:
+                    - tembo_instance_id
+                    - tembo_organization_id
+                    - container
+                    - stream
+                    - app
+                    - pod
+                - tenant:
+                    label: tembo_organization_id
+          - output:
+              source: message