Update memory queries to ensure only containers are measured

airbyte/helm/airbyte/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: airbyte
 description: Unified data integration platform
 type: application
-version: 0.4.26
+version: 0.4.27
 appVersion: 0.50.33
 dependencies:
 - name: airbyte

airbyte/helm/airbyte/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-server.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-server.+",image!="",container!=""}) by (pod)
   - name: worker-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-worker.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airbyte-worker.+",image!="",container!=""}) by (pod)
   - name: worker
     type: kubernetes
     kubernetes:

airflow/helm/airflow/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: airflow
 description: A Helm chart for airflow deployable on plural
 type: application
-version: 0.3.42
+version: 0.3.43
 appVersion: "2.6.3"
 sources:
   - https://github.com/pluralsh/plural-artifacts/airflow/helm/airflow

airflow/helm/airflow/templates/runbooks.yaml

@@ -28,7 +28,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-worker-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-worker-[0-9]+",image!="",container!=""}) by (pod)
   {{- end }}
   - name: web-cpu
     type: prometheus
@@ -41,7 +41,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-web-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"airflow-web-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   {{- if .Values.airflow.workers.enabled }}
   - name: worker
     type: kubernetes

argo-cd/helm/argo-cd/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: argo-cd
 description: A Helm chart for Kubernetes
 type: application
-version: 0.2.0
+version: 0.2.1
 appVersion: v2.9.3
 dependencies:
 - name: config-overlays

argo-cd/helm/argo-cd/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-application-controller.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-application-controller.+",image!="",container!=""}) by (pod)
   - name: argo-cd-reposerver-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-repo-server.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-repo-server.+",image!="",container!=""}) by (pod)
   - name: argo-cd-server-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-server.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-server.+",image!="",container!=""}) by (pod)
   - name: argo-cd-applicationset-controller-cpu
     type: prometheus
     prometheus:
@@ -58,7 +58,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-applicationset-controller.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-applicationset-controller.+",image!="",container!=""}) by (pod)
   - name: argo-cd-notifications-controller-cpu
     type: prometheus
     prometheus:
@@ -70,7 +70,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-notifications-controller.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"argo-cd-argocd-notifications-controller.+",image!="",container!=""}) by (pod)
   - name: controller
     type: kubernetes
     kubernetes:

chatwoot/helm/chatwoot/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: chatwoot
 description: Open-source customer engagement suite, an alternative to Intercom, Zendesk, Salesforce Service Cloud etc.
 type: application
-version: 0.1.13
+version: 0.1.14
 appVersion: v3.7.0
 dependencies:
 - name: chatwoot

chatwoot/helm/chatwoot/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-web.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-web.+",image!="",container!=""}) by (pod)
   - name: chatwoot-worker-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-worker.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"chatwoot-worker.+",image!="",container!=""}) by (pod)
   - name: chatwoot
     type: kubernetes
     kubernetes:

clickhouse/helm/clickhouse/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: clickhouse
 description: helm chart for clickhouse
 type: application
-version: 0.1.4
+version: 0.1.5
 appVersion: 0.21.2
 dependencies:
 - name: altinity-clickhouse-operator

clickhouse/helm/clickhouse/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "altinity-clickhouse-operator.fullname" (index .Subcharts "altinity-clickhouse-operator") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "altinity-clickhouse-operator.fullname" (index .Subcharts "altinity-clickhouse-operator") }}-.*",image!="",container!=""}) by (pod)
   - name: clickhouse-operator-deployment
     type: kubernetes
     kubernetes:

dagster/helm/dagster/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: dagster
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.48
+version: 0.1.49
 appVersion: 1.6.0
 dependencies:
 - name: postgres

dagster/helm/dagster/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-daemon.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-daemon.+",image!="",container!=""}) by (pod)
   - name: dagster-dagit-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-dagit.+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"dagster-dagit.+",image!="",container!=""}) by (pod)
   - name: dagster-daemon
     type: kubernetes
     kubernetes:

datahub/helm/datahub/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: datahub
 description: helm chart for datahub
 type: application
-version: 0.1.16
+version: 0.1.17
 appVersion: v0.10.3
 dependencies:
 - name: datahub

