Skip to content

Commit 5bfa3b9

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2619 from slashpai/bump-po-0.84
MON-4255: Bump prometheus-operator dependencies to v0.84.0
2 parents d9298e8 + 583ba3e commit 5bfa3b9

13 files changed

+501
-39
lines changed

‎assets/prometheus-operator-user-workload/cluster-role.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rules:
2323
- thanosrulers/finalizers
2424
- thanosrulers/status
2525
- servicemonitors
26+
- servicemonitors/status
2627
- podmonitors
2728
- probes
2829
- prometheusrules

‎assets/prometheus-operator/cluster-role.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ rules:
2323
- thanosrulers/finalizers
2424
- thanosrulers/status
2525
- servicemonitors
26+
- servicemonitors/status
2627
- podmonitors
2728
- probes
2829
- prometheusrules

‎jsonnet/jsonnetfile.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"subdir": "jsonnet/prometheus-operator"
1818
}
1919
},
20-
"version": "release-0.83"
20+
"version": "release-0.84"
2121
},
2222
{
2323
"source": {

‎jsonnet/jsonnetfile.lock.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
"subdir": "jsonnet/mixin"
192192
}
193193
},
194-
"version": "6176050674d427a1cee23d17b6b0bf307d806e57",
194+
"version": "5b60eb7f1037736eb540ceded294ea005c4b97ec",
195195
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
196196
"name": "prometheus-operator-mixin"
197197
},
@@ -202,8 +202,8 @@
202202
"subdir": "jsonnet/prometheus-operator"
203203
}
204204
},
205-
"version": "5cf2f5d37906d64b2259a262e319df4c74639e31",
206-
"sum": "xzGiEUwaDtS7FdoiizjlOFbvhz7d8vrbKUAJML1ssXw="
205+
"version": "8337f851ab7550fb7f914461e810a722e4312e17",
206+
"sum": "ikNhDwJwp2YNd5JPZWL6nkgZ3pzQIYfk3uxO3yQQqg4="
207207
},
208208
{
209209
"source": {

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-config-custom-resource-definition.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.83.0
10+
operator.prometheus.io/version: 0.84.0
1111
service.beta.openshift.io/inject-cabundle: "true"
1212
labels:
1313
app.kubernetes.io/managed-by: cluster-version-operator

‎manifests/0000_50_cluster-monitoring-operator_00_0alertmanager-custom-resource-definition.yaml‎

Lines changed: 169 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.83.0
10+
operator.prometheus.io/version: 0.84.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -998,6 +998,7 @@ spec:
998998
The default value is `OnNamespace`.
999999
enum:
10001000
- OnNamespace
1001+
- OnNamespaceExceptForAlertmanagerNamespace
10011002
- None
10021003
type: string
10031004
type: object
@@ -1726,6 +1727,17 @@ spec:
17261727
type: string
17271728
type: object
17281729
type: object
1730+
jira:
1731+
description: The default configuration for Jira.
1732+
properties:
1733+
apiURL:
1734+
description: |-
1735+
The default Jira API URL.
1736+
1737+
It requires Alertmanager >= v0.28.0.
1738+
pattern: ^(http|https)://.+$
1739+
type: string
1740+
type: object
17291741
opsGenieApiKey:
17301742
description: The default OpsGenie API Key.
17311743
properties:
@@ -1780,6 +1792,67 @@ spec:
17801792
This has no impact on alerts from Prometheus, as they always include EndsAt.
17811793
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
17821794
type: string
1795+
rocketChat:
1796+
description: The default configuration for Rocket Chat.
1797+
properties:
1798+
apiURL:
1799+
description: |-
1800+
The default Rocket Chat API URL.
1801+
1802+
It requires Alertmanager >= v0.28.0.
1803+
pattern: ^(http|https)://.+$
1804+
type: string
1805+
token:
1806+
description: |-
1807+
The default Rocket Chat token.
1808+
1809+
It requires Alertmanager >= v0.28.0.
1810+
properties:
1811+
key:
1812+
description: The key of the secret to select from. Must be a valid secret key.
1813+
type: string
1814+
name:
1815+
default: ""
1816+
description: |-
1817+
Name of the referent.
1818+
This field is effectively required, but due to backwards compatibility is
1819+
allowed to be empty. Instances of this type with an empty value here are
1820+
almost certainly wrong.
1821+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1822+
type: string
1823+
optional:
1824+
description: Specify whether the Secret or its key must be defined
1825+
type: boolean
1826+
required:
1827+
- key
1828+
type: object
1829+
x-kubernetes-map-type: atomic
1830+
tokenID:
1831+
description: |-
1832+
The default Rocket Chat Token ID.
1833+
1834+
It requires Alertmanager >= v0.28.0.
1835+
properties:
1836+
key:
1837+
description: The key of the secret to select from. Must be a valid secret key.
1838+
type: string
1839+
name:
1840+
default: ""
1841+
description: |-
1842+
Name of the referent.
1843+
This field is effectively required, but due to backwards compatibility is
1844+
allowed to be empty. Instances of this type with an empty value here are
1845+
almost certainly wrong.
1846+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
1847+
type: string
1848+
optional:
1849+
description: Specify whether the Secret or its key must be defined
1850+
type: boolean
1851+
required:
1852+
- key
1853+
type: object
1854+
x-kubernetes-map-type: atomic
1855+
type: object
17831856
slackApiUrl:
17841857
description: The default Slack API URL.
17851858
properties:
@@ -2032,6 +2105,94 @@ spec:
20322105
type: string
20332106
type: object
20342107
type: object
2108+
telegram:
2109+
description: The default Telegram config
2110+
properties:
2111+
apiURL:
2112+
description: |-
2113+
The default Telegram API URL.
2114+
2115+
It requires Alertmanager >= v0.24.0.
2116+
pattern: ^(http|https)://.+$
2117+
type: string
2118+
type: object
2119+
victorops:
2120+
description: The default configuration for VictorOps.
2121+
properties:
2122+
apiKey:
2123+
description: The default VictorOps API Key.
2124+
properties:
2125+
key:
2126+
description: The key of the secret to select from. Must be a valid secret key.
2127+
type: string
2128+
name:
2129+
default: ""
2130+
description: |-
2131+
Name of the referent.
2132+
This field is effectively required, but due to backwards compatibility is
2133+
allowed to be empty. Instances of this type with an empty value here are
2134+
almost certainly wrong.
2135+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2136+
type: string
2137+
optional:
2138+
description: Specify whether the Secret or its key must be defined
2139+
type: boolean
2140+
required:
2141+
- key
2142+
type: object
2143+
x-kubernetes-map-type: atomic
2144+
apiURL:
2145+
description: The default VictorOps API URL.
2146+
pattern: ^(http|https)://.+$
2147+
type: string
2148+
type: object
2149+
webex:
2150+
description: The default configuration for Jira.
2151+
properties:
2152+
apiURL:
2153+
description: |-
2154+
The default Webex API URL.
2155+
2156+
It requires Alertmanager >= v0.25.0.
2157+
pattern: ^(http|https)://.+$
2158+
type: string
2159+
type: object
2160+
wechat:
2161+
description: The default WeChat Config
2162+
properties:
2163+
apiCorpID:
2164+
description: The default WeChat API Corporate ID.
2165+
minLength: 1
2166+
type: string
2167+
apiSecret:
2168+
description: The default WeChat API Secret.
2169+
properties:
2170+
key:
2171+
description: The key of the secret to select from. Must be a valid secret key.
2172+
type: string
2173+
name:
2174+
default: ""
2175+
description: |-
2176+
Name of the referent.
2177+
This field is effectively required, but due to backwards compatibility is
2178+
allowed to be empty. Instances of this type with an empty value here are
2179+
almost certainly wrong.
2180+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
2181+
type: string
2182+
optional:
2183+
description: Specify whether the Secret or its key must be defined
2184+
type: boolean
2185+
required:
2186+
- key
2187+
type: object
2188+
x-kubernetes-map-type: atomic
2189+
apiURL:
2190+
description: |-
2191+
The default WeChat API URL.
2192+
The default value is "https://qyapi.weixin.qq.com/cgi-bin/"
2193+
pattern: ^(http|https)://.+$
2194+
type: string
2195+
type: object
20352196
type: object
20362197
name:
20372198
description: |-
@@ -4010,7 +4171,7 @@ spec:
40104171
description: |-
40114172
An optional list of references to secrets in the same namespace
40124173
to use for pulling prometheus and alertmanager images from registries
4013-
see http://kubernetes.io/docs/user-guide/images#specifying-imagepullsecrets-on-a-pod
4174+
see https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
40144175
items:
40154176
description: |-
40164177
LocalObjectReference contains enough information to let you locate the
@@ -5509,7 +5670,7 @@ spec:
55095670
Annotations is an unstructured key value map stored with a resource that may be
55105671
set by external tools to store and retrieve arbitrary metadata. They are not
55115672
queryable and should be preserved when modifying objects.
5512-
More info: http://kubernetes.io/docs/user-guide/annotations
5673+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
55135674
type: object
55145675
labels:
55155676
additionalProperties:
@@ -5518,7 +5679,7 @@ spec:
55185679
Map of string keys and values that can be used to organize and categorize
55195680
(scope and select) objects. May match selectors of replication controllers
55205681
and services.
5521-
More info: http://kubernetes.io/docs/user-guide/labels
5682+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
55225683
type: object
55235684
name:
55245685
description: |-
@@ -5527,7 +5688,7 @@ spec:
55275688
automatically. Name is primarily intended for creation idempotence and configuration
55285689
definition.
55295690
Cannot be updated.
5530-
More info: http://kubernetes.io/docs/user-guide/identifiers#names
5691+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
55315692
type: string
55325693
type: object
55335694
portName:
@@ -6182,7 +6343,7 @@ spec:
61826343
Annotations is an unstructured key value map stored with a resource that may be
61836344
set by external tools to store and retrieve arbitrary metadata. They are not
61846345
queryable and should be preserved when modifying objects.
6185-
More info: http://kubernetes.io/docs/user-guide/annotations
6346+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
61866347
type: object
61876348
labels:
61886349
additionalProperties:
@@ -6191,7 +6352,7 @@ spec:
61916352
Map of string keys and values that can be used to organize and categorize
61926353
(scope and select) objects. May match selectors of replication controllers
61936354
and services.
6194-
More info: http://kubernetes.io/docs/user-guide/labels
6355+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
61956356
type: object
61966357
name:
61976358
description: |-
@@ -6200,7 +6361,7 @@ spec:
62006361
automatically. Name is primarily intended for creation idempotence and configuration
62016362
definition.
62026363
Cannot be updated.
6203-
More info: http://kubernetes.io/docs/user-guide/identifiers#names
6364+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/
62046365
type: string
62056366
type: object
62066367
spec:

‎manifests/0000_50_cluster-monitoring-operator_00_0podmonitor-custom-resource-definition.yaml‎

Lines changed: 49 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
include.release.openshift.io/ibm-cloud-managed: "true"
88
include.release.openshift.io/self-managed-high-availability: "true"
99
include.release.openshift.io/single-node-developer: "true"
10-
operator.prometheus.io/version: 0.83.0
10+
operator.prometheus.io/version: 0.84.0
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -423,6 +423,14 @@ spec:
423423
type: string
424424
type: object
425425
type: array
426+
noProxy:
427+
description: |-
428+
`noProxy` is a comma-separated string that can contain IPs, CIDR notation, domain names
429+
that should be excluded from proxying. IP and domain names can
430+
contain port numbers.
431+
432+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
433+
type: string
426434
oauth2:
427435
description: |-
428436
`oauth2` configures the OAuth2 settings to use when scraping the target.
@@ -753,10 +761,47 @@ spec:
753761
maximum: 65535
754762
minimum: 1
755763
type: integer
756-
proxyUrl:
764+
proxyConnectHeader:
765+
additionalProperties:
766+
items:
767+
description: SecretKeySelector selects a key of a Secret.
768+
properties:
769+
key:
770+
description: The key of the secret to select from. Must be a valid secret key.
771+
type: string
772+
name:
773+
default: ""
774+
description: |-
775+
Name of the referent.
776+
This field is effectively required, but due to backwards compatibility is
777+
allowed to be empty. Instances of this type with an empty value here are
778+
almost certainly wrong.
779+
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
780+
type: string
781+
optional:
782+
description: Specify whether the Secret or its key must be defined
783+
type: boolean
784+
required:
785+
- key
786+
type: object
787+
x-kubernetes-map-type: atomic
788+
type: array
789+
description: |-
790+
ProxyConnectHeader optionally specifies headers to send to
791+
proxies during CONNECT requests.
792+
793+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
794+
type: object
795+
x-kubernetes-map-type: atomic
796+
proxyFromEnvironment:
757797
description: |-
758-
`proxyURL` configures the HTTP Proxy URL (e.g.
759-
"http://proxyserver:2195") to go through when scraping the target.
798+
Whether to use the proxy configuration defined by environment variables (HTTP_PROXY, HTTPS_PROXY, and NO_PROXY).
799+
800+
It requires Prometheus >= v2.43.0, Alertmanager >= v0.25.0 or Thanos >= v0.32.0.
801+
type: boolean
802+
proxyUrl:
803+
description: '`proxyURL` defines the HTTP proxy server to use.'
804+
pattern: ^(http|https|socks5)://.+$
760805
type: string
761806
relabelings:
762807
description: |-

0 commit comments

Comments
 (0)