From 59de4a911bf400747f496706f4bd919aea4dcef7 Mon Sep 17 00:00:00 2001
From: Paul Gier <pgier@redhat.com>
Date: Thu, 6 Feb 2020 16:37:03 -0600
Subject: [PATCH] update jsonnet dependencies
Includes prometheus-operator v0.35.1 which should fix the statefulset
crash loop issue #2950
---
jsonnetfile.lock.json | 16 ++++++++--------
manifests/grafana-dashboardDefinitions.yaml | 6 +++---
.../prometheus-operator-serviceMonitor.yaml | 4 ++--
manifests/prometheus-rules.yaml | 4 ++--
.../setup/prometheus-operator-clusterRole.yaml | 2 +-
.../prometheus-operator-clusterRoleBinding.yaml | 2 +-
.../setup/prometheus-operator-deployment.yaml | 8 ++++----
manifests/setup/prometheus-operator-service.yaml | 2 +-
.../prometheus-operator-serviceAccount.yaml | 2 +-
9 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/jsonnetfile.lock.json b/jsonnetfile.lock.json
index 877b950b..c7ffc038 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 e5365dfe..e3b22956 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 13cf937d..3160e2ca 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 885ca1f1..0428ebbb 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 5d0393c5..082ea9ca 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 9734ee3f..ae079718 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 ac3c8d36..28f90eff 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 8cebae74..6c195229 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 524dc8d0..595c3075 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
--
GitLab