Skip to content

Commit 93df2f7

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1725 from raptorsun/feature/MON-2695
[MON-2695] Unpin Jsonnet dependencies.
2 parents 34fb0b4 + cc59f4e commit 93df2f7

18 files changed

+3027
-1653
lines changed

‎assets/grafana/dashboard-definitions.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18715,8 +18715,8 @@ items:
1871518715
"list": [
1871618716
{
1871718717
"current": {
18718-
"text": "Prometheus",
18719-
"value": "Prometheus"
18718+
"text": "default",
18719+
"value": "default"
1872018720
},
1872118721
"hide": 0,
1872218722
"label": "Data Source",
@@ -19771,8 +19771,8 @@ items:
1977119771
"list": [
1977219772
{
1977319773
"current": {
19774-
"text": "Prometheus",
19775-
"value": "Prometheus"
19774+
"text": "default",
19775+
"value": "default"
1977619776
},
1977719777
"hide": 0,
1977819778
"label": "Data Source",

‎assets/kube-state-metrics/cluster-role.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ rules:
1616
- nodes
1717
- pods
1818
- services
19+
- serviceaccounts
1920
- resourcequotas
2021
- replicationcontrollers
2122
- limitranges
@@ -108,3 +109,11 @@ rules:
108109
verbs:
109110
- list
110111
- watch
112+
- apiGroups:
113+
- rbac.authorization.k8s.io
114+
resources:
115+
- clusterroles
116+
- roles
117+
verbs:
118+
- list
119+
- watch

‎assets/node-exporter/prometheus-rule.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,15 +189,15 @@ spec:
189189
summary: Clock skew detected.
190190
expr: |
191191
(
192-
node_timex_offset_seconds > 0.05
192+
node_timex_offset_seconds{job="node-exporter"} > 0.05
193193
and
194-
deriv(node_timex_offset_seconds[5m]) >= 0
194+
deriv(node_timex_offset_seconds{job="node-exporter"}[5m]) >= 0
195195
)
196196
or
197197
(
198-
node_timex_offset_seconds < -0.05
198+
node_timex_offset_seconds{job="node-exporter"} < -0.05
199199
and
200-
deriv(node_timex_offset_seconds[5m]) <= 0
200+
deriv(node_timex_offset_seconds{job="node-exporter"}[5m]) <= 0
201201
)
202202
for: 10m
203203
labels:
@@ -209,9 +209,9 @@ spec:
209209
runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/NodeClockNotSynchronising.md
210210
summary: Clock not synchronising.
211211
expr: |
212-
min_over_time(node_timex_sync_status[5m]) == 0
212+
min_over_time(node_timex_sync_status{job="node-exporter"}[5m]) == 0
213213
and
214-
node_timex_maxerror_seconds >= 16
214+
node_timex_maxerror_seconds{job="node-exporter"} >= 16
215215
for: 10m
216216
labels:
217217
severity: critical
@@ -223,7 +223,7 @@ spec:
223223
runbook_url: https://github.com/openshift/runbooks/blob/master/alerts/cluster-monitoring-operator/NodeRAIDDegraded.md
224224
summary: RAID Array is degraded
225225
expr: |
226-
node_md_disks_required - ignoring (state) (node_md_disks{state="active"}) > 0
226+
node_md_disks_required{job="node-exporter",device=~"mmcblk.p.+|nvme.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"} - ignoring (state) (node_md_disks{state="active",job="node-exporter",device=~"mmcblk.p.+|nvme.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"}) > 0
227227
for: 15m
228228
labels:
229229
severity: critical
@@ -233,7 +233,7 @@ spec:
233233
Array '{{ $labels.device }}' needs attention and possibly a disk swap.
234234
summary: Failed device in RAID array
235235
expr: |
236-
node_md_disks{state="failed"} > 0
236+
node_md_disks{state="failed",job="node-exporter",device=~"mmcblk.p.+|nvme.+|sd.+|vd.+|xvd.+|dm-.+|dasd.+"} > 0
237237
labels:
238238
severity: warning
239239
- alert: NodeFileDescriptorLimit

‎assets/prometheus-k8s/prometheus-rule.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,3 +269,13 @@ spec:
269269
for: 5m
270270
labels:
271271
severity: critical
272+
- alert: PrometheusHighQueryLoad
273+
annotations:
274+
description: Prometheus {{$labels.namespace}}/{{$labels.pod}} query API has
275+
less than 20% available capacity in its query engine for the last 15 minutes.
276+
summary: Prometheus is reaching its maximum capacity serving concurrent requests.
277+
expr: |
278+
avg_over_time(prometheus_engine_queries{job=~"prometheus-k8s|prometheus-user-workload"}[5m]) / max_over_time(prometheus_engine_queries_concurrent_max{job=~"prometheus-k8s|prometheus-user-workload"}[5m]) > 0.8
279+
for: 15m
280+
labels:
281+
severity: warning

‎jsonnet/components/prometheus-user-workload.libsonnet

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,4 +508,10 @@ function(params)
508508
podDisruptionBudget+: {
509509
apiVersion: 'policy/v1',
510510
},
511+
512+
serviceAccount+: {
513+
// service account token is managed by the operator.
514+
automountServiceAccountToken: false,
515+
},
516+
511517
}

‎jsonnet/components/prometheus.libsonnet

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ function(params)
8181
'serviceaccounts.openshift.io/oauth-redirectreference.prometheus-k8s': '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"prometheus-k8s"}}',
8282
},
8383
},
84+
// service account token is managed by the operator.
85+
automountServiceAccountToken: false,
8486
},
8587

