From e9869df18f91445ac93a446a8aa52c56bb493d3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20G=C3=B6tz?= Date: Sat, 28 Oct 2023 21:37:35 +0200 Subject: [PATCH 1/2] Filter labels explicitly in table panels of cluster dashboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Knut Götz --- monitoring/configs/dashboards/cluster.json | 76 +++++++++++++--------- 1 file changed, 46 insertions(+), 30 deletions(-) diff --git a/monitoring/configs/dashboards/cluster.json b/monitoring/configs/dashboards/cluster.json index d052337..ece9981 100644 --- a/monitoring/configs/dashboards/cluster.json +++ b/monitoring/configs/dashboards/cluster.json @@ -557,29 +557,29 @@ "id": "organize", "options": { "excludeByName": { - "Time": true, - "Value": true, - "__name__": true, + "Time": false, + "Value": false, + "__name__": false, "app": true, - "chart_name": true, - "chart_source_name": true, - "container": true, - "customresource_group": true, + "chart_name": false, + "chart_source_name": false, + "container": false, + "customresource_group": false, "customresource_kind": false, - "customresource_version": true, - "endpoint": true, + "customresource_version": false, + "endpoint": false, "exported_namespace": false, "gotk_type": true, - "instance": true, - "job": true, + "instance": false, + "job": false, "kubernetes_namespace": true, "kubernetes_pod_name": true, - "namespace": true, - "pod": true, + "namespace": false, + "pod": false, "pod_template_hash": true, - "revision": true, - "service": true, - "source_name": true, + "revision": false, + "service": false, + "source_name": false, "status": true, "suspended": true, "type": true @@ -612,6 +612,14 @@ "ready": "Status" } } + }, + { + "id": "filterFieldsByName", + "options": { + "include": { + "pattern": "(Namespace|Kind|Name|Status)" + } + } } ], "type": "table" @@ -747,32 +755,32 @@ "id": "organize", "options": { "excludeByName": { - "Time": true, - "Value": true, - "__name__": true, + "Time": false, + "Value": false, + "__name__": false, "app": true, "bucket_name": true, - "container": true, - "customresource_group": true, + "container": false, + "customresource_group": false, "customresource_kind": false, - "customresource_version": true, - "endpoint": true, + "customresource_version": false, + "endpoint": false, "exported_namespace": false, "gotk_type": true, - "instance": true, - "job": true, + "instance": false, + "job": false, "kubernetes_namespace": true, "kubernetes_pod_name": true, - "namespace": true, - "pod": true, + "namespace": false, + "pod": false, "pod_template_hash": true, "ready": false, - "revision": true, - "service": true, + "revision": false, + "service": false, "status": true, "suspended": true, "type": true, - "url": true + "url": false }, "indexByName": { "Time": 0, @@ -802,6 +810,14 @@ "ready": "Status" } } + }, + { + "id": "filterFieldsByName", + "options": { + "include": { + "pattern": "(Namespace|Kind|Name|Status)" + } + } } ], "type": "table" From ea8545f2f9f9ee86e33080b90781f2224af7191e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Knut=20G=C3=B6tz?= Date: Tue, 31 Oct 2023 09:54:04 +0100 Subject: [PATCH 2/2] Don't exclude any field in cluster table transformation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Knut Götz --- monitoring/configs/dashboards/cluster.json | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/monitoring/configs/dashboards/cluster.json b/monitoring/configs/dashboards/cluster.json index ece9981..70e46a8 100644 --- a/monitoring/configs/dashboards/cluster.json +++ b/monitoring/configs/dashboards/cluster.json @@ -560,7 +560,7 @@ "Time": false, "Value": false, "__name__": false, - "app": true, + "app": false, "chart_name": false, "chart_source_name": false, "container": false, @@ -569,20 +569,20 @@ "customresource_version": false, "endpoint": false, "exported_namespace": false, - "gotk_type": true, + "gotk_type": false, "instance": false, "job": false, - "kubernetes_namespace": true, - "kubernetes_pod_name": true, + "kubernetes_namespace": false, + "kubernetes_pod_name": false, "namespace": false, "pod": false, - "pod_template_hash": true, + "pod_template_hash": false, "revision": false, "service": false, "source_name": false, - "status": true, - "suspended": true, - "type": true + "status": false, + "suspended": false, + "type": false }, "indexByName": { "Time": 0, @@ -758,28 +758,28 @@ "Time": false, "Value": false, "__name__": false, - "app": true, - "bucket_name": true, + "app": false, + "bucket_name": false, "container": false, "customresource_group": false, "customresource_kind": false, "customresource_version": false, "endpoint": false, "exported_namespace": false, - "gotk_type": true, + "gotk_type": false, "instance": false, "job": false, - "kubernetes_namespace": true, - "kubernetes_pod_name": true, + "kubernetes_namespace": false, + "kubernetes_pod_name": false, "namespace": false, "pod": false, - "pod_template_hash": true, + "pod_template_hash": false, "ready": false, "revision": false, "service": false, - "status": true, - "suspended": true, - "type": true, + "status": false, + "suspended": false, + "type": false, "url": false }, "indexByName": {