Hello community,

here is the log from the commit of package kube-prometheus for openSUSE:Factory 
checked in at 2020-03-18 12:44:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kube-prometheus (Old)
 and      /work/SRC/openSUSE:Factory/.kube-prometheus.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kube-prometheus"

Wed Mar 18 12:44:37 2020 rev:3 rq:786079 version:0.3.0+git20200317.502f81b

Changes:
--------
--- /work/SRC/openSUSE:Factory/kube-prometheus/kube-prometheus.changes  
2020-03-12 23:12:29.739328410 +0100
+++ 
/work/SRC/openSUSE:Factory/.kube-prometheus.new.3160/kube-prometheus.changes    
    2020-03-18 12:50:10.077130830 +0100
@@ -1,0 +2,13 @@
+Wed Mar 18 06:25:32 UTC 2020 - [email protected]
+
+- Update to version 0.3.0+git20200317.502f81b:
+  * manifests: regenerate
+  * jsonnet/prometheus-adapter: use irate for CPU queries
+  * Updated the doc as grafana deployment needs modifications
+  * Fixed the port name for weave-net metrics endpoint
+  * Fixed the label for weave net selector
+  * fix invalid Usage section reference
+  - Includes 448.patch
+- Refresh vendor.tar.xz
+
+-------------------------------------------------------------------

Old:
----
  448.patch
  kube-prometheus-0.3.0+git20200305.66c625d.tar.xz

New:
----
  kube-prometheus-0.3.0+git20200317.502f81b.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kube-prometheus.spec ++++++
--- /var/tmp/diff_new_pack.ON6j2Z/_old  2020-03-18 12:50:17.661135360 +0100
+++ /var/tmp/diff_new_pack.ON6j2Z/_new  2020-03-18 12:50:17.661135360 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           kube-prometheus
-Version:        0.3.0+git20200305.66c625d
+Version:        0.3.0+git20200317.502f81b
 Release:        0
 Summary:        Manifests to use Prometheus to monitor Kubernetes
 License:        Apache-2.0
@@ -26,7 +26,6 @@
 Source1:        vendor.tar.xz
 Source2:        update-vendor.sh
 Source3:        kubic.jsonnet
-Patch0:         448.patch
 BuildRequires:  gojsontoyaml
 BuildRequires:  jsonnet
 BuildArch:      noarch
@@ -62,7 +61,6 @@
 
 %prep
 %setup -q -a1
-%patch0 -p1
 
 %build
 cp %{SOURCE3} kubic.jsonnet

++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ON6j2Z/_old  2020-03-18 12:50:17.713135391 +0100
+++ /var/tmp/diff_new_pack.ON6j2Z/_new  2020-03-18 12:50:17.713135391 +0100
@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">git://github.com/coreos/kube-prometheus.git</param>
-    <param 
name="changesrevision">66c625d0bfbc080f40ee453ea093c66faa8e1cc0</param>
+    <param 
name="changesrevision">502f81b235a84484b55493af5cf96623ae37ef80</param>
  </service>
 </servicedata>
\ No newline at end of file

++++++ kube-prometheus-0.3.0+git20200305.66c625d.tar.xz -> 
kube-prometheus-0.3.0+git20200317.502f81b.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kube-prometheus-0.3.0+git20200305.66c625d/README.md 
new/kube-prometheus-0.3.0+git20200317.502f81b/README.md
--- old/kube-prometheus-0.3.0+git20200305.66c625d/README.md     2020-03-05 
11:56:54.000000000 +0100
+++ new/kube-prometheus-0.3.0+git20200317.502f81b/README.md     2020-03-17 
14:20:31.000000000 +0100
@@ -278,7 +278,7 @@
 
 ## Configuration
 
