Skip to content

Commit e8df540

Browse files
committed
Enable option to allow all values for workload dashboard
Other workload dashboards already allow for the include-all option. Having this options makes the workload dashboard a way better default dashboard than the current `Kubernetes / Compute Resources / Namespace (Pods)` dashboard since it's basically the same, but with the advantage to also more easily filter for specific workloads inside the namespace. Signed-off-by: Stefan Andres <[email protected]>
1 parent ab52e60 commit e8df540

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

dashboards/resources/workload.libsonnet

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ local var = g.dashboard.variable;
8080

8181
workload:
8282
var.query.new('workload')
83+
+ var.query.selectionOptions.withIncludeAll()
8384
+ var.query.withDatasourceFromVariable(self.datasource)
8485
+ var.query.queryTypes.withLabelValues(
8586
'workload',
@@ -105,15 +106,15 @@ local var = g.dashboard.variable;
105106
sum(
106107
max by (%(clusterLabel)s, %(namespaceLabel)s, pod, container)(node_namespace_pod_container:container_cpu_usage_seconds_total:sum_rate5m{%(clusterLabel)s="$cluster", namespace="$namespace"})
107108
* on(%(clusterLabel)s, namespace, pod)
108-
group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload", workload_type=~"$type"}
109+
group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload=~"$workload", workload_type=~"$type"}
109110
) by (pod)
110111
||| % $._config;
111112

112113
local cpuRequestsQuery = |||
113114
sum(
114115
max by (%(clusterLabel)s, %(namespaceLabel)s, pod, container)(kube_pod_container_resource_requests{%(kubeStateMetricsSelector)s, %(clusterLabel)s="$cluster", namespace="$namespace", resource="cpu"})
115116
* on(%(clusterLabel)s, namespace, pod)
116-
group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload", workload_type=~"$type"}
117+
group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload=~"$workload", workload_type=~"$type"}
117118
) by (pod)
118119
||| % $._config;
119120

@@ -123,7 +124,7 @@ local var = g.dashboard.variable;
123124
sum(
124125
max by (%(clusterLabel)s, %(namespaceLabel)s, pod, container)(container_memory_working_set_bytes{%(clusterLabel)s="$cluster", namespace="$namespace", container!="", image!=""})
125126
* on(%(clusterLabel)s, namespace, pod)
126-
group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload="$workload", workload_type=~"$type"}
127+
group_left(workload, workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster", namespace="$namespace", workload=~"$workload", workload_type=~"$type"}
127128
) by (pod)
128129
||| % $._config;
129130
local memRequestsQuery = std.strReplace(cpuRequestsQuery, 'cpu', 'memory');

0 commit comments

Comments
 (0)