Skip to content

Commit bc0f49d

Browse files
philipgoughphilipgough
authored
chore: Unpin deps for 0.14.0 and re-generate (#2515)
1 parent e025542 commit bc0f49d

14 files changed

+3550
-4609
lines changed

‎jsonnet/kube-prometheus/jsonnetfile.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"subdir": "grafana"
99
}
1010
},
11-
"version": "5698c8940b6dadca3f42107b7839557bc041761f"
11+
"version": "master"
1212
},
1313
{
1414
"source": {
@@ -17,7 +17,7 @@
1717
"subdir": "grafana-mixin"
1818
}
1919
},
20-
"version": "release-11.2.0",
20+
"version": "main",
2121
"name": "grafana-mixin"
2222
},
2323
{
@@ -27,7 +27,7 @@
2727
"subdir": "contrib/mixin"
2828
}
2929
},
30-
"version": "release-3.5"
30+
"version": "main"
3131
},
3232
{
3333
"source": {
@@ -36,7 +36,7 @@
3636
"subdir": "jsonnet/prometheus-operator"
3737
}
3838
},
39-
"version": "release-0.76"
39+
"version": "main"
4040
},
4141
{
4242
"source": {
@@ -45,7 +45,7 @@
4545
"subdir": "jsonnet/mixin"
4646
}
4747
},
48-
"version": "release-0.76",
48+
"version": "main",
4949
"name": "prometheus-operator-mixin"
5050
},
5151
{
@@ -55,7 +55,7 @@
5555
"subdir": ""
5656
}
5757
},
58-
"version": "50150c585ebee6e4d9cb72218182da8f3c616515"
58+
"version": "master"
5959
},
6060
{
6161
"source": {
@@ -64,7 +64,7 @@
6464
"subdir": "jsonnet/kube-state-metrics"
6565
}
6666
},
67-
"version": "release-2.13"
67+
"version": "main"
6868
},
6969
{
7070
"source": {
@@ -73,7 +73,7 @@
7373
"subdir": "jsonnet/kube-state-metrics-mixin"
7474
}
7575
},
76-
"version": "release-2.13"
76+
"version": "main"
7777
},
7878
{
7979
"source": {
@@ -82,7 +82,7 @@
8282
"subdir": "docs/node-mixin"
8383
}
8484
},
85-
"version": "release-1.8"
85+
"version": "master"
8686
},
8787
{
8888
"source": {
@@ -91,7 +91,7 @@
9191
"subdir": "documentation/prometheus-mixin"
9292
}
9393
},
94-
"version": "release-2.54",
94+
"version": "main",
9595
"name": "prometheus"
9696
},
9797
{
@@ -101,7 +101,7 @@
101101
"subdir": "doc/alertmanager-mixin"
102102
}
103103
},
104-
"version": "release-0.27",
104+
"version": "main",
105105
"name": "alertmanager"
106106
},
107107
{
@@ -111,7 +111,7 @@
111111
"subdir": "jsonnet/controller-gen"
112112
}
113113
},
114-
"version": "v0.7.7",
114+
"version": "release-0.7",
115115
"name": "pyrra"
116116
},
117117
{
@@ -121,7 +121,7 @@
121121
"subdir": "mixin"
122122
}
123123
},
124-
"version": "release-0.36",
124+
"version": "main",
125125
"name": "thanos-mixin"
126126
}
127127
],

‎jsonnetfile.lock.json