-Jsonnet has the concept of hidden fields. These are fields, that are not going 
to be rendered in a result. This is used to configure the kube-prometheus 
components in jsonnet. In the example jsonnet code of the above [Usage 
section](#Usage), you can see an example of this, where the `namespace` is 
being configured to be `monitoring`. In order to not override the whole object, 
use the `+::` construct of jsonnet, to merge objects, this way you can override 
individual settings, but retain all other settings and defaults.
+Jsonnet has the concept of hidden fields. These are fields, that are not going 
to be rendered in a result. This is used to configure the kube-prometheus 
components in jsonnet. In the example jsonnet code of the above [Customizing 
Kube-Prometheus section](#customizing-kube-prometheus), you can see an example 
of this, where the `namespace` is being configured to be `monitoring`. In order 
to not override the whole object, use the `+::` construct of jsonnet, to merge 
objects, this way you can override individual settings, but retain all other 
settings and defaults.
 
 These are the available fields with their respective default values:
 ```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kube-prometheus-0.3.0+git20200305.66c625d/docs/weave-net-support.md 
new/kube-prometheus-0.3.0+git20200317.502f81b/docs/weave-net-support.md
--- old/kube-prometheus-0.3.0+git20200305.66c625d/docs/weave-net-support.md     
2020-03-05 11:56:54.000000000 +0100
+++ new/kube-prometheus-0.3.0+git20200317.502f81b/docs/weave-net-support.md     
2020-03-17 14:20:31.000000000 +0100
@@ -64,4 +64,5 @@
 kubectl create -f prometheus-serviceMonitorWeaveNet.yaml
 kubectl apply -f  prometheus-rules.yaml
 kubectl apply -f grafana-dashboardDefinitions.yaml
+kubectl apply -f grafana-deployment.yaml
 ```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kube-prometheus-0.3.0+git20200305.66c625d/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
 
new/kube-prometheus-0.3.0+git20200317.502f81b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
--- 
old/kube-prometheus-0.3.0+git20200305.66c625d/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
   2020-03-05 11:56:54.000000000 +0100
+++ 
new/kube-prometheus-0.3.0+git20200317.502f81b/jsonnet/kube-prometheus/kube-prometheus-weave-net.libsonnet
   2020-03-17 14:20:31.000000000 +0100
@@ -5,7 +5,7 @@
 {
   prometheus+: {
     serviceWeaveNet:
-      service.new('weave-net', { 'k8s-app': 'weave-net' }, 
servicePort.newNamed('weave-net-metrics', 6782, 6782)) +
+      service.new('weave-net', { 'name': 'weave-net' }, 
servicePort.newNamed('weave-net-metrics', 6782, 6782)) +
       service.mixin.metadata.withNamespace('kube-system') +
       service.mixin.metadata.withLabels({ 'k8s-app': 'weave-net' }) +
       service.mixin.spec.withClusterIp('None'),
@@ -23,7 +23,7 @@
         jobLabel: 'k8s-app',
         endpoints: [
           {
-            port: 'weave-metrics',
+            port: 'weave-net-metrics',
             path: '/metrics',
             interval: '15s',
           },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kube-prometheus-0.3.0+git20200305.66c625d/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
 
new/kube-prometheus-0.3.0+git20200317.502f81b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
--- 
old/kube-prometheus-0.3.0+git20200305.66c625d/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
       2020-03-05 11:56:54.000000000 +0100
+++ 
new/kube-prometheus-0.3.0+git20200317.502f81b/jsonnet/kube-prometheus/prometheus-adapter/prometheus-adapter.libsonnet
       2020-03-17 14:20:31.000000000 +0100
@@ -19,8 +19,8 @@
       config: |||
         resourceRules:
           cpu:
-            containerQuery: 
sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m]))
 by (<<.GroupBy>>)
-            nodeQuery: sum(1 - rate(node_cpu_seconds_total{mode="idle"}[5m]) * 
on(namespace, pod) group_left(node) 
node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+            containerQuery: 
sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m]))
 by (<<.GroupBy>>)
+            nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) 
* on(namespace, pod) group_left(node) 
node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
             resources:
               overrides:
                 node:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kube-prometheus-0.3.0+git20200305.66c625d/manifests/prometheus-adapter-configMap.yaml
 
new/kube-prometheus-0.3.0+git20200317.502f81b/manifests/prometheus-adapter-configMap.yaml
--- 
old/kube-prometheus-0.3.0+git20200305.66c625d/manifests/prometheus-adapter-configMap.yaml
   2020-03-05 11:56:54.000000000 +0100
+++ 
new/kube-prometheus-0.3.0+git20200317.502f81b/manifests/prometheus-adapter-configMap.yaml
   2020-03-17 14:20:31.000000000 +0100
@@ -3,8 +3,8 @@
   config.yaml: |
     resourceRules:
       cpu:
-        containerQuery: 
sum(rate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m]))
 by (<<.GroupBy>>)
-        nodeQuery: sum(1 - rate(node_cpu_seconds_total{mode="idle"}[5m]) * 
on(namespace, pod) group_left(node) 
node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
+        containerQuery: 
sum(irate(container_cpu_usage_seconds_total{<<.LabelMatchers>>,container!="POD",container!="",pod!=""}[5m]))
 by (<<.GroupBy>>)
+        nodeQuery: sum(1 - irate(node_cpu_seconds_total{mode="idle"}[5m]) * 
on(namespace, pod) group_left(node) 
node_namespace_pod:kube_pod_info:{<<.LabelMatchers>>}) by (<<.GroupBy>>)
         resources:
           overrides:
             node:

++++++ vendor.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/jsonnetfile.lock.json new/jsonnetfile.lock.json
--- old/jsonnetfile.lock.json   2020-03-05 13:41:17.465978509 +0100
+++ new/jsonnetfile.lock.json   2020-03-18 07:27:48.492700700 +0100
@@ -18,7 +18,7 @@
           "subdir": "Documentation/etcd-mixin"
         }
       },
