From bfeb4255a082fefcd36dbc0c41cf403fa086b264 Mon Sep 17 00:00:00 2001
From: "Pai, Radhika" <rp592h@att.com>
Date: Mon, 17 May 2021 09:04:18 -0500
Subject: [PATCH] Update Grafana version and Selenium script

This ps updates the version to 7.4.5
The css element in GUI has changed in the new Grafana version , so updated
 the selenium script to find the right element.

Change-Id: I972fddf73719fb5bef821679a5ab07491edf55ff
---
 grafana/Chart.yaml                           | 4 ++--
 grafana/templates/bin/_selenium-tests.py.tpl | 2 +-
 grafana/values.yaml                          | 2 +-
 releasenotes/notes/grafana.yaml              | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/grafana/Chart.yaml b/grafana/Chart.yaml
index b0946408a..9111000ed 100644
--- a/grafana/Chart.yaml
+++ b/grafana/Chart.yaml
@@ -12,10 +12,10 @@
 
 ---
 apiVersion: v1
-appVersion: v7.3.6
+appVersion: v7.4.5
 description: OpenStack-Helm Grafana
 name: grafana
-version: 0.1.6
+version: 0.1.7
 home: https://grafana.com/
 sources:
   - https://github.com/grafana/grafana
diff --git a/grafana/templates/bin/_selenium-tests.py.tpl b/grafana/templates/bin/_selenium-tests.py.tpl
index 550963846..080fa690d 100644
--- a/grafana/templates/bin/_selenium-tests.py.tpl
+++ b/grafana/templates/bin/_selenium-tests.py.tpl
@@ -73,7 +73,7 @@ logger.info("Attempting to log into Grafana dashboard")
 try:
     browser.find_element_by_name('user').send_keys(username)
     browser.find_element_by_name('password').send_keys(password)
-    browser.find_element_by_class_name('css-6ntnx5-button').click()
+    browser.find_element_by_css_selector('[aria-label="Login button"]').click()
     logger.info("Successfully logged in to Grafana")
 except NoSuchElementException:
     logger.error("Failed to log in to Grafana")
diff --git a/grafana/values.yaml b/grafana/values.yaml
index ac57c34e6..76cb18d33 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -17,7 +17,7 @@
 ---
 images:
   tags:
-    grafana: docker.io/grafana/grafana:7.3.6
+    grafana: docker.io/grafana/grafana:7.4.5
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     grafana_db_session_sync: docker.io/openstackhelm/heat:stein-ubuntu_bionic
diff --git a/releasenotes/notes/grafana.yaml b/releasenotes/notes/grafana.yaml
index ba1dc8f1f..00545c1ff 100644
--- a/releasenotes/notes/grafana.yaml
+++ b/releasenotes/notes/grafana.yaml
@@ -7,4 +7,5 @@ grafana:
   - 0.1.4 Enable TLS for Grafana
   - 0.1.5 Enable TLS between Grafana and Prometheus
   - 0.1.6 Enable TLS for Grafana ingress path
+  - 0.1.7 Update Grafana version and Selenium script
 ...