Merge pull request #4 from amilsted/main

Recognize p-type GPU instances too!

Author: nicolaven

grafana/dashboards/gpu.json

@@ -1864,15 +1864,15 @@
           "value": "i-0edc71e97259faa4c"
         },
         "datasource": "prometheus",
-        "definition": "label_values(node_uname_info{job=~\"ec2_instances\",instance_type=~\"g[3-4].*\"}, instance_id)",
+        "definition": "label_values(node_uname_info{job=~\"ec2_instances\",instance_type=~\"[pg][2-4].*\"}, instance_id)",
         "error": null,
         "hide": 0,
         "includeAll": false,
         "label": "Instance ID",
         "multi": false,
         "name": "instance_id",
         "options": [],
-        "query": "label_values(node_uname_info{job=~\"ec2_instances\",instance_type=~\"g[3-4].*\"}, instance_id)",
+        "query": "label_values(node_uname_info{job=~\"ec2_instances\",instance_type=~\"[pg][2-4].*\"}, instance_id)",
         "refresh": 1,
         "regex": "",
         "skipUrlSync": false,

parallelcluster-setup/install-monitoring.sh

@@ -96,7 +96,7 @@ case "${cfn_node_type}" in
 
 	ComputeFleet)
 		compute_instance_type=$(ec2-metadata -t | awk '{print $2}')
-		gpu_instances="g[2-9].*\.[0-9]*[x]*large"
+		gpu_instances="[pg][2-9].*\.[0-9]*[x]*large"
 		if [[ $compute_instance_type =~ $gpu_instances ]]; then
 			distribution=$(. /etc/os-release;echo $ID$VERSION_ID)
 			curl -s -L https://nvidia.github.io/nvidia-docker/$distribution/nvidia-docker.repo | tee /etc/yum.repos.d/nvidia-docker.repo