Skip to content
This repository was archived by the owner on Apr 19, 2023. It is now read-only.

Commit a473053

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #134 from integr8ly/bump-grafana-3.3.0
update grafana operator to v3.3.0
2 parents 20b465e + 3c4a834 commit a473053

11 files changed

+664
-10
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ COMPILE_TARGET=./tmp/_output/bin/$(PROJECT)
1414
PROMETHEUS_OPERATOR_VERSION=v0.34.0
1515
LOCAL=local
1616
GRAFANA_OPERATOR_VERSION=v3.2.0
17-
AMO_VERSION=1.1.5
18-
PREV_AMO_VERSION=1.1.4
17+
AMO_VERSION=1.1.6
18+
PREV_AMO_VERSION=1.1.5
1919

2020
AUTH_TOKEN=$(shell curl -sH "Content-Type: application/json" -XPOST https://quay.io/cnr/api/v1/users/login -d '{"user": {"username": "$(QUAY_USERNAME)", "password": "${QUAY_PASSWORD}"}}' | jq -r '.token')
2121

‎deploy/olm-catalog/application-monitoring-operator/1.1.5/application-monitoring-operator.v1.1.5.clusterserviceversion.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ metadata:
55
capabilities: Basic Install
66
categories: Monitoring stack
77
certified: "false"
8-
containerImage: quay.io/integreatly/application-monitoring-operator:v1.1.5
8+
containerImage: quay.io/integreatly/application-monitoring-operator:v1.1.6
99
createdAt: "2019-09-26 10:51:00"
1010
description: Operator managed and installs Prometheus, Alertmanager, Grafana
1111
support: Red Hat, Inc.
12-
name: application-monitoring-operator.v1.1.5
12+
name: application-monitoring-operator.v1.1.6
1313
namespace: placeholder
1414
spec:
1515
apiservicedefinitions: {}
@@ -228,7 +228,7 @@ spec:
228228
fieldPath: metadata.name
229229
- name: OPERATOR_NAME
230230
value: application-monitoring-operator
231-
image: quay.io/integreatly/application-monitoring-operator:v1.1.5
231+
image: quay.io/integreatly/application-monitoring-operator:v1.1.6
232232
imagePullPolicy: Always
233233
name: application-monitoring-operator
234234
ports:
@@ -356,5 +356,5 @@ spec:
356356
maturity: alpha
357357
provider:
358358
name: Red Hat
359-
replaces: application-monitoring-operator.v1.1.4
360-
version: 1.1.5
359+
replaces: application-monitoring-operator.v1.1.5
360+
version: 1.1.6

‎deploy/olm-catalog/application-monitoring-operator/1.1.6/application-monitoring-operator.v1.1.6.clusterserviceversion.yaml‎

Lines changed: 360 additions & 0 deletions
Large diffs are not rendered by default.

‎deploy/olm-catalog/application-monitoring-operator/1.1.6/applicationmonitoring.integreatly.org_applicationmonitorings_crd.yaml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: applicationmonitorings.applicationmonitoring.integreatly.org
5+
spec:
6+
group: applicationmonitoring.integreatly.org
7+
names:
8+
kind: ApplicationMonitoring
9+
listKind: ApplicationMonitoringList
10+
plural: applicationmonitorings
11+
singular: applicationmonitoring
12+
scope: Namespaced
13+
version: v1alpha1
14+
validation:
15+
openAPIV3Schema:
16+
required: ["spec"]
17+
properties:
18+
spec:
19+
required: ["labelSelector"]
20+
properties:
21+
labelSelector:
22+
type: string
23+
minimum: 1
24+
description: The selector used by the Prometheus and Grafana Operators to discover resources
25+
additionalScrapeConfigSecretName:
26+
type: string
27+
description: The name of the secret from which additional scrape configs will be passed to the prometheus operator
28+
additionalScrapeConfigSecretKey:
29+
type: string
30+
description: The key under which additional scrape configs are stored within the secret
31+
prometheusRetention:
32+
type: string
33+
description: Retention time for prometheus data. See https://prometheus.io/docs/prometheus/latest/storage/
34+
prometheusStorageRequest:
35+
type: string
36+
description: How much storage to assign to a volume claim for persisting Prometheus data. See https://github.com/coreos/prometheus-operator/blob/ca400fdc3edd0af0df896a338eca270e115b74d7/Documentation/api.md#storagespec
37+
prometheusInstanceNamespaces:
38+
type: string
39+
description: The list of namespaces to watch for prometheus custom resources
40+
alertmanagerInstanceNamespaces:
41+
type: string
42+
description: The list of namespaces to watch for alertmanager custom resources

‎deploy/olm-catalog/application-monitoring-operator/1.1.6/applicationmonitoring.integreatly.org_blackboxtargets_crd.yaml‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: blackboxtargets.applicationmonitoring.integreatly.org
5+
spec:
6+
group: applicationmonitoring.integreatly.org
7+
names:
8+
kind: BlackboxTarget
9+
listKind: BlackboxTargetList
10+
plural: blackboxtargets
11+
singular: blackboxtarget
12+
scope: Namespaced
13+
validation:
14+
openAPIV3Schema:
15+
properties:
16+
apiVersion:
17+
description: 'APIVersion defines the versioned schema of this representation
18+
of an object. Servers should convert recognized schemas to the latest
19+
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources'
20+
type: string
21+
kind:
22+
description: 'Kind is a string value representing the REST resource this
23+
object represents. Servers may infer this from the endpoint the client
24+
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#types-kinds'
25+
type: string
26+
metadata:
27+
type: object
28+
spec:
29+
properties:
30+
blackboxTargets:
31+
description: 'Defines an endpoint which can be probed using the Prometheus Blackbox exporter'
32+
items:
33+
properties:
34+
module:
35+
type: string
36+
service:
37+
type: string
38+
url:
39+
type: string
40+
required:
41+
- url
42+
- service
43+
- module
44+
type: object
45+
type: array
46+
type: object
47+
status:
48+
properties:
49+
phase:
50+
description: 'The field phase is a status field indicating which phase the controller is with regards to reconciling blackbox target resources.'
51+
format: int64
52+
type: integer
53+
required:
54+
- phase
55+
type: object
56+
version: v1alpha1
57+
versions:
58+
- name: v1alpha1
59+
served: true
60+
storage: true

‎deploy/olm-catalog/application-monitoring-operator/1.1.6/grafana_crd.yaml‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: grafanas.integreatly.org
5+
spec:
6+
group: integreatly.org
7+
names:
8+
kind: Grafana
9+
listKind: GrafanaList
10+
plural: grafanas
11+
singular: grafana
12+
scope: Namespaced
13+
subresources:
14+
status: {}
15+
version: v1alpha1
16+
validation:
17+
openAPIV3Schema:
18+
required: ["spec"]
19+
properties:
20+
spec:
21+
properties:
22+
containers:
23+
type: array
24+
items:
25+
type: object
26+
description: Additional container to add to the grafana pod
27+
secrets:
28+
type: array
29+
items:
30+
type: string
31+
description: Secret to be mounted as volume into the grafana deployment
32+
configMaps:
33+
type: array
34+
items:
35+
type: string
36+
description: Config map to be mounted as volume into the grafana deployment
37+
logLevel:
38+
type: string
39+
description: Log level of the grafana instance, defaults to info
40+
adminUser:
41+
type: string
42+
description: Default admin user name
43+
adminPassword:
44+
type: string
45+
description: Default admin password
46+
basicAuth:
47+
type: boolean
48+
description: Basic auth enabled
49+
disableLoginForm:
50+
type: boolean
51+
description: Disable login form
52+
disableSignoutMenu:
53+
type: boolean
54+
description: Disable signout menu
55+
anonymous:
56+
type: boolean
57+
description: Anonymous auth enabled
58+
config:
59+
type: object
60+
description: Grafana config
61+
ingress:
62+
type: object
63+
properties:
64+
enabled:
65+
type: boolean
66+
description: Create an ingress / route
67+
path:
68+
type: string
69+
description: Ingress path
70+
hostname:
71+
type: string
72+
description: The hostname of the ingress / route
73+
annotations:
74+
type: object
75+
description: Additional annotations for the ingress / route
76+
labels:
77+
type: object
78+
description: Additional labels for the ingress / route
79+
targetPort:
80+
type: string
81+
description: Override port to target in the grafana service
82+
service:
83+
type: object
84+
properties:
85+
ports:
86+
type: array
87+
description: Override default ports
88+
items:
89+
type: object
90+
descripton: A port to add to the grafana service
91+
annotations:
92+
type: object
93+
description: Additional annotations for the service
94+
labels:
95+
type: object
96+
description: Additional labels for the service
97+
type:
98+
type: string
99+
description: Service type (NodePort, ClusterIP or LoadBalancer)
100+
deployment:
101+
type: object
102+
properties:
103+
annotations:
104+
type: object
105+
description: Additional annotations for the service
106+
labels:
107+
type: object
108+
description: Additional labels for the service
109+
serviceAccount:
110+
type: object
111+
properties:
112+
annotations:
113+
type: object
114+
description: Additional annotations for the serviceaccount
115+
labels:
116+
type: object
117+
description: Additional labels for the serviceaccount
118+
client:
119+
type: object
120+
description: Grafana client settings
121+
compat:
122+
type: object
123+
description: Backwards compatibility switches
124+
dashboardLabelSelectors:
125+
type: array
126+
items:
127+
type: object
128+
description: Label selector or match expressions

‎deploy/olm-catalog/application-monitoring-operator/1.1.6/grafana_dashboard_crd.yaml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: grafanadashboards.integreatly.org
5+
spec:
6+
group: integreatly.org
7+
names:
8+
kind: GrafanaDashboard
9+
listKind: GrafanaDashboardList
10+
plural: grafanadashboards
11+
singular: grafanadashboard
12+
scope: Namespaced
13+
subresources:
14+
status: {}
15+
version: v1alpha1
16+
validation:
17+
openAPIV3Schema:
18+
properties:
19+
spec:
20+
properties:
21+
name:
22+
type: string
23+
json:
24+
type: string
25+
plugins:
26+
type: array
27+
items:
28+
description: Grafana Plugin Object
29+
type: object

‎deploy/olm-catalog/application-monitoring-operator/1.1.6/grafana_datasource_crd.yaml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
apiVersion: apiextensions.k8s.io/v1beta1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
name: grafanadatasources.integreatly.org
5+
spec:
6+
group: integreatly.org
7+
names:
8+
kind: GrafanaDataSource
9+
listKind: GrafanaDataSourceList
10+
plural: grafanadatasources
11+
singular: grafanadatasource
12+
scope: Namespaced
13+
subresources:
14+
status: {}
15+
version: v1alpha1
16+
validation:
17+
openAPIV3Schema:
18+
properties:
19+
apiVersion:
20+
type: string
21+
kind:
22+
type: string
23+
metadata:
24+
type: object
25+
spec:
26+
required: ["datasources", "name"]
27+
properties:
28+
name:
29+
type: string
30+
minimum: 1
31+
datasources:
32+
type: array
33+
items:
34+
description: Grafana Datasource Object
35+
type: object

‎deploy/olm-catalog/application-monitoring-operator/application-monitoring-operator.package.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
channels:
2-
- currentCSV: application-monitoring-operator.v1.1.5
2+
- currentCSV: application-monitoring-operator.v1.1.6
33
name: integreatly
44
defaultChannel: integreatly
55
packageName: application-monitoring-operator

‎pkg/controller/applicationmonitoring/templateHelper.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
143143
ImageGrafana: "quay.io/openshift/origin-grafana",
144144
ImageTagGrafana: "4.2",
145145
ImageGrafanaOperator: "quay.io/integreatly/grafana-operator",
146-
ImageTagGrafanaOperator: "v3.2.0",
146+
ImageTagGrafanaOperator: "v3.3.0",
147147
ImageConfigMapReloader: "quay.io/openshift/origin-configmap-reloader",
148148
ImageTagConfigMapReloader: "4.2",
149149
ImagePrometheusConfigReloader: "quay.io/openshift/origin-prometheus-config-reloader",

0 commit comments

Comments
 (0)