Skip to content

Commit 68444c6

Browse files
authored
Merge pull request #2670 from slashpai/bumpdeps
chore: cut v0.15.0
2 parents fb4cb43 + d9249cd commit 68444c6

File tree

7 files changed

+100
-41
lines changed

7 files changed

+100
-41
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
## release-0.15 / 2025-06-04
2+
3+
[FEATURE] Add config option for storage to Prometheus and Alertmanager servers[#2651](https://github.com/prometheus-operator/kube-prometheus/pull/2651)
4+
[ENHANCEMENT] Reduce apiserver metric cardinality [#2531](https://github.com/prometheus-operator/kube-prometheus/pull/2531)
5+
[BUGFIX] Fix port allocation for node-exporter [#2627](https://github.com/prometheus-operator/kube-prometheus/pull/2627)
6+
[BUGFIX] Fix procfs location for node-exporter [#2549](https://github.com/prometheus-operator/kube-prometheus/pull/2549)
7+
[BUGFIX] Drop `process_start_time_seconds` from Kubelet slis endpoint [#2530](https://github.com/prometheus-operator/kube-prometheus/pull/2530)
8+
19
## release-0.14 / 2024-09-12
210

311
* [CHANGE] Prefer new form for `kube_node_status_capacity_pods` metric [#2269](https://github.com/prometheus-operator/kube-prometheus/pull/2269)

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,12 @@ The following Kubernetes versions are supported and work as we test against thes
4343

4444
| kube-prometheus stack | Kubernetes 1.23 | Kubernetes 1.24 | Kubernetes 1.25 | Kubernetes 1.26 | Kubernetes 1.27 | Kubernetes 1.28 | Kubernetes 1.29 | Kubernetes 1.30 | Kubernetes 1.31 | Kubernetes 1.32 | Kubernetes 1.33 |
4545
|--------------------------------------------------------------------------------------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|-----------------|
46-
| [`release-0.11`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.11) |||| x | x | x | x | x | x | x | x |
4746
| [`release-0.12`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.12) |||| x | x | x | x | x | x | x | x |
4847
| [`release-0.13`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.13) ||| x |||| x | x | x | x | x |
4948
| [`release-0.14`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.14) ||| x ||||||| x | x |
50-
| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) ||| x | x ||||||||
49+
| [`release-0.15`](https://github.com/prometheus-operator/kube-prometheus/tree/release-0.15) ||| x | x | x | x | x | x ||||
50+
| [`main`](https://github.com/prometheus-operator/kube-prometheus/tree/main) ||| x | x | x | x | x | x ||||
51+
5152

5253
## Quickstart
5354

jsonnet/kube-prometheus/jsonnetfile.json

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

jsonnetfile.lock.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "54ddc02b9410df6915009060ebbd287b87d0c657",
21+
"version": "856c3ddb2576ac90334d044418057f36818555af",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -28,8 +28,8 @@
2828
"subdir": "grafana-mixin"
2929
}
3030
},
31-
"version": "1120f9e255760a3c104b57871fcb91801e934382",
32-
"sum": "MkjR7zCgq6MUZgjDzop574tFKoTX2OBr7DTwm1K+Ofs="
31+
"version": "577c29d0dca45575394129d1d828d7783274bf50",
32+
"sum": "S8mRTRH4w62kMCa2je3iCtvscYrwQmkyJ7Y/aM14KbE="
3333
},
3434
{
3535
"source": {
@@ -118,8 +118,8 @@
118118
"subdir": ""
119119
}
120120
},
121-
"version": "ddfa651bc295d2b6659bfef7333d154c72c6e376",
122-
"sum": "UcJjOdH+9qJwEgWpp9DDzuBXFN7ri3qqfZRTS+D5uw8="
121+
"version": "56af5da5a4e038a3bd24939161f11d0eb3eeb9c8",
122+
"sum": "9pr1MHBJ9tXQoomxY1WLBQGC1jEbJZhjdi5O8xuUUSw="
123123
},
124124
{
125125
"source": {
@@ -128,7 +128,7 @@
128128
"subdir": "jsonnet/kube-state-metrics"
129129
}
130130
},
131-
"version": "84e2d8fe697053c185c0ce17f0e22c151d071a46",
131+
"version": "4a585c91beffdbd1378833ce5f102b401e7e57c5",
132132
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
133133
},
134134
{
@@ -138,7 +138,7 @@
138138
"subdir": "jsonnet/kube-state-metrics-mixin"
139139
}
140140
},
141-
"version": "84e2d8fe697053c185c0ce17f0e22c151d071a46",
141+
"version": "4a585c91beffdbd1378833ce5f102b401e7e57c5",
142142
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
143143
},
144144
{
@@ -169,7 +169,7 @@
169169
"subdir": "doc/alertmanager-mixin"
170170
}
171171
},
172-
"version": "0ce3cfb962db3cbb1649d3e816a49a13c4036cd1",
172+
"version": "0f1a701e9d233211cfd04033150223d404d751a3",
173173
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
174174
"name": "alertmanager"
175175
},
@@ -180,8 +180,8 @@
180180
"subdir": "docs/node-mixin"
181181
}
182182
},
183-
"version": "2a2f16cd28d3ef57e4a9e1c2babca1fcf9c4eed6",
184-
"sum": "NcpQ0Hz0qciUqmOYoAR0X8GUK5pH/QiUXm1aDNgvua0="
183+
"version": "f2ec547b49af53815038a50265aa2adcd1275959",
184+
"sum": "8dNyJ4vpnKVBbCFN9YLsugp1IjlZjDCwdKMjKi0KTG4="
185185
},
186186
{
187187
"source": {
@@ -190,7 +190,7 @@
190190
"subdir": "documentation/prometheus-mixin"
191191
}
192192
},
193-
"version": "ef430074f394838f5d9bde49dc6e5767ee1588cf",
193+
"version": "aea6503d9bbaad6c5faff3ecf6f1025213356c92",
194194
"sum": "2c+wttfee9TwuQJZIkNV7Tekem74Qgc7iZ842P28rNw=",
195195
"name": "prometheus"
196196
},
@@ -201,8 +201,8 @@
201201
"subdir": "jsonnet/controller-gen"
202202
}
203203
},
204-
"version": "d723f4d1a066dd657e9d09c46a158519dda0faa8",
205-
"sum": "cxAPQovFkM16zNB5/94O+sk/n3SETk6ao6Oas2Sa6RE=",
204+
"version": "c20e05e982dd85535726cbd4b03126e50767e6e2",
205+
"sum": "f2dFeYv4O5lUG5OE6trJyvyKiea9BL6E8t8Ij7i+YJc=",
206206
"name": "pyrra"
207207
},
208208
{
@@ -212,7 +212,7 @@
212212
"subdir": "mixin"
213213
}
214214
},
215-
"version": "2029c9bee0fd230b9371bfbb0c32df57fcac63ec",
215+
"version": "0439da0dd291735c36bb515c03e9dfa0012c76c9",
216216
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
217217
"name": "thanos-mixin"
218218
},