8688
// Adding the serving certs annotation causes the serving certs controller

‎jsonnet/jsonnetfile.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"subdir": "jsonnet/kube-prometheus"
1818
}
1919
},
20-
"version": "release-0.11"
20+
"version": "main"
2121
},
2222
{
2323
"source": {
@@ -26,7 +26,7 @@
2626
"subdir": "jsonnet/prometheus-operator"
2727
}
2828
},
29-
"version": "release-0.57"
29+
"version": "main"
3030
},
3131
{
3232
"source": {
@@ -35,7 +35,7 @@
3535
"subdir": "jsonnet"
3636
}
3737
},
38-
"version": "release-4.11",
38+
"version": "master",
3939
"name": "openshift-state-metrics"
4040
},
4141
{
@@ -45,7 +45,7 @@
4545
"subdir": "jsonnet/telemeter"
4646
}
4747
},
48-
"version": "release-4.11",
48+
"version": "master",
4949
"name": "telemeter-client"
5050
},
5151
{
@@ -55,7 +55,7 @@
5555
"subdir": "jsonnet/kube-thanos"
5656
}
5757
},
58-
"version": "v0.26.0"
58+
"version": "main"
5959
},
6060
{
6161
"source": {
@@ -64,7 +64,7 @@
6464
"subdir": "mixin"
6565
}
6666
},
67-
"version": "v0.26.0"
67+
"version": "main"
6868
}
6969
],
7070
"legacyImports": true

