From 58c4663b50341c1b84b7a37266153783db64b5df Mon Sep 17 00:00:00 2001 From: Shivam Shukla Date: Tue, 19 Sep 2023 05:30:57 +0530 Subject: [PATCH] Adding support for datasource_regex in resources dashboards --- dashboards/resources/cluster.libsonnet | 1 + dashboards/resources/multi-cluster.libsonnet | 1 + dashboards/resources/namespace.libsonnet | 1 + dashboards/resources/node.libsonnet | 1 + dashboards/resources/pod.libsonnet | 1 + dashboards/resources/workload-namespace.libsonnet | 1 + dashboards/resources/workload.libsonnet | 1 + 7 files changed, 7 insertions(+) diff --git a/dashboards/resources/cluster.libsonnet b/dashboards/resources/cluster.libsonnet index ff375169f..01e0c3168 100644 --- a/dashboards/resources/cluster.libsonnet +++ b/dashboards/resources/cluster.libsonnet @@ -131,6 +131,7 @@ local template = grafana.template; g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Cluster' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-cluster.json']), + datasource_regex=$._config.datasourceFilterRegex, ) .addRow( (g.row('Headlines') + diff --git a/dashboards/resources/multi-cluster.libsonnet b/dashboards/resources/multi-cluster.libsonnet index 95794339f..1843b46ac 100644 --- a/dashboards/resources/multi-cluster.libsonnet +++ b/dashboards/resources/multi-cluster.libsonnet @@ -14,6 +14,7 @@ local g = import 'github.com/grafana/jsonnet-libs/grafana-builder/grafana.libson g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Multi-Cluster' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-multicluster.json']), + datasource_regex=$._config.datasourceFilterRegex, ).addRow( (g.row('Headlines') + { diff --git a/dashboards/resources/namespace.libsonnet b/dashboards/resources/namespace.libsonnet index 6693c5d3b..2f0f979ca 100644 --- a/dashboards/resources/namespace.libsonnet +++ b/dashboards/resources/namespace.libsonnet @@ -132,6 +132,7 @@ local template = grafana.template; g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Namespace (Pods)' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-namespace.json']), + datasource_regex=$._config.datasourceFilterRegex, ) .addRow( (g.row('Headlines') + diff --git a/dashboards/resources/node.libsonnet b/dashboards/resources/node.libsonnet index 0152f5855..0f7fd2dd9 100644 --- a/dashboards/resources/node.libsonnet +++ b/dashboards/resources/node.libsonnet @@ -39,6 +39,7 @@ local template = grafana.template; g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Node (Pods)' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-node.json']), + datasource_regex=$._config.datasourceFilterRegex, ) .addRow( g.row('CPU Usage') diff --git a/dashboards/resources/pod.libsonnet b/dashboards/resources/pod.libsonnet index e21348dbc..86b0e9c9f 100644 --- a/dashboards/resources/pod.libsonnet +++ b/dashboards/resources/pod.libsonnet @@ -103,6 +103,7 @@ local template = grafana.template; g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Pod' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-pod.json']), + datasource_regex=$._config.datasourceFilterRegex, ) .addRow( g.row('CPU Usage') diff --git a/dashboards/resources/workload-namespace.libsonnet b/dashboards/resources/workload-namespace.libsonnet index 5c95a48ee..f2dc4d8a4 100644 --- a/dashboards/resources/workload-namespace.libsonnet +++ b/dashboards/resources/workload-namespace.libsonnet @@ -164,6 +164,7 @@ local template = grafana.template; g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Namespace (Workloads)' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-workloads-namespace.json']), + datasource_regex=$._config.datasourceFilterRegex, ) .addRow( g.row('CPU Usage') diff --git a/dashboards/resources/workload.libsonnet b/dashboards/resources/workload.libsonnet index 666a639bb..f538ed182 100644 --- a/dashboards/resources/workload.libsonnet +++ b/dashboards/resources/workload.libsonnet @@ -156,6 +156,7 @@ local template = grafana.template; g.dashboard( '%(dashboardNamePrefix)sCompute Resources / Workload' % $._config.grafanaK8s, uid=($._config.grafanaDashboardIDs['k8s-resources-workload.json']), + datasource_regex=$._config.datasourceFilterRegex, ) .addRow( g.row('CPU Usage')