datahub/helm/datahub/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "acryl-datahub-actions.fullname" (index .Subcharts "datahub" "Subcharts" "acryl-datahub-actions") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "acryl-datahub-actions.fullname" (index .Subcharts "datahub" "Subcharts" "acryl-datahub-actions") }}-.*",image!="",container!=""}) by (pod)
   - name: frontend-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-frontend.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-frontend") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-frontend.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-frontend") }}-.*",image!="",container!=""}) by (pod)
   - name: gms-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-gms.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-gms") }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "datahub-gms.fullname" (index .Subcharts "datahub" "Subcharts" "datahub-gms") }}-.*",image!="",container!=""}) by (pod)
   - name: actions
     type: kubernetes
     kubernetes:

ghost/helm/ghost/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: ghost
 description: A Helm chart for Kubernetes
 type: application
-version: 0.3.1
+version: 0.3.2
 appVersion: "5.49.2"
 dependencies:
 - name: mysql

ghost/helm/ghost/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"ghost-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"ghost-[0-9]+",image!="",container!=""}) by (pod)
   - name: statefulset
     type: kubernetes
     kubernetes:

gitlab/helm/gitlab/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: gitlab
 description: A Helm chart for gitlab on plural
 type: application
-version: 0.5.13
+version: 0.5.14
 appVersion: 15.2.2
 dependencies:
 - name: gitlab

gitlab/helm/gitlab/templates/prometheusrule.yaml

@@ -25,7 +25,7 @@ spec:
     - alert: GitlabPostgresMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"plural-gitlab-[0-9]+"})
         )  > 1
       for: 5m
@@ -51,7 +51,7 @@ spec:
     - alert: GitlabGitalyMEM
       expr: |
         (
-          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitaly-[0-9]+"})
+          sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitaly-[0-9]+",image!="",container!=""})
           / sum(kube_pod_container_resource_requests{endpoint="http",resource="memory",namespace="{{ .Release.Namespace }}", pod=~"plural-gitaly-[0-9]+"})
         )  > 0.7
       for: 5m

gitlab/helm/gitlab/templates/runbooks.yaml

@@ -25,7 +25,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-webservice-default-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-webservice-default-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: gitaly-cpu
     type: prometheus
     prometheus:
@@ -37,7 +37,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-gitaly-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-gitaly-[0-9]+",image!="",container!=""}) by (pod)
   - name: sidekiq-cpu
     type: prometheus
     prometheus:
@@ -49,7 +49,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-sidekiq-all-in-1-v1-[a-z0-9]+-[a-z0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"gitlab-sidekiq-all-in-1-v1-[a-z0-9]+-[a-z0-9]+",image!="",container!=""}) by (pod)
   - name: web
     type: kubernetes
     kubernetes:
@@ -165,7 +165,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"plural-gitlab-[0-9]+",image!="",container!=""}) by (pod)
   - name: volume
     type: prometheus
     prometheus:

grafana/helm/grafana/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: grafana
 description: A Helm chart for grafana on plural
 type: application
-version: 0.2.26
+version: 0.2.27
 appVersion: "9.4.3"
 dependencies:
 - name: grafana

grafana/helm/grafana/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"grafana-[0-9]+"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"grafana-[0-9]+",image!="",container!=""}) by (pod)
   - name: statefulset
     type: kubernetes
     kubernetes:

harbor/helm/harbor/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: harbor
 description: helm chart for harbor
 type: application
-version: 0.1.3
+version: 0.1.4
 appVersion: v2.8.1
 dependencies:
 - name: postgres

harbor/helm/harbor/templates/runbooks.yaml

@@ -22,7 +22,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.core" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.core" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: jobservice-cpu
     type: prometheus
     prometheus:
@@ -34,7 +34,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.jobservice" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.jobservice" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: registry-cpu
     type: prometheus
     prometheus:
@@ -46,7 +46,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.registry" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.registry" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: portal-cpu
     type: prometheus
     prometheus:
@@ -58,7 +58,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.portal" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.portal" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: trivy-cpu
     type: prometheus
     prometheus:
@@ -70,7 +70,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.trivy" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.trivy" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: notary-server-cpu
     type: prometheus
     prometheus:
@@ -82,7 +82,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-server" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-server" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: notary-signer-cpu
     type: prometheus
     prometheus:
@@ -94,7 +94,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-signer" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.notary-signer" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: exporter-cpu
     type: prometheus
     prometheus:
@@ -106,7 +106,7 @@ spec:
     prometheus:
       format: memory
       legend: $pod
-      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.exporter" .Subcharts.harbor }}-.*"}) by (pod)
+      query: sum(container_memory_working_set_bytes{namespace="{{ .Release.Namespace }}",pod=~"{{ template "harbor.exporter" .Subcharts.harbor }}-.*",image!="",container!=""}) by (pod)
   - name: core
     type: kubernetes
     kubernetes: