openstack/openstack-helm-infra
Code Issues Proposed changes

[Update] Grafana: add home dashboard script

Browse Source 
Adding a loop to wait for the grafana dashboard to be up and contain the
OSH Home dashboard before running the script.
This should resolve the job completing before the OSH Home dashboard is
in the grafana pod.

Change-Id: I7ab20fad3ce7f7216e2b2679d863f02f97ef1ff4
This commit is contained in:
Radhika Pai 2020-03-11 15:49:40 -05:00
parent e60437bc9d
commit 20aad64409
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
grafana/templates/bin/_add-home-dashboard.sh.tpl
View File

@ -15,15 +15,25 @@
# under the License.
set -xe
home_dashboard_id=[]
counter=0
home_dashboard_id=$(curl -K- <<< "--user ${GF_SECURITY_ADMIN_USER}:${GF_SECURITY_ADMIN_PASSWORD}" -XGET "${GRAFANA_URI}api/search?query=OSH%20Home" | sed 's/\[{.id":"*\([0-9a-zA-Z]*\)*,*.*}[]]/\1/')
#Loop until home_dashboard_id value is not null. If null sleep for 15s. Retry for 5 times.
until [ $home_dashboard_id != "[]" ]
do
echo "Waiting for Home Dashboard to load in Grafana"
sleep 15s
home_dashboard_id=$(curl -K- <<< "--user ${GF_SECURITY_ADMIN_USER}:${GF_SECURITY_ADMIN_PASSWORD}" -XGET "${GRAFANA_URI}api/search?query=OSH%20Home" | sed 's/\[{.id":"*\([0-9a-zA-Z]*\)*,*.*}[]]/\1/')
echo $home_dashboard_id
if [ $counter -ge 5 ]; then
echo "Exiting.. Exceeded the wait."
break
fi
counter=$((counter + 1));
done
echo $home_dashboard_id
if [ $home_dashboard_id == "[]" ]
if [ $home_dashboard_id != "[]" ]
then
echo "Failed. Verify Home Dashboard is present in Grafana"
else
#Set Customized Home Dashboard id as Org preference
curl -K- <<< "--user ${GF_SECURITY_ADMIN_USER}:${GF_SECURITY_ADMIN_PASSWORD}" \
-XPUT "${GRAFANA_URI}api/org/preferences" -H "Content-Type: application/json" \