Merge pull request #149 from Vinci-C/master

BUG: Amended environment variables GRAFANA with GF

README.md

@@ -61,6 +61,12 @@ This script is used to benchmark the GPU performance of a machine. It is based o
 The script is designed to be run on a machine with a GPU, and will run with the specified number of GPUs (default 1).
 [More Here](gpu_benchmark/)
 
+## grafana_monitoring
+
+This script is used to deploy a grafana container using a docker container, with Iris IAM login included and connection to database.
+The env.sh file should be configured before running.
+[Move Here](grafana_monitoring/)
+
 ## iris casttools
 
 Scripts for collecting metrics for cloud energy collection to be displayed using monitoring softwares.

grafana_monitoring/compose.yaml

@@ -21,8 +21,8 @@ services:
       - PROD_OPENSEARCH_PASSWORD=$PROD_OPENSEARCH_PASSWORD
       - PROD_INFLUX_DB_URL=$PROD_INFLUX_DB_URL
       - PROD_OPENSEARCH_URL=$PROD_OPENSEARCH_URL
-      - GRAFANA_DOMAIN_NAME=$GRAFANA_DOMAIN_NAME
-      - GRAFANA_ROOT_URL=$GRAFANA_ROOT_URL
+      - GF_SERVER_DOMAIN_NAME=$GRAFANA_DOMAIN_NAME
+      - GF_SERVER_ROOT_URL=$GRAFANA_ROOT_URL
     volumes:
       - ./cloud_datasource.yaml:/etc/grafana/provisioning/datasources/cloud_datasource.yaml
       - ./cloud-grafana-dashboards/:/etc/grafana/provisioning/dashboards