Skip to content

Commit 85c30ef

Browse files
paulfantompaulfantom
authored
Merge pull request #698 from james-callahan/fix-incorrect-selector
2 parents 91f320b + ece5e1d commit 85c30ef

File tree

7 files changed

+116
-116
lines changed

7 files changed

+116
-116
lines changed

‎dashboards/network-usage/workload-total.libsonnet‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ local annotation = grafana.annotation;
108108
template.new(
109109
name='namespace',
110110
datasource='$datasource',
111-
query='label_values(container_network_receive_packets_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster"}, namespace)' % $._config,
111+
query='label_values(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster"}, namespace)' % $._config,
112112
allValues='.+',
113113
current='kube-system',
114114
hide='',
@@ -119,7 +119,7 @@ local annotation = grafana.annotation;
119119
auto: false,
120120
auto_count: 30,
121121
auto_min: '10s',
122-
definition: 'label_values(container_network_receive_packets_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster"}, namespace)' % $._config,
122+
definition: 'label_values(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster"}, namespace)' % $._config,
123123
skipUrlSync: false,
124124
};
125125

@@ -294,7 +294,7 @@ local annotation = grafana.annotation;
294294
newBarplotPanel(
295295
graphTitle='Current Rate of Bytes Received',
296296
graphQuery=|||
297-
sort_desc(sum(irate(container_network_receive_bytes_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
297+
sort_desc(sum(irate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
298298
* on (namespace,pod)
299299
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
300300
||| % $._config,
@@ -306,7 +306,7 @@ local annotation = grafana.annotation;
306306
newBarplotPanel(
307307
graphTitle='Current Rate of Bytes Transmitted',
308308
graphQuery=|||
309-
sort_desc(sum(irate(container_network_transmit_bytes_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
309+
sort_desc(sum(irate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
310310
* on (namespace,pod)
311311
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
312312
||| % $._config,
@@ -320,7 +320,7 @@ local annotation = grafana.annotation;
320320
newBarplotPanel(
321321
graphTitle='Average Rate of Bytes Received',
322322
graphQuery=|||
323-
sort_desc(avg(irate(container_network_receive_bytes_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
323+
sort_desc(avg(irate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
324324
* on (namespace,pod)
325325
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
326326
||| % $._config,
@@ -332,7 +332,7 @@ local annotation = grafana.annotation;
332332
newBarplotPanel(
333333
graphTitle='Average Rate of Bytes Transmitted',
334334
graphQuery=|||
335-
sort_desc(avg(irate(container_network_transmit_bytes_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
335+
sort_desc(avg(irate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
336336
* on (namespace,pod)
337337
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
338338
||| % $._config,
@@ -349,7 +349,7 @@ local annotation = grafana.annotation;
349349
newGraphPanel(
350350
graphTitle='Receive Bandwidth',
351351
graphQuery=|||
352-
sort_desc(sum(irate(container_network_receive_bytes_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
352+
sort_desc(sum(irate(container_network_receive_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
353353
* on (namespace,pod)
354354
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
355355
||| % $._config,
@@ -360,7 +360,7 @@ local annotation = grafana.annotation;
360360
newGraphPanel(
361361
graphTitle='Transmit Bandwidth',
362362
graphQuery=|||
363-
sort_desc(sum(irate(container_network_transmit_bytes_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
363+
sort_desc(sum(irate(container_network_transmit_bytes_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
364364
* on (namespace,pod)
365365
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
366366
||| % $._config,
@@ -373,7 +373,7 @@ local annotation = grafana.annotation;
373373
newGraphPanel(
374374
graphTitle='Rate of Received Packets',
375375
graphQuery=|||
376-
sort_desc(sum(irate(container_network_receive_packets_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
376+
sort_desc(sum(irate(container_network_receive_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
377377
* on (namespace,pod)
378378
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
379379
||| % $._config,
@@ -385,7 +385,7 @@ local annotation = grafana.annotation;
385385
newGraphPanel(
386386
graphTitle='Rate of Transmitted Packets',
387387
graphQuery=|||
388-
sort_desc(sum(irate(container_network_transmit_packets_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
388+
sort_desc(sum(irate(container_network_transmit_packets_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
389389
* on (namespace,pod)
390390
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
391391
||| % $._config,
@@ -401,7 +401,7 @@ local annotation = grafana.annotation;
401401
newGraphPanel(
402402
graphTitle='Rate of Received Packets Dropped',
403403
graphQuery=|||
404-
sort_desc(sum(irate(container_network_receive_packets_dropped_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
404+
sort_desc(sum(irate(container_network_receive_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
405405
* on (namespace,pod)
406406
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
407407
||| % $._config,
@@ -413,7 +413,7 @@ local annotation = grafana.annotation;
413413
newGraphPanel(
414414
graphTitle='Rate of Transmitted Packets Dropped',
415415
graphQuery=|||
416-
sort_desc(sum(irate(container_network_transmit_packets_dropped_total{%(kubeletSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
416+
sort_desc(sum(irate(container_network_transmit_packets_dropped_total{%(cadvisorSelector)s, %(clusterLabel)s="$cluster",namespace=~"$namespace"}[$interval:$resolution])
417417
* on (namespace,pod)
418418
group_left(workload,workload_type) namespace_workload_pod:kube_pod_owner:relabel{%(clusterLabel)s="$cluster",namespace=~"$namespace", workload=~"$workload", workload_type="$type"}) by (pod))
419419
||| % $._config,

0 commit comments

Comments
 (0)