Merge branch '347-update-prometheus' into 'master'

Resolve "update prometheus"

Closes #347

See merge request openappstack/openappstack!108

ansible/group_vars/all/oas.yml

@@ -60,3 +60,6 @@ cert_manager:
   # the helm chart. See https://hub.helm.sh/charts/jetstack/cert-manager for
   # details
   crd_version: '0.9'
+
+prometheus:
+  crd_version: 'v0.34.0'

ansible/roles/apps/tasks/prometheus.yml

@@ -4,8 +4,7 @@
   tags:
     - helmfile
     - prometheus
-  # NOTE: Change the commit hash in the URL when upgrading Prometheus
-  command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/v0.31.1/example/prometheus-operator-crd/{{ item }}'
+  command: '/snap/bin/kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/{{ prometheus.crd_version }}/example/prometheus-operator-crd/{{ item }}'
   loop:
     - alertmanager.crd.yaml
     - prometheus.crd.yaml
@@ -32,7 +31,7 @@
     recurse: true
   when: prometheus_pv_name.stdout
 
-- name: Install prometheus and graphana
+- name: Install prometheus and grafana
   include_role:
     name: "helmfile"
     tasks_from: "apply"
@@ -43,7 +42,7 @@
       environment:
         - GRAFANA_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
   tags:
-    - monitoring
+    - helmfile
     - prometheus
   vars:
       helmfile: '15-monitoring'

helmfiles/helmfile.d/15-monitoring.yaml

@@ -7,9 +7,9 @@ releases:
   - name: "oas-{{ .Environment.Values.releaseName }}-prometheus"
     namespace: "oas"
     chart: "stable/prometheus-operator"
-    # NOTE: If you change this version, also change the commit hash in
-    # ansible/roles/apps/tasks/helmfiles.yml:34
-    version: 5.15.0
+    # NOTE: If you change this version, also update the crd_version number in
+    # ansible/group_vars/all/oas.yml
+    version: "7.4.0"
     values:
     - "../values/prometheus.yaml.gotmpl"
     - "/etc/OpenAppStack/values/apps/prometheus.yaml.gotmpl"

test/behave/features/grafana.feature

@@ -5,12 +5,12 @@ Feature: Test grafana admin login
 
 Scenario: Open grafana
   When I open the grafana URL
-  Then I wait on element "//input[@name='username']" for 25000ms to be visible
+  Then I wait on element "//input[@name='user']" for 25000ms to be visible
   And I expect that element "#inputPassword" is visible
 
 Scenario: Login to grafana
-  Given the element "//input[@name='username']" is visible
-  When I enter the "grafana" "username" in the inputfield "//input[@name='username']"
+  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 "#inputPassword"
   And I click on the button "//div[@id='login-view']//button[@type='submit']"
   Then I wait on element "/html/body/grafana-app/sidemenu/a" for 25000ms to be visible