diff --git a/k8s/metrics/grafana/dashboards/00-vald-cluster-overview.yaml b/k8s/metrics/grafana/dashboards/00-vald-cluster-overview.yaml index ef8fa94e4f2..477a73c776b 100644 --- a/k8s/metrics/grafana/dashboards/00-vald-cluster-overview.yaml +++ b/k8s/metrics/grafana/dashboards/00-vald-cluster-overview.yaml @@ -599,7 +599,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=~\"$ReplicaSet\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=~\"$ReplicaSet\", image!=""})", "format": "time_series", "interval": "", "intervalFactor": 1, @@ -1954,7 +1954,7 @@ data: "targets": [ { "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", pod=~\"$ReplicaSet.*\"}) by (pod)", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", pod=~\"$ReplicaSet.*\", image!=""}) by (pod)", "interval": "", "legendFormat": "{{pod}}", "refId": "A" diff --git a/k8s/metrics/grafana/dashboards/01-vald-agent.yaml b/k8s/metrics/grafana/dashboards/01-vald-agent.yaml index 0f50d9ed878..953e9fa353b 100644 --- a/k8s/metrics/grafana/dashboards/01-vald-agent.yaml +++ b/k8s/metrics/grafana/dashboards/01-vald-agent.yaml @@ -439,7 +439,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", image!=""})", "format": "time_series", "interval": "", "legendFormat": "", @@ -1498,7 +1498,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", "interval": "", "legendFormat": "{{pod}}", "range": true, @@ -1511,7 +1511,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", @@ -1525,7 +1525,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", @@ -2263,7 +2263,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(label_replace(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}, \"target_pod\", \"$1\", \"pod\", \"(.*)\")) by (target_pod) / sum(agent_core_ngt_index_count{exported_kubernetes_namespace=\"$Namespace\", kubernetes_name=\"$ReplicaSet\", target_pod=~\"$PodName\"}) by (target_pod)", + "expr": "sum(label_replace(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}, \"target_pod\", \"$1\", \"pod\", \"(.*)\")) by (target_pod) / sum(agent_core_ngt_index_count{exported_kubernetes_namespace=\"$Namespace\", kubernetes_name=\"$ReplicaSet\", target_pod=~\"$PodName\"}) by (target_pod)", "interval": "", "legendFormat": "{{target_pod}}", "range": true, diff --git a/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml b/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml index 8be5750df7b..9707dcf6a34 100644 --- a/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml +++ b/k8s/metrics/grafana/dashboards/02-vald-discoverer.yaml @@ -440,7 +440,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", image!=""})", "format": "time_series", "interval": "", "legendFormat": "", @@ -790,7 +790,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", "interval": "", "legendFormat": "{{pod}}", "range": true, @@ -803,7 +803,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", @@ -817,7 +817,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", diff --git a/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml b/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml index 423246343a8..27c9837806e 100644 --- a/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml +++ b/k8s/metrics/grafana/dashboards/05-vald-index-manager.yaml @@ -439,7 +439,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", image!=""})", "format": "time_series", "interval": "", "legendFormat": "", @@ -788,7 +788,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", "interval": "", "legendFormat": "{{pod}}", "range": true, @@ -801,7 +801,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", @@ -815,7 +815,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", diff --git a/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml b/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml index 7cfb3a2c896..3db7a7182e0 100644 --- a/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml +++ b/k8s/metrics/grafana/dashboards/08-vald-lb-gateway.yaml @@ -439,7 +439,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\"})", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", image!=""})", "format": "time_series", "interval": "", "legendFormat": "", @@ -788,7 +788,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_statefulset_created{statefulset=\"$ReplicaSet\"}) >= 1", "interval": "", "legendFormat": "{{pod}}", "range": true, @@ -801,7 +801,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_deployment_created{deployment=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}", @@ -815,7 +815,7 @@ data: }, "editorMode": "code", "exemplar": true, - "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\"}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", + "expr": "sum(container_memory_working_set_bytes{namespace=\"$Namespace\", container=\"$ReplicaSet\", pod=~\"$PodName\", image!=""}) by (pod) and on() count(kube_daemonset_created{daemonset=\"$ReplicaSet\"}) >= 1", "hide": false, "interval": "", "legendFormat": "{{pod}}",