Skip to content

Commit 3c832a1

Browse files
authored
[bot] [main] Automated version update (#2716)
Co-authored-by: Prometheus Operator Bot <[email protected]>
1 parent 0bbba33 commit 3c832a1

File tree

4 files changed

+33
-21
lines changed

4 files changed

+33
-21
lines changed

jsonnetfile.lock.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"subdir": "contrib/mixin"
1919
}
2020
},
21-
"version": "ff8f8bbdff05ffd7143a312e9a8473657f47a2b4",
21+
"version": "88a59be05423c4dd9d31c10e191b29723e611cfd",
2222
"sum": "XmXkOCriQIZmXwlIIFhqlJMa0e6qGWdxZD+ZDYaN0Po="
2323
},
2424
{
@@ -118,8 +118,8 @@
118118
"subdir": ""
119119
}
120120
},
121-
"version": "eb631d882a2c917cd9a5fc237cc2d0f37f8f890f",
122-
"sum": "7E/dvR6uooYrdb9GPx25tefet1YC1ijVcMrVntU+o+4="
121+
"version": "8839c3b274a4b89931363e2ad77c13430828d033",
122+
"sum": "zyQZskRm5/0QuY4Y27lxBkvGeZ7XHdR2zek5Tii5Uso="
123123
},
124124
{
125125
"source": {
@@ -128,7 +128,7 @@
128128
"subdir": "jsonnet/kube-state-metrics"
129129
}
130130
},
131-
"version": "95b29ac8a91dd636998d8fd766ec179f2b03c547",
131+
"version": "66296c38198bbb502fd1b43006a41b72044ad1a8",
132132
"sum": "3bioG7CfTfY9zeu5xU4yon6Zt3kYvNkyl492nOhQxnM="
133133
},
134134
{
@@ -138,7 +138,7 @@
138138
"subdir": "jsonnet/kube-state-metrics-mixin"
139139
}
140140
},
141-
"version": "95b29ac8a91dd636998d8fd766ec179f2b03c547",
141+
"version": "66296c38198bbb502fd1b43006a41b72044ad1a8",
142142
"sum": "qclI7LwucTjBef3PkGBkKxF0mfZPbHnn4rlNWKGtR4c="
143143
},
144144
{
@@ -148,7 +148,7 @@
148148
"subdir": "jsonnet/mixin"
149149
}
150150
},
151-
"version": "b7aeb3365845612536cce75a3153687eb38e3ed6",
151+
"version": "f5a97fe6c6fb18fa3035c16ec10ef5c77b9acca4",
152152
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
153153
"name": "prometheus-operator-mixin"
154154
},
@@ -159,8 +159,8 @@
159159
"subdir": "jsonnet/prometheus-operator"
160160
}
161161
},
162-
"version": "b7aeb3365845612536cce75a3153687eb38e3ed6",
163-
"sum": "1PeZdJYHNZNPsBii3gQellJoDn2anz1LG/6KnosqlQM="
162+
"version": "f5a97fe6c6fb18fa3035c16ec10ef5c77b9acca4",
163+
"sum": "slJRXWqFvAZ1nHcbQSgXD8e4yh3Cf2R1vEVWHJ30+iM="
164164
},
165165
{
166166
"source": {
@@ -169,7 +169,7 @@
169169
"subdir": "doc/alertmanager-mixin"
170170
}
171171
},
172-
"version": "27834655bcd1f1092e93af5bbef62af000dbd644",
172+
"version": "3e5da428e680862113622c6987faf627c6900feb",
173173
"sum": "j5prvRrJdoCv7n45l5Uy2ghl1IDb9BBUqjwCDs4ZJoQ=",
174174
"name": "alertmanager"
175175
},
@@ -190,7 +190,7 @@
190190
"subdir": "documentation/prometheus-mixin"
191191
}
192192
},
193-
"version": "294f36e80261bb2e2364aa3d0700ebaf20a17bca",
193+
"version": "93bbf4bc90bb0b0a17f39cc03c7b91493fd58c7f",
194194
"sum": "1+e8HismURh2GEbJPRIxI30M1nsrIuIh0TRUhwylqf4=",
195195
"name": "prometheus"
196196
},
@@ -201,7 +201,7 @@
201201
"subdir": "jsonnet/controller-gen"
202202
}
203203
},
204-
"version": "3c16e27dd827c1ddf66f4ea0fd745f1a1c72d9fb",
204+
"version": "1a7fdbfffc2d4a32534af4661b5d42742e215b89",
205205
"sum": "O3c9Uurei8MWAY0Ad7DOL1fMqSgdHyHB7MpHsxSITKM=",
206206
"name": "pyrra"
207207
},
@@ -212,7 +212,7 @@
212212
"subdir": "mixin"
213213
}
214214
},
215-
"version": "519fda5fcd79823e488a7843df7ff13d64194eac",
215+
"version": "e61ad9c1564c145e9450d2137377062fbd7fb9b6",
216216
"sum": "ieCD4eMgGbOlrI8GmckGPHBGQDcLasE1rULYq56W/bs=",
217217
"name": "thanos-mixin"
218218
},