+26-16
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "f20bbadd404b57c776d1e8876cefd1ac29b03fb5",
22-
"sum": "W/Azptf1PoqjyMwJON96UY69MFugDA4IAYiKURscryc="
21+
"version": "981061a4958e8d386b025dbecd43af9b974709e2",
22+
"sum": "IXI3LQIT9NmTPJAk8WLUJd5+qZfcGpeNCyWIK7oEpws="
2323
},
2424
{
2525
"source": {
@@ -28,8 +28,8 @@
2828
"subdir": "grafana-mixin"
2929
}
3030
},
31-
"version": "c57667e4481563f5e6cf945b03bc0626caa4dbeb",
32-
"sum": "S8mRTRH4w62kMCa2je3iCtvscYrwQmkyJ7Y/aM14KbE="
31+
"version": "1120f9e255760a3c104b57871fcb91801e934382",
32+
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
3333
},
3434
{
3535
"source": {
@@ -61,6 +61,16 @@
6161
"version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
6262
"sum": "eyuJ0jOXeA4MrobbNgU4/v5a7ASDHslHZ0eS6hDdWoI="
6363
},
64+
{
65+
"source": {
66+
"git": {
67+
"remote": "https://github.com/grafana/grafonnet.git",
68+
"subdir": "gen/grafonnet-v10.0.0"
69+
}
70+
},
71+
"version": "733beadbc8dab55c5fe1bcdcf0d8a2d215759a55",
72+
"sum": "xdcrJPJlpkq4+5LpGwN4tPAuheNNLXZjE6tDcyvFjr0="
73+
},
6474
{
6575
"source": {
6676
"git": {
@@ -128,8 +138,8 @@
128138
"subdir": "jsonnet/kube-state-metrics"
129139
}
130140
},
131-
"version": "76c5888e3402c946abd6f31876f3aada4c0c84fc",
132-
"sum": "pvInhJNQVDOcC3NGWRMKRIP954mAvLXCQpTlafIg7fA="
141+
"version": "76ef24190dbca4afb116d8f9d91fba41ae59b704",
142+
"sum": "lO7jUSzAIy8Yk9pOWJIWgPRhubkWzVh56W6wtYfbVH4="
133143
},
134144
{
135145
"source": {
@@ -138,7 +148,7 @@
138148
"subdir": "jsonnet/kube-state-metrics-mixin"
139149
}
140150
},
141-
"version": "76c5888e3402c946abd6f31876f3aada4c0c84fc",
151+
"version": "76ef24190dbca4afb116d8f9d91fba41ae59b704",
142152
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
143153
},
144154
{
@@ -148,7 +158,7 @@
148158
"subdir": "jsonnet/mixin"
149159
}
150160
},
151-
"version": "8ba73758bd40233fce49b68ae191692a12c6fdbf",
161+
"version": "781d6df6bc8e48b010a74348f19526f66c5e2c54",
152162
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
153163
"name": "prometheus-operator-mixin"
154164
},
@@ -159,8 +169,8 @@
159169
"subdir": "jsonnet/prometheus-operator"
160170
}
161171
},
162-
"version": "8ba73758bd40233fce49b68ae191692a12c6fdbf",
163-
"sum": "Qs56OWJ2PLCEGRPlJ2Xd1LukXKj8KBzqMYncwjYTEwo="
172+
"version": "781d6df6bc8e48b010a74348f19526f66c5e2c54",
173+
"sum": "YhMrMNg8UEvQ6Wz0poEQ8/63zJArmGwyf0u0iSLGZS4="
164174
},
165175
{
166176
"source": {
@@ -169,7 +179,7 @@
169179
"subdir": "doc/alertmanager-mixin"
170180
}
171181
},
172-
"version": "0aa3c2aad14cff039931923ab16b26b7481783b5",
182+
"version": "e9904f93a7efa063bac628ed0b74184acf1c7401",
173183
"sum": "IpF46ZXsm+0wJJAPtAre8+yxTNZA57mBqGpBP/r7/kw=",
174184
"name": "alertmanager"
175185
},
@@ -180,8 +190,8 @@
180190
"subdir": "docs/node-mixin"
181191
}
182192
},
183-
"version": "f1e0e8360aa60b6cb5e5cc1560bed348fc2c1895",
184-
"sum": "R9ROsvpjZLgQJ78WAyD4HzrIq976Bpr4V2P2Fo2Kfns="
193+
"version": "090957658ee7be8c7c71b2724979b36c49371b20",
194+
"sum": "rhUvbqviGjQ2mwsRhHKMN0TiS3YvnYpUXHew3XlQ+Wg="
185195
},
186196
{
187197
"source": {
@@ -190,7 +200,7 @@
190200
"subdir": "documentation/prometheus-mixin"
191201
}
192202
},
193-
"version": "c5e015d29534f06bd1d238c64a06b7ac41abdd7f",
203+
"version": "5aa3d8260a7335a0da6946dea82f608cafa46c20",
194204
"sum": "dYLcLzGH4yF3qB7OGC/7z4nqeTNjv42L7Q3BENU8XJI=",
195205
"name": "prometheus"
196206
},
@@ -212,8 +222,8 @@
212222
"subdir": "mixin"
213223
}
214224
},
215-
"version": "99a5742a15f107d4607d280c825eca5b7f09a253",
216-
"sum": "HhSSbGGCNHCMy1ee5jElYDm0yS9Vesa7QB2/SHKdjsY=",
225+
"version": "97710f41b0e4584b476ee5d59fd7b3ae5077154a",
226+
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
217227
"name": "thanos-mixin"
218228
},
219229
{

‎manifests/grafana-dashboardDefinitions.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -3398,6 +3398,7 @@ items:
33983398
}
33993399
],
34003400
"schemaVersion": 30,
3401+
"style": "dark",
34013402
"tags": [
34023403

34033404
],
@@ -15292,6 +15293,7 @@ items:
1529215293
},
1529315294
"timezone": "utc",
1529415295
"title": "Node Exporter / USE Method / Cluster",
15296+
"uid": "3e97d1d02672cdd0861f4c97c64f89b2",
1529515297
"version": 0
1529615298
}
1529715299
kind: ConfigMap
@@ -16370,6 +16372,7 @@ items:
1637016372
},
1637116373
"timezone": "utc",
1637216374
"title": "Node Exporter / USE Method / Node",
16375+
"uid": "fac67cfbe174d3ef53eb473d73d9212f",
1637316376
"version": 0
1637416377
}
1637516378
kind: ConfigMap
@@ -17458,6 +17461,7 @@ items:
1745817461
},
1745917462
"timezone": "utc",
1746017463
"title": "Node Exporter / MacOS",
17464+
"uid": "629701ea43bf69291922ea45f4a87d37",
1746117465
"version": 0
1746217466
}
1746317467
kind: ConfigMap
@@ -18539,6 +18543,7 @@ items:
1853918543
},
1854018544
"timezone": "utc",
1854118545
"title": "Node Exporter / Nodes",
18546+
"uid": "7d57716318ee0dddbac5a7f451fb7753",
1854218547
"version": 0
1854318548
}
1854418549
kind: ConfigMap

‎manifests/grafana-prometheusRule.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ spec:
1919
message: '{{ $labels.namespace }}/{{ $labels.job }}/{{ $labels.handler }} is experiencing {{ $value | humanize }}% errors'
2020
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/grafana/grafanarequestsfailing
2121
expr: |
22-
100 * sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."})
23-
/
22+
100 * namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query", status_code=~"5.."}
23+
/ ignoring (status_code)
2424
sum without (status_code) (namespace_job_handler_statuscode:grafana_http_request_duration_seconds_count:rate5m{handler!~"/api/datasources/proxy/:id.*|/api/ds/query|/api/tsdb/query"})
2525
> 50
2626
for: 5m

0 commit comments

Comments
 (0)