diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json index 877b950b9d069e4e8803be8470fda3492dec395d..c7ffc0388f0ddfd421b9095823ec024c0d63fd6e 100644 --- a/jsonnetfile.lock.json +++ b/jsonnetfile.lock.json @@ -8,7 +8,7 @@ "subdir": "Documentation/etcd-mixin" } }, - "version": "b9d00aae7cc6940143fbe35afa26af920b6ae7f2", + "version": "f6c7d5c46a2a4470545d73f7833e57821b124714", "sum": "Ko3qhNfC2vN/houLh6C0Ryacjv70gl0DVPGU/PQ4OD0=" }, { @@ -30,7 +30,7 @@ "subdir": "grafana-builder" } }, - "version": "e92000a708ded5bde1dd332a8e7457d0b39b7928", + "version": "7ac7da1a0fe165b68cdb718b2521b560d51bd1f4", "sum": "slxrtftVDiTlQK22ertdfrg4Epnq97gdrLI63ftUfaE=" }, { @@ -72,8 +72,8 @@ "subdir": "" } }, - "version": "151d18f121b3dc67b875a95ebe1920eef917be18", - "sum": "CTngOAgi3+vHNPZ9b2K1BnjvYys775tbhW7M0y0BaEQ=" + "version": "92309e9c7a7637c38a12c0964e62a7aeccaf49ae", + "sum": "g0ESmFe+O83pc45hgvQMHJFZV4ZoUSnRrYKKPkqaC7g=" }, { "name": "node-mixin", @@ -94,7 +94,7 @@ "subdir": "documentation/prometheus-mixin" } }, - "version": "8c2bc2f57a4e01121dbe0377fbaa7805311afc8e", + "version": "1a1859417696170f2ceaff34222942bd95bbda78", "sum": "u1YS9CVuBTcw2vks0PZbLb1gtlI/7bVGDVBZsjWFLTw=" }, { @@ -105,8 +105,8 @@ "subdir": "jsonnet/prometheus-operator" } }, - "version": "0f733c1491c150c60cc9d6cb4db1018475734270", - "sum": "j4MQ1LYao8D9sqy3n9/TqLiPB+DGNBXijavIl6LVCAQ=" + "version": "37a843fb60515ec34220bebb06a8d70d3a10a9fd", + "sum": "yUHQC9cVIWqQkGST1urZq4a3OFZXuW0w8YC5jsb0kjE=" }, { "name": "promgrafonnet", @@ -116,7 +116,7 @@ "subdir": "lib/promgrafonnet" } }, - "version": "151d18f121b3dc67b875a95ebe1920eef917be18", + "version": "92309e9c7a7637c38a12c0964e62a7aeccaf49ae", "sum": "VhgBM39yv0f4bKv8VfGg4FXkg573evGDRalip9ypKbc=" }, { diff --git a/manifests/grafana-dashboardDefinitions.yaml b/manifests/grafana-dashboardDefinitions.yaml index e5365dfeed964f63a3399a6b0ae1a73f3c96e1ce..e3b229563ff056bfe8aea5880b2e05218226cc71 100644 --- a/manifests/grafana-dashboardDefinitions.yaml +++ b/manifests/grafana-dashboardDefinitions.yaml @@ -23384,7 +23384,7 @@ items: "steppedLine": false, "targets": [ { - "expr": "rate(node_disk_read_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+\"}[$__interval])", + "expr": "rate(node_disk_read_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])", "format": "time_series", "interval": "1m", "intervalFactor": 2, @@ -23392,7 +23392,7 @@ items: "refId": "A" }, { - "expr": "rate(node_disk_written_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+\"}[$__interval])", + "expr": "rate(node_disk_written_bytes_total{job=\"node-exporter\", instance=\"$instance\", device=~\"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])", "format": "time_series", "interval": "1m", "intervalFactor": 2, @@ -23400,7 +23400,7 @@ items: "refId": "B" }, { - "expr": "rate(node_disk_io_time_seconds_total{job=\"node-exporter\", instance=\"$instance\", device=~\"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+\"}[$__interval])", + "expr": "rate(node_disk_io_time_seconds_total{job=\"node-exporter\", instance=\"$instance\", device=~\"nvme.+|rbd.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+\"}[$__interval])", "format": "time_series", "interval": "1m", "intervalFactor": 2, diff --git a/manifests/prometheus-operator-serviceMonitor.yaml b/manifests/prometheus-operator-serviceMonitor.yaml index 13cf937da12aa5f3cc3ff2cee00527fb62b5d55d..3160e2ca6b37bfffc88f475c084b40d0338cefa8 100644 --- a/manifests/prometheus-operator-serviceMonitor.yaml +++ b/manifests/prometheus-operator-serviceMonitor.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 name: prometheus-operator namespace: monitoring spec: @@ -15,4 +15,4 @@ spec: matchLabels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 diff --git a/manifests/prometheus-rules.yaml b/manifests/prometheus-rules.yaml index 885ca1f1b79be0ab0f0657f17bf854b6a23d04b2..0428ebbb26849dbda846de38f9a52f9850a10d0f 100644 --- a/manifests/prometheus-rules.yaml +++ b/manifests/prometheus-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/manifests/setup/prometheus-operator-clusterRole.yaml b/manifests/setup/prometheus-operator-clusterRole.yaml index 5d0393c595672cbf41d4883d99c7849b9b1fec09..082ea9ca0c8e26a95da2af7a1f4b2fcdf62010cb 100644 --- a/manifests/setup/prometheus-operator-clusterRole.yaml +++ b/manifests/setup/prometheus-operator-clusterRole.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 name: prometheus-operator rules: - apiGroups: diff --git a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml index 9734ee3ff25c46a4808dadef11416b7de241776e..ae079718da4c8a87f26a2848e01f65cffc0c9868 100644 --- a/manifests/setup/prometheus-operator-clusterRoleBinding.yaml +++ b/manifests/setup/prometheus-operator-clusterRoleBinding.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 name: prometheus-operator roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/manifests/setup/prometheus-operator-deployment.yaml b/manifests/setup/prometheus-operator-deployment.yaml index ac3c8d364387b624e6e68ac901543b7abb00c500..28f90eff7f4baec1d34a50de401282e0afd98056 100644 --- a/manifests/setup/prometheus-operator-deployment.yaml +++ b/manifests/setup/prometheus-operator-deployment.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 name: prometheus-operator namespace: monitoring spec: @@ -18,15 +18,15 @@ spec: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 spec: containers: - args: - --kubelet-service=kube-system/kubelet - --logtostderr=true - --config-reloader-image=jimmidyson/configmap-reload:v0.3.0 - - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.0 - image: quay.io/coreos/prometheus-operator:v0.35.0 + - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.35.1 + image: quay.io/coreos/prometheus-operator:v0.35.1 name: prometheus-operator ports: - containerPort: 8080 diff --git a/manifests/setup/prometheus-operator-service.yaml b/manifests/setup/prometheus-operator-service.yaml index 8cebae7415ffecb1b7e46a0eaf734de663a238b4..6c1952295c8aa7e95e5b62c05a015978846c2335 100644 --- a/manifests/setup/prometheus-operator-service.yaml +++ b/manifests/setup/prometheus-operator-service.yaml @@ -4,7 +4,7 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 name: prometheus-operator namespace: monitoring spec: diff --git a/manifests/setup/prometheus-operator-serviceAccount.yaml b/manifests/setup/prometheus-operator-serviceAccount.yaml index 524dc8d06545b562bd79c9885fdd7416b11c5371..595c307549e089e7911216af3d81bf8bf54f1d85 100644 --- a/manifests/setup/prometheus-operator-serviceAccount.yaml +++ b/manifests/setup/prometheus-operator-serviceAccount.yaml @@ -4,6 +4,6 @@ metadata: labels: app.kubernetes.io/component: controller app.kubernetes.io/name: prometheus-operator - app.kubernetes.io/version: v0.35.0 + app.kubernetes.io/version: v0.35.1 name: prometheus-operator namespace: monitoring