manifests/kubernetesControlPlane-prometheusRule.yaml

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,14 +340,17 @@ spec:
340340
severity: warning
341341
- alert: KubeCPUQuotaOvercommit
342342
annotations:
343-
description: Cluster {{ $labels.cluster }} has overcommitted CPU resource requests for Namespaces.
343+
description: Cluster {{ $labels.cluster }} has overcommitted CPU resource requests for Namespaces.
344344
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubecpuquotaovercommit
345345
summary: Cluster has overcommitted CPU resource requests.
346346
expr: |
347-
sum(min without(resource) (kube_resourcequota{job="kube-state-metrics", type="hard", resource=~"(cpu|requests.cpu)"})) by (cluster)
348-
/
349-
sum(kube_node_status_allocatable{resource="cpu", job="kube-state-metrics"}) by (cluster)
350-
> 1.5
347+
sum by(cluster) (
348+
min without(resource) (kube_resourcequota{job="kube-state-metrics", type="hard", resource=~"(cpu|requests.cpu)"})
349+
)
350+
/
351+
sum by(cluster) (
352+
kube_node_status_allocatable{resource="cpu", job="kube-state-metrics"}
353+
) > 1.5
351354
for: 5m
352355
labels:
353356
severity: warning
@@ -357,10 +360,13 @@ spec:
357360
runbook_url: https://runbooks.prometheus-operator.dev/runbooks/kubernetes/kubememoryquotaovercommit
358361
summary: Cluster has overcommitted memory resource requests.
359362
expr: |
360-
sum(min without(resource) (kube_resourcequota{job="kube-state-metrics", type="hard", resource=~"(memory|requests.memory)"})) by (cluster)
361-
/
362-
sum(kube_node_status_allocatable{resource="memory", job="kube-state-metrics"}) by (cluster)
363-
> 1.5
363+
sum by(cluster) (
364+
min without(resource) (kube_resourcequota{job="kube-state-metrics", type="hard", resource=~"(memory|requests.memory)"})
365+
)
366+
/
367+
sum by(cluster) (
368+
kube_node_status_allocatable{resource="memory", job="kube-state-metrics"}
369+
) > 1.5
364370
for: 5m
365371
labels:
366372
severity: warning

manifests/setup/0prometheusagentCustomResourceDefinition.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10316,6 +10316,8 @@ spec:
1031610316
rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.persistentVolumeClaimRetentionPolicy))'
1031710317
- message: scrapeConfigSelector cannot be set when mode is DaemonSet
1031810318
rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.scrapeConfigSelector))'
10319+
- message: probeSelector cannot be set when mode is DaemonSet
10320+
rule: '!(has(self.mode) && self.mode == ''DaemonSet'' && has(self.probeSelector))'
1031910321
status:
1032010322
description: |-
1032110323
Most recent observed status of the Prometheus cluster. Read-only.

manifests/setup/0scrapeconfigCustomResourceDefinition.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,6 +2272,7 @@ spec:
22722272
type: string
22732273
hostNetworkingHost:
22742274
description: The host to use if the container is in host networking mode.
2275+
minLength: 1
22752276
type: string
22762277
matchFirstNetwork:
22772278
description: |-
@@ -2591,6 +2592,9 @@ spec:
25912592
type: object
25922593
port:
25932594
description: The port to scrape metrics from.
2595+
format: int32
2596+
maximum: 65535
2597+
minimum: 0
25942598
type: integer
25952599
proxyConnectHeader:
25962600
additionalProperties:

0 commit comments

Comments
 (0)