-      "version": "6f850a65a115f663bf0cd0499d16ff6e0131dfde",
+      "version": "07a74d61cb6c07965c5b594748dc999d1644862b",
       "sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0="
     },
     {
@@ -38,8 +38,8 @@
           "subdir": "grafonnet"
         }
       },
-      "version": "db36a706bd1c87056759eacb686102133eb4740c",
-      "sum": "g1aMw5iYEP/Dkw1wo1pcfe7q4LIpXc4wqDZsjaCpsRc="
+      "version": "7a932c9cfc6ccdb1efca9535f165e055949be42a",
+      "sum": "HbCbHRvgA9a6K5FlOAYOUnErDHnNPWOCYPvDFU++bQE="
     },
     {
       "source": {
@@ -69,8 +69,8 @@
           "subdir": ""
         }
       },
-      "version": "caf2360fad215b45f103abdbeacd425d26fb6320",
-      "sum": "n/jLqILgXU9mCZn/ZZQHn7K0QBCAPnMLpYHWPT3qHGs="
+      "version": "16ff3841fea16a0f2151479ab67d8d34893759f3",
+      "sum": "UdI7A4jYc5PxmUHZBIGymx9Hk3eStqYSzXuUHot4oTQ="
     },
     {
       "source": {
@@ -79,7 +79,7 @@
           "subdir": "lib/promgrafonnet"
         }
       },
-      "version": "caf2360fad215b45f103abdbeacd425d26fb6320",
+      "version": "16ff3841fea16a0f2151479ab67d8d34893759f3",
       "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc="
     },
     {
@@ -89,7 +89,7 @@
           "subdir": "jsonnet/kube-state-metrics"
         }
       },
-      "version": "7172c4ea3f40399cc933b43968f740ce6e059eb2",
+      "version": "c485728b2e585bd1079e12e462cd7c6fef25f155",
       "sum": "cJjGZaLBjcIGrLHZLjRPU9c3KL+ep9rZTb9dbALSKqA="
     },
     {
@@ -99,7 +99,7 @@
           "subdir": "jsonnet/kube-state-metrics-mixin"
         }
       },
-      "version": "7172c4ea3f40399cc933b43968f740ce6e059eb2",
+      "version": "c485728b2e585bd1079e12e462cd7c6fef25f155",
       "sum": "E1GGavnf9PCWBm4WVrxWnc0FIj72UcbcweqGioWrOdU="
     },
     {
@@ -109,8 +109,8 @@
           "subdir": "slo-libsonnet"
         }
       },
-      "version": "afd4a7ebbe4515027d507f2fc24b2fc0b9154302",
-      "sum": "TbxkmmkdQnlZT1cJ1+IvfdGvcLxeLJtaryOuuWwbv0g="
+      "version": "5ddd7ffc39e7a54c9aca997c2c389a8046fab0ff",
+      "sum": "S7/+tnAkzVh8Li7sg7Hu4aeIQAWHCtxhRQ+k1OKjoQk="
     },
     {
       "source": {
@@ -129,7 +129,7 @@
           "subdir": "documentation/prometheus-mixin"
         }
       },
-      "version": "7164b58945bb5fb462033c0b9dca7302187a2605",
+      "version": "012161d90d6a8a6bb930b90601fb89ff6cc3ae60",
       "sum": "5EUgr6Spr1zNR8Y2/NevjvEkGV9WMvKo6nEScNER1Lc=",
       "name": "prometheus"
     },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/grafana/grafonnet-lib/grafonnet/grafana.libsonnet 
new/vendor/github.com/grafana/grafonnet-lib/grafonnet/grafana.libsonnet
--- old/vendor/github.com/grafana/grafonnet-lib/grafonnet/grafana.libsonnet     
2020-03-05 13:41:16.681975739 +0100
+++ new/vendor/github.com/grafana/grafonnet-lib/grafonnet/grafana.libsonnet     
2020-03-18 07:27:45.892687193 +0100
@@ -7,11 +7,13 @@
   link:: import 'link.libsonnet',
   annotation:: import 'annotation.libsonnet',
   graphPanel:: import 'graph_panel.libsonnet',
+  logPanel:: import 'log_panel.libsonnet',
   tablePanel:: import 'table_panel.libsonnet',
   singlestat:: import 'singlestat.libsonnet',
   pieChartPanel:: import 'pie_chart_panel.libsonnet',
   influxdb:: import 'influxdb.libsonnet',
   prometheus:: import 'prometheus.libsonnet',
+  loki:: import 'loki.libsonnet',
   sql:: import 'sql.libsonnet',
   graphite:: import 'graphite.libsonnet',
   alertCondition:: import 'alert_condition.libsonnet',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/grafana/grafonnet-lib/grafonnet/graph_panel.libsonnet 
