merging

Azure · Mar 25, 2024 · 891914b · 891914b
2 parents fbcdfe9 + f17bdc7
commit 891914b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/deploy_managed_infra/grafana_dashboard_templates/Cluster_View.json b/deploy_managed_infra/grafana_dashboard_templates/Cluster_View.json
@@ -1924,7 +1924,5 @@
   },
   "timezone": "utc",
   "title": "Cluster Unified View (Experimental)",
-  "uid": "e12394be-6c26-4c19-a089-f69930b17e7e",
-  "version": 75,
   "weekStart": ""
 }
diff --git a/deploy_managed_infra/grafana_dashboard_templates/GPU_View.json b/deploy_managed_infra/grafana_dashboard_templates/GPU_View.json
@@ -2148,7 +2148,5 @@
   },
   "timezone": "utc",
   "title": "GPU View",
-  "uid": "dHpbWBP4z",
-  "version": 43,
   "weekStart": ""
 }
diff --git a/deploy_managed_infra/grafana_dashboard_templates/Network_View.json b/deploy_managed_infra/grafana_dashboard_templates/Network_View.json
@@ -1239,7 +1239,5 @@
   },
   "timezone": "utc",
   "title": "Network View",
-  "uid": "IziFPI8Vk",
-  "version": 16,
   "weekStart": ""
 }
diff --git a/deploy_managed_infra/grafana_dashboard_templates/Node_View.json b/deploy_managed_infra/grafana_dashboard_templates/Node_View.json
@@ -1049,7 +1049,5 @@
   },
   "timezone": "utc",
   "title": "Node View",
-  "uid": "DBUc8IU4k",
-  "version": 19,
   "weekStart": ""
 }
diff --git a/src/worker/install/install.sh b/src/worker/install/install.sh
@@ -37,10 +37,12 @@ then
         # Install open telemetry related packages
         python3 -m pip -qqq install opentelemetry-sdk opentelemetry-exporter-otlp
 
-        # Pull Geneva Metrics Extension(MA) docker image
-        docker pull linuxgeneva-microsoft.azurecr.io/genevamdm:$MDM_DOCKER_VERSION
-        docker tag linuxgeneva-microsoft.azurecr.io/genevamdm:$MDM_DOCKER_VERSION genevamdm
-        docker rmi linuxgeneva-microsoft.azurecr.io/genevamdm:$MDM_DOCKER_VERSION
+        if ! sudo docker images | grep -q genevamdm ; then
+            # Pull Geneva Metrics Extension(MA) docker image
+		    docker pull linuxgeneva-microsoft.azurecr.io/genevamdm:$MDM_DOCKER_VERSION
+		    docker tag linuxgeneva-microsoft.azurecr.io/genevamdm:$MDM_DOCKER_VERSION genevamdm
+		    docker rmi linuxgeneva-microsoft.azurecr.io/genevamdm:$MDM_DOCKER_VERSION
+        fi
     elif [ $PUBLISHER_INSTALL == 'azure_monitor' ];
     then
         $(dirname "${BASH_SOURCE[0]}")/azure_monitor.sh