Merge pull request #68 from integr8ly/update-grafana-1.2.0

update to grafana operator v1.2.0

Author: pb82

Makefile

@@ -3,7 +3,7 @@ NAMESPACE ?= application-monitoring
 PROJECT ?= application-monitoring-operator
 REG=quay.io
 SHELL=/bin/bash
-TAG ?= 0.0.18
+TAG ?= 0.0.19
 PKG=github.com/integr8ly/application-monitoring-operator
 TEST_DIRS?=$(shell sh -c "find $(TOP_SRC_DIRS) -name \\*_test.go -exec dirname {} \\; | sort | uniq")
 TEST_POD_NAME=application-monitoring-operator-test

deploy/operator.yaml

@@ -15,7 +15,7 @@ spec:
       serviceAccountName: application-monitoring-operator
       containers:
         - name: application-monitoring-operator
-          image: quay.io/integreatly/application-monitoring-operator:0.0.18
+          image: quay.io/integreatly/application-monitoring-operator:0.0.19
           ports:
             - containerPort: 60000
               name: metrics

pkg/controller/applicationmonitoring/templateHelper.go

@@ -94,7 +94,7 @@ func newTemplateHelper(cr *applicationmonitoring.ApplicationMonitoring, extraPar
 		GrafanaCrName:                  GrafanaCrName,
 		GrafanaOperatorRoleBindingName: GrafanaOperatorRoleBindingName,
 		GrafanaOperatorRoleName:        GrafanaOperatorRoleName,
-		GrafanaImage:                   "quay.io/integreatly/grafana-operator:v1.1.1",
+		GrafanaImage:                   "quay.io/integreatly/grafana-operator:v1.2.0",
 		GrafanaProxySecretName:         GrafanaProxySecretName,
 		GrafanaServiceName:             GrafanaServiceName,
 		GrafanaRouteName:               GrafanaRouteName,

templates/grafana-datasource.yaml

@@ -13,4 +13,5 @@ spec:
       isDefault: true
       version: 1
       editable: true
-      jsonData: '{"timeInterval": "5s"}'
+      jsonData:
+        timeInterval: "5s"

templates/grafana.yaml

@@ -4,11 +4,17 @@ metadata:
   name: {{ .GrafanaCrName }}
   namespace: {{ .Namespace }}
 spec:
-  logLevel: "error"
-  basicAuth: False
-  disableLoginForm: False
-  disableSignoutMenu: True
-  anonymous: True
+  config:
+    log:
+      mode: "console"
+      level: "warn"
+    auth:
+      disable_login_form: False
+      disable_signout_menu: True
+    auth.basic:
+      enabled: False
+    auth.anonymous:
+      enabled: True
   containers:
     - args:
         - '-provider=openshift'

version/version.go

@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.18"
+	Version = "0.0.19"
 )