Skip to content

Commit 634bceb

Browse files
authored
chore: bump [obo-]prometheus-operator to 0.86.1 (#906)
* chore: bump [obo-]prometheus-operator to 0.86.0 Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * fix: add MockClient.Apply Needed to pass linter with controller-runtime v0.22.0. Signed-off-by: Jan Fajerski <jfajersk@redhat.com> * chore: bump [obo-]prometheus-operator to 0.86.1 Signed-off-by: Jan Fajerski <jfajersk@redhat.com> --------- Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
1 parent 6e9572d commit 634bceb

18 files changed

Lines changed: 9025 additions & 5501 deletions

bundle/manifests/monitoring.rhobs_alertmanagerconfigs.yaml

Lines changed: 2609 additions & 1346 deletions
Large diffs are not rendered by default.

bundle/manifests/monitoring.rhobs_alertmanagers.yaml

Lines changed: 711 additions & 368 deletions
Large diffs are not rendered by default.

bundle/manifests/monitoring.rhobs_podmonitors.yaml

Lines changed: 259 additions & 139 deletions
Large diffs are not rendered by default.

bundle/manifests/monitoring.rhobs_probes.yaml

Lines changed: 278 additions & 124 deletions
Large diffs are not rendered by default.

bundle/manifests/monitoring.rhobs_prometheusagents.yaml

Lines changed: 893 additions & 534 deletions
Large diffs are not rendered by default.

bundle/manifests/monitoring.rhobs_prometheuses.yaml

Lines changed: 1170 additions & 791 deletions
Large diffs are not rendered by default.

bundle/manifests/monitoring.rhobs_prometheusrules.yaml

Lines changed: 129 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.18.0
5+
controller-gen.kubebuilder.io/version: v0.19.0
66
observability.openshift.io/api-support: TechPreview
7-
operator.prometheus.io/version: 0.84.0-rhobs1
7+
operator.prometheus.io/version: 0.86.1-rhobs1
88
creationTimestamp: null
99
labels:
1010
app.kubernetes.io/part-of: observability-operator
@@ -46,99 +46,101 @@ spec:
4646
metadata:
4747
type: object
4848
spec:
49-
description: Specification of desired alerting rule definitions for Prometheus.
49+
description: spec defines the specification of desired alerting rule definitions
50+
for Prometheus.
5051
properties:
5152
groups:
52-
description: Content of Prometheus rule file
53+
description: groups defines the content of Prometheus rule file
5354
items:
5455
description: RuleGroup is a list of sequentially evaluated recording
5556
and alerting rules.
5657
properties:
5758
interval:
58-
description: Interval determines how often rules in the group
59-
are evaluated.
59+
description: interval defines how often rules in the group are
60+
evaluated.
6061
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
6162
type: string
6263
labels:
6364
additionalProperties:
6465
type: string
6566
description: |-
66-
Labels to add or overwrite before storing the result for its rules.
67+
labels define the labels to add or overwrite before storing the result for its rules.
6768
The labels defined at the rule level take precedence.
6869
6970
It requires Prometheus >= 3.0.0.
7071
The field is ignored for Thanos Ruler.
7172
type: object
7273
limit:
7374
description: |-
74-
Limit the number of alerts an alerting rule and series a recording
75+
limit defines the number of alerts an alerting rule and series a recording
7576
rule can produce.
7677
Limit is supported starting with Prometheus >= 2.31 and Thanos Ruler >= 0.24.
7778
type: integer
7879
name:
79-
description: Name of the rule group.
80+
description: name defines the name of the rule group.
8081
minLength: 1
8182
type: string
8283
partial_response_strategy:
8384
description: |-
84-
PartialResponseStrategy is only used by ThanosRuler and will
85+
partial_response_strategy is only used by ThanosRuler and will
8586
be ignored by Prometheus instances.
8687
More info: https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md#partial-response
8788
pattern: ^(?i)(abort|warn)?$
8889
type: string
8990
query_offset:
9091
description: |-
91-
Defines the offset the rule evaluation timestamp of this particular group by the specified duration into the past.
92+
query_offset defines the offset the rule evaluation timestamp of this particular group by the specified duration into the past.
9293
9394
It requires Prometheus >= v2.53.0.
9495
It is not supported for ThanosRuler.
9596
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
9697
type: string
9798
rules:
98-
description: List of alerting and recording rules.
99+
description: rules defines the list of alerting and recording
100+
rules.
99101
items:
100102
description: |-
101103
Rule describes an alerting or recording rule
102104
See Prometheus documentation: [alerting](https://www.prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) or [recording](https://www.prometheus.io/docs/prometheus/latest/configuration/recording_rules/#recording-rules) rule
103105
properties:
104106
alert:
105107
description: |-
106-
Name of the alert. Must be a valid label value.
108+
alert defines the name of the alert. Must be a valid label value.
107109
Only one of `record` and `alert` must be set.
108110
type: string
109111
annotations:
110112
additionalProperties:
111113
type: string
112114
description: |-
113-
Annotations to add to each alert.
115+
annotations defines annotations to add to each alert.
114116
Only valid for alerting rules.
115117
type: object
116118
expr:
117119
anyOf:
118120
- type: integer
119121
- type: string
120-
description: PromQL expression to evaluate.
122+
description: expr defines the PromQL expression to evaluate.
121123
x-kubernetes-int-or-string: true
122124
for:
123-
description: Alerts are considered firing once they have
124-
been returned for this long.
125+
description: for defines how alerts are considered firing
126+
once they have been returned for this long.
125127
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
126128
type: string
127129
keep_firing_for:
128-
description: KeepFiringFor defines how long an alert will
129-
continue firing after the condition that triggered it
130-
has cleared.
130+
description: keep_firing_for defines how long an alert
131+
will continue firing after the condition that triggered
132+
it has cleared.
131133
minLength: 1
132134
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
133135
type: string
134136
labels:
135137
additionalProperties:
136138
type: string
137-
description: Labels to add or overwrite.
139+
description: labels defines labels to add or overwrite.
138140
type: object
139141
record:
140142
description: |-
141-
Name of the time series to output to. Must be a valid metric name.
143+
record defines the name of the time series to output to. Must be a valid metric name.
142144
Only one of `record` and `alert` must be set.
143145
type: string
144146
required:
@@ -153,11 +155,116 @@ spec:
153155
- name
154156
x-kubernetes-list-type: map
155157
type: object
158+
status:
159+
description: |-
160+
status defines the status subresource. It is under active development and is updated only when the
161+
"StatusForConfigurationResources" feature gate is enabled.
162+
163+
Most recent observed status of the PrometheusRule. Read-only.
164+
More info:
165+
https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
166+
properties:
167+
bindings:
168+
description: bindings defines the list of workload resources (Prometheus,
169+
PrometheusAgent, ThanosRuler or Alertmanager) which select the configuration
170+
resource.
171+
items:
172+
description: WorkloadBinding is a link between a configuration resource
173+
and a workload resource.
174+
properties:
175+
conditions:
176+
description: conditions defines the current state of the configuration
177+
resource when bound to the referenced Workload object.
178+
items:
179+
description: ConfigResourceCondition describes the status
180+
of configuration resources linked to Prometheus, PrometheusAgent,
181+
Alertmanager or ThanosRuler.
182+
properties:
183+
lastTransitionTime:
184+
description: lastTransitionTime defines the time of the
185+
last update to the current status property.
186+
format: date-time
187+
type: string
188+
message:
189+
description: message defines the human-readable message
190+
indicating details for the condition's last transition.
191+
type: string
192+
observedGeneration:
193+
description: |-
194+
observedGeneration defines the .metadata.generation that the
195+
condition was set based upon. For instance, if `.metadata.generation` is
196+
currently 12, but the `.status.conditions[].observedGeneration` is 9, the
197+
condition is out of date with respect to the current state of the object.
198+
format: int64
199+
type: integer
200+
reason:
201+
description: reason for the condition's last transition.
202+
type: string
203+
status:
204+
description: status of the condition.
205+
minLength: 1
206+
type: string
207+
type:
208+
description: |-
209+
type of the condition being reported.
210+
Currently, only "Accepted" is supported.
211+
enum:
212+
- Accepted
213+
minLength: 1
214+
type: string
215+
required:
216+
- lastTransitionTime
217+
- status
218+
- type
219+
type: object
220+
type: array
221+
x-kubernetes-list-map-keys:
222+
- type
223+
x-kubernetes-list-type: map
224+
group:
225+
description: group defines the group of the referenced resource.
226+
enum:
227+
- monitoring.rhobs
228+
type: string
229+
name:
230+
description: name defines the name of the referenced object.
231+
minLength: 1
232+
type: string
233+
namespace:
234+
description: namespace defines the namespace of the referenced
235+
object.
236+
minLength: 1
237+
type: string
238+
resource:
239+
description: resource defines the type of resource being referenced
240+
(e.g. Prometheus, PrometheusAgent, ThanosRuler or Alertmanager).
241+
enum:
242+
- prometheuses
243+
- prometheusagents
244+
- thanosrulers
245+
- alertmanagers
246+
type: string
247+
required:
248+
- group
249+
- name
250+
- namespace
251+
- resource
252+
type: object
253+
type: array
254+
x-kubernetes-list-map-keys:
255+
- group
256+
- resource
257+
- name
258+
- namespace
259+
x-kubernetes-list-type: map
260+
type: object
156261
required:
157262
- spec
158263
type: object
159264
served: true
160265
storage: true
266+
subresources:
267+
status: {}
161268
status:
162269
acceptedNames:
163270
kind: ""

0 commit comments

Comments
 (0)