‎jsonnet/jsonnetfile.lock.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "0bac6096325c20b0709a3565fbf5808aa7fbf917",
22-
"sum": "zhLYhUNcXNkMRfJhMUX0UiOpi8TOuLmUqJfO9NFKFkg="
21+
"version": "6d27a42b7d6191da43d27930282de5b9e54ead7c",
22+
"sum": "IkDHlaE0gvvcPjSNurFT+jQ2aCOAbqHF1WVmXbAgkds="
2323
},
2424
{
2525
"source": {
@@ -28,7 +28,7 @@
2828
"subdir": "grafana-mixin"
2929
}
3030
},
31-
"version": "3eed09056849ab873b867b561b7ce580ef2c75ba",
31+
"version": "1120f9e255760a3c104b57871fcb91801e934382",
3232
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
3333
},
3434
{
@@ -38,8 +38,18 @@
3838
"subdir": "grafonnet"
3939
}
4040
},
41-
"version": "6db00c292d3a1c71661fc875f90e0ec7caa538c2",
42-
"sum": "gF8foHByYcB25jcUOBqP6jxk0OPifQMjPvKY0HaCk6w="
41+
"version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
42+
"sum": "342u++/7rViR/zj2jeJOjshzglkZ1SY+hFNuyCBFMdc="
43+
},
44+
{
45+
"source": {
46+
"git": {
47+
"remote": "https://github.com/grafana/grafonnet-lib.git",
48+
"subdir": "grafonnet-7.0"
49+
}
50+
},
51+
"version": "30280196507e0fe6fa978a3e0eaca3a62844f817",
52+
"sum": "gCtR9s/4D5fxU9aKXg0Bru+/njZhA0YjLjPiASc61FM="
4353
},
4454
{
4555
"source": {
@@ -48,7 +58,7 @@
4858
"subdir": "grafana-builder"
4959
}
5060
},
51-
"version": "1ddfda8ac51edb0adc38516b9a2435d6abcfc9f0",
61+
"version": "1aa353b7afc7ce46351b88d52235ae7a17f4ec0e",
5262
"sum": "TieGrr7GyKjURk1+wXHFpdoCiwNaIVfZvyc5mbI9OM0="
5363
},
5464
{
@@ -72,25 +82,15 @@
7282
"version": "b8f44bb7be728423836bef0e904ec7166895a34b",
7383
"sum": "LCgSosxceeYuoau5fYSPtE5eXOFe46DxexfkrctUv7c="
7484
},
75-
{
76-
"source": {
77-
"git": {
78-
"remote": "https://github.com/kubernetes-monitoring/kubernetes-mixin.git",
79-
"subdir": "lib/promgrafonnet"
80-
}
81-
},
82-
"version": "b8f44bb7be728423836bef0e904ec7166895a34b",
83-
"sum": "zv7hXGui6BfHzE9wPatHI/AGZa4A2WKo6pq7ZdqBsps="
84-
},
8585
{
8686
"source": {
8787
"git": {
8888
"remote": "https://github.com/kubernetes/kube-state-metrics.git",
8989
"subdir": "jsonnet/kube-state-metrics"
9090
}
9191
},
92-
"version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
93-
"sum": "P0dCnbzyPScQGNXwXRcwiPkMLeTq0IPNbSTysDbySnM="
92+
"version": "e0c75977f78a2486e16bb564b73ef19d516c336e",
93+
"sum": "dFXBd/OAQREzokDmW+6Wnp28KrjK5ZLUz4YX7GO4/m0="
9494
},
9595
{
9696
"source": {
@@ -99,7 +99,7 @@
9999
"subdir": "jsonnet/kube-state-metrics-mixin"
100100
}
101101
},
102-
"version": "0567e1e1b981755e563d2244fa1659563f2cddbc",
102+
"version": "e0c75977f78a2486e16bb564b73ef19d516c336e",
103103
"sum": "u8gaydJoxEjzizQ8jY8xSjYgWooPmxw+wIWdDxifMAk="
104104
},
105105
{
@@ -109,7 +109,7 @@
109109
"subdir": "jsonnet"
110110
}
111111
},
112-
"version": "51879e3f77811205ee881190331c92a5a3cd871a",
112+
"version": "d8412e1d12398790b256cf9afff339953722a829",
113113
"sum": "9/dHjMKxPKGTAPV1fMAV0RuBck0O+Xyj/FkZjlN7DMs=",
114114
"name": "openshift-state-metrics"
115115
},
@@ -120,7 +120,7 @@
120120
"subdir": "jsonnet/telemeter"
121121
}
122122
},
123-
"version": "76493ca3d439dc9d1ab5476a25d36c83d1947289",
123+
"version": "f5cddc957a7937e08ea9d17f19b24523f890037b",
124124
"sum": "qaSPKpik0WiU5BMtW0Q51+NvEcWhdVE2XLqwZDyvJ+c=",
125125
"name": "telemeter-client"
126126
},
@@ -131,8 +131,8 @@
131131
"subdir": "jsonnet/kube-prometheus"
132132
}
133133
},
134-
"version": "4af90319f557da9b38db4e37d710d6d997ff4744",
135-
"sum": "kJIVoJzzriX81zjuVnED4lR0CmZZLuPSg0F0eKeWOcM="
134+
"version": "dfb622fe612fbb18aa78219ee762b87d3f592607",
135+
"sum": "ALOWSoqZKkfqv/jr+GchWXHlUKI+CHhqT5Et09jAP4M="
136136
},
137137
{
138138
"source": {
@@ -141,7 +141,7 @@
141141
"subdir": "jsonnet/mixin"
142142
}
143143
},
144-
"version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
144+
"version": "8547f289848e42fe7cba10e9def4dd2396d002b2",
145145
"sum": "GQmaVFJwKMiD/P4n3N2LrAZVcwutriWrP8joclDtBYQ=",
146146
"name": "prometheus-operator-mixin"
147147
},
@@ -152,8 +152,8 @@
152152
"subdir": "jsonnet/prometheus-operator"
153153
}
154154
},
155-
"version": "5db6996d3ca995e66301c53c33959fd64c3f6ae6",
156-
"sum": "pUggCYwO/3Y/p6Vgryx8Y4KO3QkJ+GqimrZtn/luzzI="
155+
"version": "8547f289848e42fe7cba10e9def4dd2396d002b2",
156+
"sum": "dmojkQoqU/kg+V9NuA9su9106vNC0lybTFt9j88xl2w="
157157
},
158158
{
159159
"source": {
@@ -162,8 +162,8 @@
162162
"subdir": "doc/alertmanager-mixin"
163163
}
164164
},
165-
"version": "14b01e6a34dd3155768c7e9bd5c4376055de9419",
166-
"sum": "f3iZDUXQ/YWB5yDCY7VLD5bs442+3CdJgXJhJyWhNf8=",
165+
"version": "b1438ccd404063fc6428881120c6209aa0538fad",
166+
"sum": "PsK+V7oETCPKu2gLoPfqY0wwPKH9TzhNj6o2xezjjXc=",
167167
"name": "alertmanager"
168168
},
169169
{
@@ -173,8 +173,8 @@
173173
"subdir": "docs/node-mixin"
174174
}
175175
},
176-
"version": "a2321e7b940ddcff26873612bccdf7cd4c42b6b6",
177-
"sum": "MlWDAKGZ+JArozRKdKEvewHeWn8j2DNBzesJfLVd0dk="
176+
"version": "f06eb4152df8090b3a81d4f373744e13f245b3aa",
177+
"sum": "wg4nWFJ6HqiiDdmyAu0cv8TZGXJh//JHsQ6sxnGusRY="
178178
},
179179
{
180180
"source": {
@@ -183,8 +183,8 @@
183183
"subdir": "documentation/prometheus-mixin"
184184
}
185185
},
186-
"version": "d7e7b8e04b5ecdc1dd153534ba376a622b72741b",
187-
"sum": "APXOIP3B3dZ3Tyh7L2UhyWR8Vbf5+9adTLz/ya7n6uU=",
186+
"version": "b57deb6eb02f7333c2c5da5c908f1264fa9a4e06",
187+
"sum": "crD6rsagAMJFnVRw4pO63z3LLYfz4QFIiMR14zjjIfY=",
188188
"name": "prometheus"
189189
},
190190
{
@@ -194,8 +194,8 @@
194194
"subdir": "config/crd/bases"
195195
}
196196
},
197-
"version": "b715a9b3e1894962f910c10dc4999dda22fabc26",
198-
"sum": "GQ0GFKGdIWKx1b78VRs6jtC4SMqkBjT5jl65QUjPKK4="
197+
"version": "3394ca5eb8a6e224cae99775a295bffce383b406",
198+
"sum": "OcgJ4F0OaDwz6JgO2NkaXRz+hpB3puMkJRl/0L4za0Y="
199199
},
200200
{
201201
"source": {
@@ -204,8 +204,8 @@
204204
"subdir": "jsonnet/kube-thanos"
205205
}
206206
},
207-
"version": "86a9d83c02a1c13efdf4a51d40cefbcc5526c37d",
208-
"sum": "9XtRX02CoqEIb2BHJ0nDhuV6VvncFBanwQRFd60qYGg="
207+
"version": "a3f005e4f93c871f44262f4e7968ac74f7c6b8bf",
208+
"sum": "HeVgkKkdS4nmJbYvgt0iYgH/OfRfE17Bm4N6LfDmkH8="
209209
},
210210
{
211211
"source": {
@@ -214,8 +214,8 @@
214214
"subdir": "mixin"
215215
}
216216
},
217-
"version": "b11ecd9d12215dcf8e0d6a4bd0f799df4e4a4393",
218-
"sum": "dBm9ML50quhu6dwTIgfNmVruMqfaUeQVCO/6EKtQLxE="
217+
"version": "090ddb8193b76e43cafbdc3195826a6b70aec6ec",
218+
"sum": "M8vlJRfaKuqG8LJMMYBdFKuuKQgcLiFG27ZDWePHzTQ="
219219
}
220220
],
221221
"legacyImports": false

0 commit comments

Comments
 (0)