Skip to content

Commit b035a85

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #2538 from slashpai/bump-po
NO-JIRA: Bump prometheus-operator to v0.79.1
2 parents a4f514a + b300bb2 commit b035a85

10 files changed

+737
-257
lines changed

‎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.78"
20+
"version": "release-0.79"
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": "18155805bb93800e6ad0d2533873e54d0c6cf7d6",
194+
"version": "d3efece3f2b9f09af519a265bedd65974eaf336e",
195195
"sum": "gi+knjdxs2T715iIQIntrimbHRgHnpM8IFBJDD1gYfs=",
196196
"name": "prometheus-operator-mixin"
197197
},
@@ -202,8 +202,8 @@
202202
"subdir": "jsonnet/prometheus-operator"
203203
}
204204
},
205-
"version": "9efea40e09ee6d80627c40b0ef208af200ecd7d5",
206-
"sum": "C4oz34hEILHHKOHgaI+XvZur0cKObfU+cYy30e5tApQ="
205+
"version": "54669ad94e25b26563be06f95e1b014c6ee43ca1",
206+
"sum": "nKDXHUCNOeXAbPSi3GJHwtArBd1iuAuGdwMRxKpNxDo="
207207
},
208208
{
209209
"source": {

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.4
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
include.release.openshift.io/hypershift: "true"
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.78.2
10+
operator.prometheus.io/version: 0.79.1
1111
service.beta.openshift.io/inject-cabundle: "true"
1212
labels:
1313
app.kubernetes.io/managed-by: cluster-version-operator
@@ -6294,6 +6294,12 @@ spec:
62946294
message:
62956295
description: Message template
62966296
type: string
6297+
messageThreadID:
6298+
description: |-
6299+
The Telegram Group Topic ID.
6300+
It requires Alertmanager >= 0.26.0.
6301+
format: int64
6302+
type: integer
62976303
parseMode:
62986304
description: Parse mode for telegram message
62996305
enum:
@@ -15194,6 +15200,12 @@ spec:
1519415200
message:
1519515201
description: Message template
1519615202
type: string
15203+
messageThreadID:
15204+
description: |-
15205+
The Telegram Group Topic ID.
15206+
It requires Alertmanager >= 0.26.0.
15207+
format: int64
15208+
type: integer
1519715209
parseMode:
1519815210
description: Parse mode for telegram message
1519915211
enum:

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

Lines changed: 149 additions & 67 deletions
Large diffs are not rendered by default.

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

Lines changed: 37 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.4
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
include.release.openshift.io/hypershift: "true"
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.78.2
10+
operator.prometheus.io/version: 0.79.1
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -82,6 +82,18 @@ spec:
8282
It requires Prometheus >= v2.28.0.
8383
pattern: (^0|([0-9]*[.])?[0-9]+((K|M|G|T|E|P)i?)?B)$
8484
type: string
85+
fallbackScrapeProtocol:
86+
description: |-
87+
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
88+
89+
It requires Prometheus >= v3.0.0.
90+
enum:
91+
- PrometheusProto
92+
- OpenMetricsText0.0.1
93+
- OpenMetricsText1.0.0
94+
- PrometheusText0.0.4
95+
- PrometheusText1.0.0
96+
type: string
8597
jobLabel:
8698
description: |-
8799
The label to use to retrieve the job name from.
@@ -726,10 +738,16 @@ spec:
726738
type: string
727739
port:
728740
description: |-
729-
Name of the Pod port which this endpoint refers to.
741+
The `Pod` port name which exposes the endpoint.
730742
731-
It takes precedence over `targetPort`.
743+
It takes precedence over the `portNumber` and `targetPort` fields.
732744
type: string
745+
portNumber:
746+
description: The `Pod` port number which exposes the endpoint.
747+
format: int32
748+
maximum: 65535
749+
minimum: 1
750+
type: integer
733751
proxyUrl:
734752
description: |-
735753
`proxyURL` configures the HTTP Proxy URL (e.g.
@@ -856,7 +874,7 @@ spec:
856874
Name or number of the target port of the `Pod` object behind the Service, the
857875
port must be specified with container port property.
858876
859-
Deprecated: use 'port' instead.
877+
Deprecated: use 'port' or 'portNumber' instead.
860878
x-kubernetes-int-or-string: true
861879
tlsConfig:
862880
description: TLS configuration to use when scraping the target.
@@ -1056,11 +1074,13 @@ spec:
10561074
* `OpenMetricsText1.0.0`
10571075
* `PrometheusProto`
10581076
* `PrometheusText0.0.4`
1077+
* `PrometheusText1.0.0`
10591078
enum:
10601079
- PrometheusProto
10611080
- OpenMetricsText0.0.1
10621081
- OpenMetricsText1.0.0
10631082
- PrometheusText0.0.4
1083+
- PrometheusText1.0.0
10641084
type: string
10651085
type: array
10661086
x-kubernetes-list-type: set
@@ -1108,6 +1128,18 @@ spec:
11081128
type: object
11091129
type: object
11101130
x-kubernetes-map-type: atomic
1131+
selectorMechanism:
1132+
description: |-
1133+
Mechanism used to select the endpoints to scrape.
1134+
By default, the selection process relies on relabel configurations to filter the discovered targets.
1135+
Alternatively, you can opt in for role selectors, which may offer better efficiency in large clusters.
1136+
Which strategy is best for your use case needs to be carefully evaluated.
1137+
1138+
It requires Prometheus >= v2.17.0.
1139+
enum:
1140+
- RelabelConfig
1141+
- RoleSelector
1142+
type: string
11111143
targetLimit:
11121144
description: |-
11131145
`targetLimit` defines a limit on the number of scraped targets that will

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

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.4
5+
controller-gen.kubebuilder.io/version: v0.16.5
66
include.release.openshift.io/hypershift: "true"
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.78.2
10+
operator.prometheus.io/version: 0.79.1
1111
labels:
1212
app.kubernetes.io/managed-by: cluster-version-operator
1313
app.kubernetes.io/part-of: openshift-monitoring
@@ -170,6 +170,18 @@ spec:
170170
- key
171171
type: object
172172
x-kubernetes-map-type: atomic
173+
fallbackScrapeProtocol:
174+
description: |-
175+
The protocol to use if a scrape returns blank, unparseable, or otherwise invalid Content-Type.
176+
177+
It requires Prometheus >= v3.0.0.
178+
enum:
179+
- PrometheusProto
180+
- OpenMetricsText0.0.1
181+
- OpenMetricsText1.0.0
182+
- PrometheusText0.0.4
183+
- PrometheusText1.0.0
184+
type: string
173185
interval:
174186
description: |-
175187
Interval at which targets are probed using the configured prober.
@@ -671,11 +683,13 @@ spec:
671683
* `OpenMetricsText1.0.0`
672684
* `PrometheusProto`
673685
* `PrometheusText0.0.4`
686+
* `PrometheusText1.0.0`
674687
enum:
675688
- PrometheusProto
676689
- OpenMetricsText0.0.1
677690
- OpenMetricsText1.0.0
678691
- PrometheusText0.0.4
692+
- PrometheusText1.0.0
679693
type: string
680694
type: array
681695
x-kubernetes-list-type: set

0 commit comments

Comments
 (0)