Merge pull request #644 from Prashanth684/cmo-s390x-dasd

Bug 1794934: Bump kubernetes-mixin to support DASD device metric reporting
openshift · Feb 7, 2020 · 55d0e28 · 55d0e28
2 parents 210d579 + aae8975
commit 55d0e28
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/assets/prometheus-k8s/rules.yaml b/assets/prometheus-k8s/rules.yaml
@@ -40,10 +40,10 @@ spec:
         rate(node_vmstat_pgmajfault{job="node-exporter"}[1m])
       record: instance:node_vmstat_pgmajfault:rate1m
     - expr: |
-        rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+"}[1m])
+        rate(node_disk_io_time_seconds_total{job="node-exporter", device=~"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m])
       record: instance_device:node_disk_io_time_seconds:rate1m
     - expr: |
-        rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+"}[1m])
+        rate(node_disk_io_time_weighted_seconds_total{job="node-exporter", device=~"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}[1m])
       record: instance_device:node_disk_io_time_weighted_seconds:rate1m
     - expr: |
         sum without (device) (

diff --git a/jsonnet/jsonnetfile.lock.json b/jsonnet/jsonnetfile.lock.json
@@ -85,8 +85,8 @@
           "subdir": ""
         }
       },
-      "version": "68f82d2a428d91df57e9af43739981a6a8ede897",
-      "sum": "J/tuXi0Z8GRHo63pM17YFIyk4QgkFuMcQ20mAxi1flM="
+      "version": "b2fc95330d105b599b3e326896c8264786ba71bd",
+      "sum": "CjvZXTKpw6t1laxNrKK9H0jtvuuB/RUilTniht6q7V0="
     },
     {
       "name": "node-mixin",

diff --git a/pkg/manifests/bindata.go b/pkg/manifests/bindata.go