Skip to content

Commit aba3ecf

Browse files
authored
Merge pull request #3276 from tosi3k/bump-po
Bump version of prometheus operator to 0.81.0
2 parents 704450f + 967dbe9 commit aba3ecf

15 files changed

+34120
-3736
lines changed

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0alertmanagerConfigCustomResourceDefinition.yaml

Lines changed: 9000 additions & 828 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0alertmanagerCustomResourceDefinition.yaml

Lines changed: 6684 additions & 766 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0podmonitorCustomResourceDefinition.yaml

Lines changed: 943 additions & 90 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0probeCustomResourceDefinition.yaml

Lines changed: 1050 additions & 43 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0prometheusCustomResourceDefinition.yaml

Lines changed: 9773 additions & 1108 deletions
Large diffs are not rendered by default.

clusterloader2/pkg/prometheus/manifests/0prometheus-operator-0prometheusruleCustomResourceDefinition.yaml

Lines changed: 86 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,44 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.4.1
6-
creationTimestamp: null
5+
controller-gen.kubebuilder.io/version: v0.17.2
6+
operator.prometheus.io/version: 0.81.0
77
name: prometheusrules.monitoring.coreos.com
88
spec:
99
group: monitoring.coreos.com
1010
names:
11+
categories:
12+
- prometheus-operator
1113
kind: PrometheusRule
1214
listKind: PrometheusRuleList
1315
plural: prometheusrules
16+
shortNames:
17+
- promrule
1418
singular: prometheusrule
1519
scope: Namespaced
1620
versions:
1721
- name: v1
1822
schema:
1923
openAPIV3Schema:
20-
description: PrometheusRule defines recording and alerting rules for a Prometheus instance
24+
description: |-
25+
The `PrometheusRule` custom resource definition (CRD) defines [alerting](https://prometheus.io/docs/prometheus/latest/configuration/alerting_rules/) and [recording](https://prometheus.io/docs/prometheus/latest/configuration/recording_rules/) rules to be evaluated by `Prometheus` or `ThanosRuler` objects.
26+
27+
`Prometheus` and `ThanosRuler` objects select `PrometheusRule` objects using label and namespace selectors.
2128
properties:
2229
apiVersion:
23-
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
30+
description: |-
31+
APIVersion defines the versioned schema of this representation of an object.
32+
Servers should convert recognized schemas to the latest internal value, and
33+
may reject unrecognized values.
34+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
2435
type: string
2536
kind:
26-
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
37+
description: |-
38+
Kind is a string value representing the REST resource this object represents.
39+
Servers may infer this from the endpoint the client submits requests to.
40+
Cannot be updated.
41+
In CamelCase.
42+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
2743
type: string
2844
metadata:
2945
type: object
@@ -33,55 +49,110 @@ spec:
3349
groups:
3450
description: Content of Prometheus rule file
3551
items:
36-
description: 'RuleGroup is a list of sequentially evaluated recording and alerting rules. Note: PartialResponseStrategy is only used by ThanosRuler and will be ignored by Prometheus instances. Valid values for this field are ''warn'' or ''abort''. More info: https://github.com/thanos-io/thanos/blob/master/docs/components/rule.md#partial-response'
52+
description: RuleGroup is a list of sequentially evaluated recording
53+
and alerting rules.
3754
properties:
3855
interval:
56+
description: Interval determines how often rules in the group
57+
are evaluated.
58+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
3959
type: string
60+
labels:
61+
additionalProperties:
62+
type: string
63+
description: |-
64+
Labels to add or overwrite before storing the result for its rules.
65+
The labels defined at the rule level take precedence.
66+
67+
It requires Prometheus >= 3.0.0.
68+
The field is ignored for Thanos Ruler.
69+
type: object
70+
limit:
71+
description: |-
72+
Limit the number of alerts an alerting rule and series a recording
73+
rule can produce.
74+
Limit is supported starting with Prometheus >= 2.31 and Thanos Ruler >= 0.24.
75+
type: integer
4076
name:
77+
description: Name of the rule group.
78+
minLength: 1
4179
type: string
4280
partial_response_strategy:
81+
description: |-
82+
PartialResponseStrategy is only used by ThanosRuler and will
83+
be ignored by Prometheus instances.
84+
More info: https://github.com/thanos-io/thanos/blob/main/docs/components/rule.md#partial-response
85+
pattern: ^(?i)(abort|warn)?$
86+
type: string
87+
query_offset:
88+
description: |-
89+
Defines the offset the rule evaluation timestamp of this particular group by the specified duration into the past.
90+
91+
It requires Prometheus >= v2.53.0.
92+
It is not supported for ThanosRuler.
93+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
4394
type: string
4495
rules:
96+
description: List of alerting and recording rules.
4597
items:
46-
description: Rule describes an alerting or recording rule.
98+
description: |-
99+
Rule describes an alerting or recording rule
100+
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
47101
properties:
48102
alert:
103+
description: |-
104+
Name of the alert. Must be a valid label value.
105+
Only one of `record` and `alert` must be set.
49106
type: string
50107
annotations:
51108
additionalProperties:
52109
type: string
110+
description: |-
111+
Annotations to add to each alert.
112+
Only valid for alerting rules.
53113
type: object
54114
expr:
55115
anyOf:
56116
- type: integer
57117
- type: string
118+
description: PromQL expression to evaluate.
58119
x-kubernetes-int-or-string: true
59120
for:
121+
description: Alerts are considered firing once they have
122+
been returned for this long.
123+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
124+
type: string
125+
keep_firing_for:
126+
description: KeepFiringFor defines how long an alert will
127+
continue firing after the condition that triggered it
128+
has cleared.
129+
minLength: 1
130+
pattern: ^(0|(([0-9]+)y)?(([0-9]+)w)?(([0-9]+)d)?(([0-9]+)h)?(([0-9]+)m)?(([0-9]+)s)?(([0-9]+)ms)?)$
60131
type: string
61132
labels:
62133
additionalProperties:
63134
type: string
135+
description: Labels to add or overwrite.
64136
type: object
65137
record:
138+
description: |-
139+
Name of the time series to output to. Must be a valid metric name.
140+
Only one of `record` and `alert` must be set.
66141
type: string
67142
required:
68143
- expr
69144
type: object
70145
type: array
71146
required:
72147
- name
73-
- rules
74148
type: object
75149
type: array
150+
x-kubernetes-list-map-keys:
151+
- name
152+
x-kubernetes-list-type: map
76153
type: object
77154
required:
78155
- spec
79156
type: object
80157
served: true
81-
storage: true
82-
status:
83-
acceptedNames:
84-
kind: ""
85-
plural: ""
86-
conditions: []
87-
storedVersions: []
158+
storage: true

0 commit comments

Comments
 (0)