Merge branch 'update_grafana' into 'master'

Update grafana chart to 6.2.1

See merge request openappstack/openappstack!350

flux/oas/grafana.yaml

@@ -11,7 +11,7 @@ spec:
   chart:
     repository: https://grafana.github.io/helm-charts
     name: grafana
-    version: 5.1.4
+    version: 6.2.1
   valuesFrom:
     - secretKeyRef:
         name: grafana-settings

test/behave/features/grafana.feature

@@ -14,6 +14,6 @@ Scenario: Login to grafana
   Given the element "//input[@name='user']" is visible
   When I enter the "grafana" "username" in the inputfield "//input[@name='user']"
   And I enter the "grafana" "password" in the inputfield "//input[@name='password']"
-  And I click on the button "//div[@id='login-view']//button[@aria-label='Login button']"
+  And I click on the button "//button[@aria-label='Login button']"
   Then I wait on element "sidemenu.sidemenu" for 60000ms to be visible
   And I expect that the path is "/"