manifests/grafana-dashboardDefinitions.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3158,7 +3158,6 @@ items:
31583158
}
31593159
],
31603160
"schemaVersion": 30,
3161-
"style": "dark",
31623161
"tags": [
31633162

31643163
],
@@ -17385,6 +17384,14 @@ items:
1738517384
"refresh": 2,
1738617385
"sort": 1,
1738717386
"type": "query"
17387+
},
17388+
{
17389+
"datasource": {
17390+
"type": "prometheus",
17391+
"uid": "${datasource}"
17392+
},
17393+
"refresh": 2,
17394+
"sort": 1
1738817395
}
1738917396
]
1739017397
},

manifests/grafana-prometheusRule.yaml

Lines changed: 2 additions & 2 deletions
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 * 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)
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+
/
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

manifests/kubernetesControlPlane-prometheusRule.yaml

Lines changed: 52 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,9 +1378,26 @@ spec:
13781378
label_replace(
13791379
kube_pod_owner{job="kube-state-metrics", owner_kind="ReplicaSet"},
13801380
"replicaset", "$1", "owner_name", "(.*)"
1381-
) * on(replicaset, namespace) group_left(owner_name) topk by(replicaset, namespace) (
1382-
1, max by (replicaset, namespace, owner_name) (
1383-
kube_replicaset_owner{job="kube-state-metrics"}
1381+
) * on (cluster, replicaset, namespace) group_left(owner_name) topk by(cluster, replicaset, namespace) (
1382+
1, max by (cluster, replicaset, namespace, owner_name) (
1383+
kube_replicaset_owner{job="kube-state-metrics", owner_kind=""}
1384+
)
1385+
),
1386+
"workload", "$1", "replicaset", "(.*)"
1387+
)
1388+
)
1389+
labels:
1390+
workload_type: replicaset
1391+
record: namespace_workload_pod:kube_pod_owner:relabel
1392+
- expr: |
1393+
max by (cluster, namespace, workload, pod) (
1394+
label_replace(
1395+
label_replace(
1396+
kube_pod_owner{job="kube-state-metrics", owner_kind="ReplicaSet"},
1397+
"replicaset", "$1", "owner_name", "(.*)"
1398+
) * on(replicaset, namespace, cluster) group_left(owner_name) topk by(cluster, replicaset, namespace) (
1399+
1, max by (cluster, replicaset, namespace, owner_name) (
1400+
kube_replicaset_owner{job="kube-state-metrics", owner_kind="Deployment"}
13841401
)
13851402
),
13861403
"workload", "$1", "owner_name", "(.*)"
@@ -1403,21 +1420,47 @@ spec:
14031420
max by (cluster, namespace, workload, pod) (
14041421
label_replace(
14051422
kube_pod_owner{job="kube-state-metrics", owner_kind="StatefulSet"},
1406-
"workload", "$1", "owner_name", "(.*)"
1407-
)
1423+
"workload", "$1", "owner_name", "(.*)")
14081424
)
14091425
labels:
14101426
workload_type: statefulset
14111427
record: namespace_workload_pod:kube_pod_owner:relabel
1428+
- expr: |
1429+
group by (cluster, namespace, workload, pod) (
1430+
label_join(
1431+
group by (cluster, namespace, job_name, pod, owner_name) (
1432+
label_join(
1433+
kube_pod_owner{job="kube-state-metrics", owner_kind="Job"}
1434+
, "job_name", "", "owner_name")
1435+
)
1436+
* on (cluster, namespace, job_name) group_left()
1437+
group by (cluster, namespace, job_name) (
1438+
kube_job_owner{job="kube-state-metrics", owner_kind=~"Pod|"}
1439+
)
1440+
, "workload", "", "owner_name")
1441+
)
1442+
labels:
1443+
workload_type: job
1444+
record: namespace_workload_pod:kube_pod_owner:relabel
14121445
- expr: |
14131446
max by (cluster, namespace, workload, pod) (
14141447
label_replace(
1415-
kube_pod_owner{job="kube-state-metrics", owner_kind="Job"},
1416-
"workload", "$1", "owner_name", "(.*)"
1417-
)
1448+
kube_pod_owner{job="kube-state-metrics", owner_kind="", owner_name=""},
1449+
"workload", "$1", "pod", "(.+)")
14181450
)
14191451
labels:
1420-
workload_type: job
1452+
workload_type: barepod
1453+
record: namespace_workload_pod:kube_pod_owner:relabel
1454+
- expr: |
1455+
max by (cluster, namespace, workload, pod) (
1456+
label_replace(
1457+
kube_pod_owner{job="kube-state-metrics", owner_kind="Node"},
1458+
"workload", "$1", "pod", "(.+)")
1459+
)
1460+
labels:
1461+
workload_type: staticpod
1462+
record: namespace_workload_pod:kube_pod_owner:relabel
1463+
- expr: "group by (cluster, namespace, workload, workload_type, pod) (\n label_join(\n label_join(\n group by (cluster, namespace, job_name, pod) (\n label_join(\n kube_pod_owner{job=\"kube-state-metrics\", owner_kind=\"Job\"}\n , \"job_name\", \"\", \"owner_name\")\n )\n * on (cluster, namespace, job_name) group_left(owner_kind, owner_name)\n group by (cluster, namespace, job_name, owner_kind, owner_name) (\n kube_job_owner{job=\"kube-state-metrics\", owner_kind!=\"Pod\", owner_kind!=\"\"}\n )\n , \"workload\", \"\", \"owner_name\")\n , \"workload_type\", \"\", \"owner_kind\")\n \n OR\n\n label_replace(\n label_replace(\n label_replace(\n kube_pod_owner{job=\"kube-state-metrics\", owner_kind=\"ReplicaSet\"}\n , \"replicaset\", \"$1\", \"owner_name\", \"(.+)\"\n )\n * on(cluster, namespace, replicaset) group_left(owner_kind, owner_name)\n group by (cluster, namespace, replicaset, owner_kind, owner_name) (\n kube_replicaset_owner{job=\"kube-state-metrics\", owner_kind!=\"Deployment\", owner_kind!=\"\"}\n )\n , \"workload\", \"$1\", \"owner_name\", \"(.+)\")\n OR\n label_replace(\n group by (cluster, namespace, pod, owner_name, owner_kind) (\n kube_pod_owner{job=\"kube-state-metrics\", owner_kind!=\"ReplicaSet\", owner_kind!=\"DaemonSet\", owner_kind!=\"StatefulSet\", owner_kind!=\"Job\", owner_kind!=\"Node\", owner_kind!=\"\"}\n )\n , \"workload\", \"$1\", \"owner_name\", \"(.+)\"\n )\n , \"workload_type\", \"$1\", \"owner_kind\", \"(.+)\")\n)\n"
14211464
record: namespace_workload_pod:kube_pod_owner:relabel
14221465
- name: kube-scheduler.rules
14231466
rules:

0 commit comments

Comments
 (0)