Skip to content

Commit 35aa1b6

Browse files
NissesSenaptheSuess
NissesSenap
authored and
theSuess
committed
run make bundle/redhat to have less changes
1 parent e0deca0 commit 35aa1b6

File tree

2 files changed

+328
-1
lines changed

2 files changed

+328
-1
lines changed

‎bundle/manifests/grafana-operator.clusterserviceversion.yaml

Lines changed: 129 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,103 @@ metadata:
2929
}
3030
}
3131
},
32+
{
33+
"apiVersion": "grafana.integreatly.org/v1beta1",
34+
"kind": "GrafanaAlertRuleGroup",
35+
"metadata": {
36+
"labels": {
37+
"app.kubernetes.io/created-by": "grafana-operator",
38+
"app.kubernetes.io/instance": "grafanaalertrulegroup-sample",
39+
"app.kubernetes.io/managed-by": "kustomize",
40+
"app.kubernetes.io/name": "grafanaalertrulegroup",
41+
"app.kubernetes.io/part-of": "grafana-operator"
42+
},
43+
"name": "grafanaalertrulegroup-sample"
44+
},
45+
"spec": {
46+
"folderRef": "test-folder-from-operator",
47+
"instanceSelector": {
48+
"matchLabels": {
49+
"dashboards": "grafana"
50+
}
51+
},
52+
"interval": "5m",
53+
"rules": [
54+
{
55+
"condition": "B",
56+
"data": [
57+
{
58+
"datasourceUid": "grafanacloud-demoinfra-prom",
59+
"model": {
60+
"datasource": {
61+
"type": "prometheus",
62+
"uid": "grafanacloud-demoinfra-prom"
63+
},
64+
"editorMode": "code",
65+
"expr": "weather_temp_c{}",
66+
"instant": true,
67+
"intervalMs": 1000,
68+
"legendFormat": "__auto",
69+
"maxDataPoints": 43200,
70+
"range": false,
71+
"refId": "A"
72+
},
73+
"refId": "A",
74+
"relativeTimeRange": {
75+
"from": 600
76+
}
77+
},
78+
{
79+
"datasourceUid": "__expr__",
80+
"model": {
81+
"conditions": [
82+
{
83+
"evaluator": {
84+
"params": [
85+
0
86+
],
87+
"type": "gt"
88+
},
89+
"operator": {
90+
"type": "and"
91+
},
92+
"query": {
93+
"params": [
94+
"C"
95+
]
96+
},
97+
"reducer": {
98+
"params": [],
99+
"type": "last"
100+
},
101+
"type": "query"
102+
}
103+
],
104+
"datasource": {
105+
"type": "__expr__",
106+
"uid": "__expr__"
107+
},
108+
"expression": "A",
109+
"intervalMs": 1000,
110+
"maxDataPoints": 43200,
111+
"refId": "B",
112+
"type": "threshold"
113+
},
114+
"refId": "B",
115+
"relativeTimeRange": {
116+
"from": 600
117+
}
118+
}
119+
],
120+
"execErrState": "Error",
121+
"for": "5m0s",
122+
"noDataState": "NoData",
123+
"title": "Temperature below freezing",
124+
"uid": "4843de5c-4f8a-4af0-9509-23526a04faf8"
125+
}
126+
]
127+
}
128+
},
32129
{
33130
"apiVersion": "grafana.integreatly.org/v1beta1",
34131
"kind": "GrafanaDashboard",
@@ -95,7 +192,7 @@ metadata:
95192
capabilities: Basic Install
96193
categories: Monitoring
97194
containerImage: ghcr.io/grafana/grafana-operator@sha256:97561cef949b58f55ec67d133c02ac205e2ec3fb77388aeb868dacfcebad0752
98-
createdAt: "2024-02-11T09:40:22Z"
195+
createdAt: "2024-03-05T15:09:12Z"
99196
description: Deploys and manages Grafana instances, dashboards and data sources
100197
operators.operatorframework.io/builder: operator-sdk-v1.32.0
101198
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
@@ -107,6 +204,11 @@ spec:
107204
apiservicedefinitions: {}
108205
customresourcedefinitions:
109206
owned:
207+
- description: GrafanaAlertRuleGroup is the Schema for the grafanaalertrulegroups API
208+
displayName: Grafana Alert Rule Group
209+
kind: GrafanaAlertRuleGroup
210+
name: grafanaalertrulegroups.grafana.integreatly.org
211+
version: v1beta1
110212
- description: GrafanaDashboard is the Schema for the grafanadashboards API
111213
displayName: Grafana Dashboard
112214
kind: GrafanaDashboard
@@ -174,6 +276,32 @@ spec:
174276
- patch
175277
- update
176278
- watch
279+
- apiGroups:
280+
- grafana.integreatly.org
281+
resources:
282+
- grafanaalertrulegroups
283+
verbs:
284+
- create
285+
- delete
286+
- get
287+
- list
288+
- patch
289+
- update
290+
- watch
291+
- apiGroups:
292+
- grafana.integreatly.org
293+
resources:
294+
- grafanaalertrulegroups/finalizers
295+
verbs:
296+
- update
297+
- apiGroups:
298+
- grafana.integreatly.org
299+
resources:
300+
- grafanaalertrulegroups/status
301+
verbs:
302+
- get
303+
- patch
304+
- update
177305
- apiGroups:
178306
- grafana.integreatly.org
179307
resources:

‎bundle/manifests/grafana.integreatly.org_grafanaalertrulegroups.yaml

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
controller-gen.kubebuilder.io/version: v0.12.0
6+
creationTimestamp: null
7+
name: grafanaalertrulegroups.grafana.integreatly.org
8+
spec:
9+
group: grafana.integreatly.org
10+
names:
11+
kind: GrafanaAlertRuleGroup
12+
listKind: GrafanaAlertRuleGroupList
13+
plural: grafanaalertrulegroups
14+
singular: grafanaalertrulegroup
15+
scope: Namespaced
16+
versions:
17+
- name: v1beta1
18+
schema:
19+
openAPIV3Schema:
20+
properties:
21+
apiVersion:
22+
type: string
23+
kind:
24+
type: string
25+
metadata:
26+
type: object
27+
spec:
28+
properties:
29+
allowCrossNamespaceImport:
30+
type: boolean
31+
folderRef:
32+
type: string
33+
folderUID:
34+
type: string
35+
instanceSelector:
36+
properties:
37+
matchExpressions:
38+
items:
39+
properties:
40+
key:
41+
type: string
42+
operator:
43+
type: string
44+
values:
45+
items:
46+
type: string
47+
type: array
48+
required:
49+
- key
50+
- operator
51+
type: object
52+
type: array
53+
matchLabels:
54+
additionalProperties:
55+
type: string
56+
type: object
57+
type: object
58+
x-kubernetes-map-type: atomic
59+
interval:
60+
format: duration
61+
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
62+
type: string
63+
resyncPeriod:
64+
default: 10m
65+
format: duration
66+
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
67+
type: string
68+
rules:
69+
items:
70+
properties:
71+
annotations:
72+
additionalProperties:
73+
type: string
74+
type: object
75+
condition:
76+
type: string
77+
data:
78+
items:
79+
properties:
80+
datasourceUid:
81+
type: string
82+
model:
83+
x-kubernetes-preserve-unknown-fields: true
84+
queryType:
85+
type: string
86+
refId:
87+
type: string
88+
relativeTimeRange:
89+
properties:
90+
from:
91+
format: int64
92+
type: integer
93+
to:
94+
format: int64
95+
type: integer
96+
type: object
97+
type: object
98+
type: array
99+
execErrState:
100+
enum:
101+
- OK
102+
- Alerting
103+
- Error
104+
type: string
105+
for:
106+
format: duration
107+
pattern: ^([0-9]+(\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$
108+
type: string
109+
isPaused:
110+
type: boolean
111+
labels:
112+
additionalProperties:
113+
type: string
114+
type: object
115+
noDataState:
116+
enum:
117+
- Alerting
118+
- NoData
119+
- OK
120+
type: string
121+
title:
122+
example: Always firing
123+
maxLength: 190
124+
minLength: 1
125+
type: string
126+
uid:
127+
pattern: ^[a-zA-Z0-9-_]+$
128+
type: string
129+
required:
130+
- condition
131+
- data
132+
- execErrState
133+
- for
134+
- noDataState
135+
- title
136+
- uid
137+
type: object
138+
type: array
139+
required:
140+
- instanceSelector
141+
- interval
142+
- rules
143+
type: object
144+
x-kubernetes-validations:
145+
- message: Only one of FolderUID or FolderRef can be set
146+
rule: (has(self.folderUID) && !(has(self.folderRef))) || (has(self.folderRef)
147+
&& !(has(self.folderUID)))
148+
status:
149+
properties:
150+
conditions:
151+
items:
152+
properties:
153+
lastTransitionTime:
154+
format: date-time
155+
type: string
156+
message:
157+
maxLength: 32768
158+
type: string
159+
observedGeneration:
160+
format: int64
161+
minimum: 0
162+
type: integer
163+
reason:
164+
maxLength: 1024
165+
minLength: 1
166+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
167+
type: string
168+
status:
169+
enum:
170+
- "True"
171+
- "False"
172+
- Unknown
173+
type: string
174+
type:
175+
maxLength: 316
176+
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
177+
type: string
178+
required:
179+
- lastTransitionTime
180+
- message
181+
- reason
182+
- status
183+
- type
184+
type: object
185+
type: array
186+
required:
187+
- conditions
188+
type: object
189+
type: object
190+
served: true
191+
storage: true
192+
subresources:
193+
status: {}
194+
status:
195+
acceptedNames:
196+
kind: ""
197+
plural: ""
198+
conditions: null
199+
storedVersions: null

0 commit comments

Comments
 (0)