new/vendor/github.com/grafana/grafonnet-lib/grafonnet/graph_panel.libsonnet
--- old/vendor/github.com/grafana/grafonnet-lib/grafonnet/graph_panel.libsonnet 
2020-03-05 13:41:16.681975739 +0100
+++ new/vendor/github.com/grafana/grafonnet-lib/grafonnet/graph_panel.libsonnet 
2020-03-18 07:27:45.892687193 +0100
@@ -98,6 +98,7 @@
     legend_sortDesc=null,
     aliasColors={},
     thresholds=[],
+    links=[],
     logBase1Y=1,
     logBase2Y=1,
     transparent=false,
@@ -172,7 +173,7 @@
     [if repeatDirection != null then 'repeatDirection']: repeatDirection,
     seriesOverrides: [],
     thresholds: thresholds,
-    links: [],
+    links: links,
     yaxe(
       format='short',
       min=null,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/grafana/grafonnet-lib/grafonnet/log_panel.libsonnet 
new/vendor/github.com/grafana/grafonnet-lib/grafonnet/log_panel.libsonnet
--- old/vendor/github.com/grafana/grafonnet-lib/grafonnet/log_panel.libsonnet   
1970-01-01 01:00:00.000000000 +0100
+++ new/vendor/github.com/grafana/grafonnet-lib/grafonnet/log_panel.libsonnet   
2020-03-18 07:27:45.892687193 +0100
@@ -0,0 +1,52 @@
+{
+  /**
+   * Returns a new log panel that can be added in a row.
+   * It requires the log panel plugin in grafana, which is built-in.
+   *
+   * @param title The title of the log panel.
+   * @param span Width of the panel
+   * @param datasource Datasource
+   * @showLabels boolean to show or hide labels
+   * @showTime boolean to show or hide time for each line
+   * @wrapLogMessage true to wrap log line to the next line
+   * @sortOrder sort log by time (can be Descending or Ascending )
+   * @return A json that represents a log panel
+   */
+  new(
+    title='',
+    datasource=null,
+    time_from=null,
+    time_shift=null,
+    showLabels=false,
+    showTime=true,
+    sortOrder='Descending',
+    wrapLogMessage=true,
+    span=12,
+    height=null,
+  ):: {
+    [if height != null then 'height']: height,
+    span: span,
+    datasource: datasource,
+    options: {
+      showLabels: showLabels,
+      showTime: showTime,
+      sortOrder: sortOrder,
+      wrapLogMessage: wrapLogMessage,
+    },
+    targets: [
+    ],
+    _nextTarget:: 0,
+    addTarget(target):: self {
+      // automatically ref id in added targets.
+      // 
https://github.com/kausalco/public/blob/master/klumps/grafana.libsonnet
+      local nextTarget = super._nextTarget,
+      _nextTarget: nextTarget + 1,
+      targets+: [target { refId: std.char(std.codepoint('A') + nextTarget) }],
+    },
+    addTargets(targets):: std.foldl(function(p, t) p.addTarget(t), targets, 
self),
+    timeFrom: time_from,
+    timeShift: time_shift,
+    title: title,
+    type: 'logs',
+  },
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/grafana/grafonnet-lib/grafonnet/loki.libsonnet 
new/vendor/github.com/grafana/grafonnet-lib/grafonnet/loki.libsonnet
--- old/vendor/github.com/grafana/grafonnet-lib/grafonnet/loki.libsonnet        
1970-01-01 01:00:00.000000000 +0100
+++ new/vendor/github.com/grafana/grafonnet-lib/grafonnet/loki.libsonnet        
2020-03-18 07:27:45.892687193 +0100
@@ -0,0 +1,9 @@
+{
+  target(
+    expr,
+    hide=null,
+  ):: {
+    [if hide != null then 'hide']: hide,
+    expr: expr,
+  },
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/grafana/grafonnet-lib/grafonnet/template.libsonnet 
new/vendor/github.com/grafana/grafonnet-lib/grafonnet/template.libsonnet
--- old/vendor/github.com/grafana/grafonnet-lib/grafonnet/template.libsonnet    
2020-03-05 13:41:16.681975739 +0100
+++ new/vendor/github.com/grafana/grafonnet-lib/grafonnet/template.libsonnet    
2020-03-18 07:27:45.896687214 +0100
@@ -45,7 +45,7 @@
   )::
     {
       current: $.current(current),
-      hide: if hide == '' then 0 else if hide == 'label' then 1 else 2,
+      hide: $.hide(hide),
       label: label,
       name: name,
       query: std.join(',', std.filter($.filterAuto, std.split(query, ','))),
@@ -131,4 +131,19 @@
       query: query,
       type: 'custom',
     },
+  text(
+    name,
+    label=''
+  )::
+    {
+      current: {
+        selected: false,
+        text: '',
+        value: '',
+      },
+      name: name,
+      label: label,
+      query: '',
+      type: 'textbox',
+    },
 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/OWNERS 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/OWNERS
--- old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/OWNERS 
2020-03-05 13:41:08.101945420 +0100
+++ new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/OWNERS 
2020-03-18 07:27:33.912624956 +0100
@@ -5,9 +5,11 @@
 - csmarchbanks
 - metalmatze
 - tomwilkie
+- s-urbaniak
 
 reviewers:
 - brancz
 - csmarchbanks
 - metalmatze
 - tomwilkie
+- s-urbaniak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet
       2020-03-05 13:41:08.101945420 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/alerts/kubelet.libsonnet
       2020-03-18 07:27:33.912624956 +0100
@@ -77,7 +77,7 @@
           {
             alert: 'KubeletPodStartUpLatencyHigh',
             expr: |||
-              histogram_quantile(0.99, 
sum(rate(kubelet_pod_worker_duration_seconds_bucket{%(kubeletSelector)s}[5m])) 
by (instance, le)) * on(instance) group_left(node) kubelet_node_name  > 5
+              histogram_quantile(0.99, 
sum(rate(kubelet_pod_worker_duration_seconds_bucket{%(kubeletSelector)s}[5m])) 
by (instance, le)) * on(instance) group_left(node) kubelet_node_name  > 60
             ||| % $._config,
             'for': '15m',
             labels: {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet
       2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/cluster-total.libsonnet
       2020-03-18 07:27:33.912624956 +0100
@@ -7,9 +7,6 @@
 local tablePanel = grafana.tablePanel;
 local annotation = grafana.annotation;
 local singlestat = grafana.singlestat;
-local promgrafonnet = import '../lib/promgrafonnet/promgrafonnet.libsonnet';
-local numbersinglestat = promgrafonnet.numbersinglestat;
-local gauge = promgrafonnet.gauge;
 
 {
   grafanaDashboards+:: {
@@ -474,7 +471,7 @@
         )
         .addPanel(
           newGraphPanel(
-            graphTitle='Rate of TCP Retransimts out of all sent segments',
+            graphTitle='Rate of TCP Retransmits out of all sent segments',
             
graphQuery='sort_desc(sum(rate(node_netstat_Tcp_RetransSegs[$interval:$resolution])
 / rate(node_netstat_Tcp_OutSegs[$interval:$resolution])) by (instance))',
             graphFormat='percentunit',
             legendFormat='{{instance}}'
@@ -488,7 +485,7 @@
           gridPos={ h: 9, w: 24, x: 0, y: 59 }
         ).addPanel(
           newGraphPanel(
-            graphTitle='Rate of TCP SYN Retransimts out of all retransmits',
+            graphTitle='Rate of TCP SYN Retransmits out of all retransmits',
             
graphQuery='sort_desc(sum(rate(node_netstat_TcpExt_TCPSynRetrans[$interval:$resolution])
 / rate(node_netstat_Tcp_RetransSegs[$interval:$resolution])) by (instance))',
             graphFormat='percentunit',
             legendFormat='{{instance}}'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet
    2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-pod.libsonnet
    2020-03-18 07:27:33.912624956 +0100
@@ -7,9 +7,6 @@
 local tablePanel = grafana.tablePanel;
 local annotation = grafana.annotation;
 local singlestat = grafana.singlestat;
-local promgrafonnet = import '../lib/promgrafonnet/promgrafonnet.libsonnet';
-local numbersinglestat = promgrafonnet.numbersinglestat;
-local gauge = promgrafonnet.gauge;
 
 {
   grafanaDashboards+:: {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet
       2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/namespace-by-workload.libsonnet
       2020-03-18 07:27:33.912624956 +0100
@@ -7,9 +7,6 @@
 local tablePanel = grafana.tablePanel;
 local annotation = grafana.annotation;
 local singlestat = grafana.singlestat;
-local promgrafonnet = import '../lib/promgrafonnet/promgrafonnet.libsonnet';
-local numbersinglestat = promgrafonnet.numbersinglestat;
-local gauge = promgrafonnet.gauge;
 
 {
   grafanaDashboards+:: {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet
   2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/pod-total.libsonnet
   2020-03-18 07:27:33.912624956 +0100
@@ -6,9 +6,6 @@
 local graphPanel = grafana.graphPanel;
 local annotation = grafana.annotation;
 local singlestat = grafana.singlestat;
-local promgrafonnet = import '../lib/promgrafonnet/promgrafonnet.libsonnet';
-local numbersinglestat = promgrafonnet.numbersinglestat;
-local gauge = promgrafonnet.gauge;
 
 {
   grafanaDashboards+:: {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet
      2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/network-usage/workload-total.libsonnet
      2020-03-18 07:27:33.912624956 +0100
@@ -6,9 +6,6 @@
 local graphPanel = grafana.graphPanel;
 local annotation = grafana.annotation;
 local singlestat = grafana.singlestat;
-local promgrafonnet = import '../lib/promgrafonnet/promgrafonnet.libsonnet';
-local numbersinglestat = promgrafonnet.numbersinglestat;
-local gauge = promgrafonnet.gauge;
 
 {
   grafanaDashboards+:: {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet
 2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/cluster.libsonnet
 2020-03-18 07:27:33.912624956 +0100
@@ -69,12 +69,12 @@
       ];
 
       local networkColumns = [
-        
'sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config,
-        
'sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config,
-        
'sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config,
-        
'sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config,
-        
'sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config,
-        
'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config,
+        
'sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config,
+        
'sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config,
+        
'sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config,
+        
'sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config,
+        
'sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config,
+        
'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config,
       ];
 
       local networkTableStyles = {
@@ -121,7 +121,7 @@
          })
         .addPanel(
           g.panel('CPU Utilisation') +
-          g.statPanel('1 - avg(rate(node_cpu_seconds_total{mode="idle", 
%(clusterLabel)s="$cluster"}[$interval]))' % $._config)
+          g.statPanel('1 - avg(rate(node_cpu_seconds_total{mode="idle", 
%(clusterLabel)s="$cluster"}[$__interval]))' % $._config)
         )
         .addPanel(
           g.panel('CPU Requests Commitment') +
@@ -215,7 +215,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Receive Bandwidth') +
-          
g.queryPanel('sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -224,7 +224,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Transmit Bandwidth') +
-          
g.queryPanel('sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -233,7 +233,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Average Container Bandwidth by Namespace: Received') +
-          
g.queryPanel('avg(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('avg(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -242,7 +242,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Average Container Bandwidth by Namespace: Transmitted') +
-          
g.queryPanel('avg(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('avg(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -251,7 +251,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Received Packets') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -260,7 +260,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Transmitted Packets') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -269,7 +269,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Received Packets Dropped') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -278,7 +278,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Transmitted Packets Dropped') +
-          
g.queryPanel('sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$interval])) by (namespace)' % $._config, 
'{{namespace}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~".+"}[$__interval])) by (namespace)' % $._config, 
'{{namespace}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet
       2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/namespace.libsonnet
       2020-03-18 07:27:33.912624956 +0100
@@ -61,12 +61,12 @@
       };
 
       local networkColumns = [
-        
'sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config,
-        
'sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config,
-        
'sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config,
-        
'sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config,
-        
'sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config,
-        
'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config,
+        
'sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config,
+        
'sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config,
+        
'sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config,
+        
'sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config,
+        
'sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config,
+        
'sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config,
       ];
 
       local networkTableStyles = {
@@ -268,7 +268,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Receive Bandwidth') +
-          
g.queryPanel('sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config, 
'{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config, 
'{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -277,7 +277,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Transmit Bandwidth') +
-          
g.queryPanel('sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config, 
'{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config, 
'{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -286,7 +286,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Received Packets') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config, 
'{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config, 
'{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -295,7 +295,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Transmitted Packets') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config, 
'{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config, 
'{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -304,7 +304,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Received Packets Dropped') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config, 
'{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config, 
'{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -313,7 +313,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Transmitted Packets Dropped') +
-          
g.queryPanel('sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])) by (pod)' % $._config, 
'{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])) by (pod)' % $._config, 
'{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet
     2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/pod.libsonnet
     2020-03-18 07:27:33.916624977 +0100
@@ -238,7 +238,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Receive Bandwidth') +
-          
g.queryPanel('sum(irate(container_network_receive_bytes_total{namespace=~"$namespace",
 pod=~"$pod"}[$interval])) by (pod)', '{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_bytes_total{namespace=~"$namespace",
 pod=~"$pod"}[$__interval])) by (pod)', '{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -247,7 +247,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Transmit Bandwidth') +
-          
g.queryPanel('sum(irate(container_network_transmit_bytes_total{namespace=~"$namespace",
 pod=~"$pod"}[$interval])) by (pod)', '{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_bytes_total{namespace=~"$namespace",
 pod=~"$pod"}[$__interval])) by (pod)', '{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -256,7 +256,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Received Packets') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_total{namespace=~"$namespace",
 pod=~"$pod"}[$interval])) by (pod)', '{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_total{namespace=~"$namespace",
 pod=~"$pod"}[$__interval])) by (pod)', '{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -265,7 +265,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Transmitted Packets') +
-          
g.queryPanel('sum(irate(container_network_transmit_packets_total{namespace=~"$namespace",
 pod=~"$pod"}[$interval])) by (pod)', '{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_packets_total{namespace=~"$namespace",
 pod=~"$pod"}[$__interval])) by (pod)', '{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -274,7 +274,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Received Packets Dropped') +
-          
g.queryPanel('sum(irate(container_network_receive_packets_dropped_total{namespace=~"$namespace",
 pod=~"$pod"}[$interval])) by (pod)', '{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_receive_packets_dropped_total{namespace=~"$namespace",
 pod=~"$pod"}[$__interval])) by (pod)', '{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
@@ -283,7 +283,7 @@
         g.row('Network')
         .addPanel(
           g.panel('Rate of Transmitted Packets Dropped') +
-          
g.queryPanel('sum(irate(container_network_transmit_packets_dropped_total{namespace=~"$namespace",
 pod=~"$pod"}[$interval])) by (pod)', '{{pod}}') +
+          
g.queryPanel('sum(irate(container_network_transmit_packets_dropped_total{namespace=~"$namespace",
 pod=~"$pod"}[$__interval])) by (pod)', '{{pod}}') +
           g.stack +
           { yaxes: g.yaxes('Bps') },
         )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet
      2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload-namespace.libsonnet
      2020-03-18 07:27:33.916624977 +0100
@@ -84,32 +84,32 @@
 
       local networkColumns = [
         |||
-          
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload_type="$type"}) by (workload))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload_type="$type"}) by (workload))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload_type="$type"}) by (workload))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload_type="$type"}) by (workload))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload_type="$type"}) by (workload))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload_type="$type"}) by (workload))
         ||| % $._config,
@@ -309,7 +309,7 @@
         .addPanel(
           g.panel('Receive Bandwidth') +
           g.queryPanel(|||
-            
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -322,7 +322,7 @@
         .addPanel(
           g.panel('Transmit Bandwidth') +
           g.queryPanel(|||
-            
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -335,7 +335,7 @@
         .addPanel(
           g.panel('Average Container Bandwidth by Workload: Received') +
           g.queryPanel(|||
-            
(avg(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(avg(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -348,7 +348,7 @@
         .addPanel(
           g.panel('Average Container Bandwidth by Workload: Transmitted') +
           g.queryPanel(|||
-            
(avg(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(avg(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -361,7 +361,7 @@
         .addPanel(
           g.panel('Rate of Received Packets') +
           g.queryPanel(|||
-            
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -374,7 +374,7 @@
         .addPanel(
           g.panel('Rate of Transmitted Packets') +
           g.queryPanel(|||
-            
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -387,7 +387,7 @@
         .addPanel(
           g.panel('Rate of Received Packets Dropped') +
           g.queryPanel(|||
-            
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
@@ -400,7 +400,7 @@
         .addPanel(
           g.panel('Rate of Transmitted Packets Dropped') +
           g.queryPanel(|||
-            
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$__interval])
             * on (namespace,pod) 
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~".+", workload_type="$type"}) by 
(workload))
           ||| % $._config, '{{workload}}') +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet
        2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/dashboards/resources/workload.libsonnet
        2020-03-18 07:27:33.916624977 +0100
@@ -86,32 +86,32 @@
 
       local networkColumns = [
         |||
-          
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
         ||| % $._config,
         |||
-          
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$interval])
+          
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 %(namespaceLabel)s=~"$namespace"}[$__interval])
           * on (namespace,pod)
           group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
         ||| % $._config,
@@ -251,7 +251,7 @@
         .addPanel(
           g.panel('Receive Bandwidth') +
           g.queryPanel(|||
-            
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -264,7 +264,7 @@
         .addPanel(
           g.panel('Transmit Bandwidth') +
           g.queryPanel(|||
-            
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -277,7 +277,7 @@
         .addPanel(
           g.panel('Average Container Bandwidth by Pod: Received') +
           g.queryPanel(|||
-            
(avg(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(avg(irate(container_network_receive_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -290,7 +290,7 @@
         .addPanel(
           g.panel('Average Container Bandwidth by Pod: Transmitted') +
           g.queryPanel(|||
-            
(avg(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(avg(irate(container_network_transmit_bytes_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -303,7 +303,7 @@
         .addPanel(
           g.panel('Rate of Received Packets') +
           g.queryPanel(|||
-            
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_receive_packets_total{%(clusterLabel)s="$cluster", 
namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -316,7 +316,7 @@
         .addPanel(
           g.panel('Rate of Transmitted Packets') +
           g.queryPanel(|||
-            
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_transmit_packets_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -329,7 +329,7 @@
         .addPanel(
           g.panel('Rate of Received Packets Dropped') +
           g.queryPanel(|||
-            
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_receive_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$__interval])
             * on (namespace,pod)
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
@@ -342,7 +342,7 @@
         .addPanel(
           g.panel('Rate of Transmitted Packets Dropped') +
           g.queryPanel(|||
-            
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$interval])
+            
(sum(irate(container_network_transmit_packets_dropped_total{%(clusterLabel)s="$cluster",
 namespace=~"$namespace"}[$__interval])
             * on (namespace,pod) 
             group_left(workload,workload_type) 
mixin_pod_workload{%(clusterLabel)s="$cluster", 
%(namespaceLabel)s=~"$namespace", workload=~"$workload", 
workload_type="$type"}) by (pod))
           ||| % $._config, '{{pod}}') +
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/rules/kube_apiserver.libsonnet
 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/rules/kube_apiserver.libsonnet
--- 
old/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/rules/kube_apiserver.libsonnet
 2020-03-05 13:41:08.105945434 +0100
+++ 
new/vendor/github.com/kubernetes-monitoring/kubernetes-mixin/rules/kube_apiserver.libsonnet
 2020-03-18 07:27:33.916624977 +0100
@@ -17,16 +17,16 @@
           {
             record: 'cluster:apiserver_request_duration_seconds:mean5m',
             expr: |||
-              
sum(rate(apiserver_request_duration_seconds_sum{subresource!="log",verb!~"LIST|WATCH|WATCHLIST|PROXY|CONNECT"}[5m]))
 without(instance, %(podLabel)s)
+              
sum(rate(apiserver_request_duration_seconds_sum{subresource!="log",verb!~"LIST|WATCH|WATCHLIST|DELETECOLLECTION|PROXY|CONNECT"}[5m]))
 without(instance, %(podLabel)s)
               /
-              
sum(rate(apiserver_request_duration_seconds_count{subresource!="log",verb!~"LIST|WATCH|WATCHLIST|PROXY|CONNECT"}[5m]))
 without(instance, %(podLabel)s)
+              
sum(rate(apiserver_request_duration_seconds_count{subresource!="log",verb!~"LIST|WATCH|WATCHLIST|DELETECOLLECTION|PROXY|CONNECT"}[5m]))
 without(instance, %(podLabel)s)
             ||| % ($._config),
           },
         ] + [
           {
             record: 
'cluster_quantile:apiserver_request_duration_seconds:histogram_quantile',
             expr: |||
-              histogram_quantile(%(quantile)s, 
sum(rate(apiserver_request_duration_seconds_bucket{%(kubeApiserverSelector)s,subresource!="log",verb!~"LIST|WATCH|WATCHLIST|PROXY|CONNECT"}[5m]))
 without(instance, %(podLabel)s))
+              histogram_quantile(%(quantile)s, 
sum(rate(apiserver_request_duration_seconds_bucket{%(kubeApiserverSelector)s,subresource!="log",verb!~"LIST|WATCH|WATCHLIST|DELETECOLLECTION|PROXY|CONNECT"}[5m]))
 without(instance, %(podLabel)s))
             ||| % ({ quantile: quantile } + $._config),
             labels: {
               quantile: quantile,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/error-burn.libsonnet
 
new/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/error-burn.libsonnet
--- 
old/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/error-burn.libsonnet
   2020-03-05 13:41:14.781969025 +0100
+++ 
new/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/error-burn.libsonnet
   2020-03-18 07:27:48.348699952 +0100
@@ -1,5 +1,5 @@
-local errors = import 'errors.libsonnet';
 local util = import '_util.libsonnet';
+local errors = import 'errors.libsonnet';
 {
   errorburn(param):: {
     local slo = {
@@ -95,6 +95,9 @@
         labels: labels {
           severity: 'critical',
         },
+        annotations: {
+          message: 'High requests error budget burn for %s (current value: {{ 
$value }})' % [std.strReplace(std.join(',', slo.selectors), '"', '')],
+        },
       },
       {
         alert: 'ErrorBudgetBurn',
@@ -127,6 +130,9 @@
         labels: labels {
           severity: 'warning',
         },
+        annotations: {
+          message: 'High requests error budget burn for %s (current value: {{ 
$value }})' % [std.strReplace(std.join(',', slo.selectors), '"', '')],
+        },
       },
     ],
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/latency-burn.libsonnet
 
new/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/latency-burn.libsonnet
--- 
old/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/latency-burn.libsonnet
 2020-03-05 13:41:14.781969025 +0100
+++ 
new/vendor/github.com/metalmatze/slo-libsonnet/slo-libsonnet/latency-burn.libsonnet
 2020-03-18 07:27:48.348699952 +0100
@@ -48,7 +48,7 @@
 
     local multiBurnRate30d = [
       {
-        alert: 'ErrorBudgetBurn',
+        alert: 'LatencyBudgetBurn',
         // Check how many procent are violating the SLO.
         // Send an alert only when this procent is above the burn rate.
         expr: |||
@@ -80,9 +80,12 @@
         labels: labels {
           severity: 'critical',
         },
+        annotations: {
+          message: 'High requests latency budget burn for %s (current value: 
{{ $value }})' % [std.strReplace(std.join(',', slo.selectors), '"', '')],
+        },
       },
       {
-        alert: 'ErrorBudgetBurn',
+        alert: 'LatencyBudgetBurn',
         expr: |||
           (
             %s{%s} > (3*%f)
@@ -112,6 +115,9 @@
         labels: labels {
           severity: 'warning',
         },
+        annotations: {
+          message: 'High requests latency budget burn for %s (current value: 
{{ $value }})' % [std.strReplace(std.join(',', slo.selectors), '"', '')],
+        },
       },
     ],
 


Reply via email to