Merge pull request #26 from aws-samples/region-fix

Add region to ec2_instance exporter

Author: nicolaven

parallelcluster-setup/install-monitoring.sh

@@ -63,6 +63,7 @@ case "${cfn_node_type}" in
 		sed -i "s/__LOG_GROUP__NAMES__/${log_group_names}/g"    ${monitoring_home}/grafana/dashboards/logs.json
 
 		sed -i "s/__Application__/${stack_name}/g"          	${monitoring_home}/prometheus/prometheus.yml
+		sed -i "s/__AWS_REGION__/${cfn_region}/g"          		${monitoring_home}/prometheus/prometheus.yml
 
 		sed -i "s/__INSTANCE_ID__/${master_instance_id}/g"  	${monitoring_home}/grafana/dashboards/master-node-details.json
 		sed -i "s/__INSTANCE_ID__/${master_instance_id}/g"  	${monitoring_home}/grafana/dashboards/compute-node-list.json

parallelcluster-setup/pcluster.yaml

@@ -41,6 +41,20 @@ Scheduling:
         LocalStorage:
           RootVolume:
             VolumeType: gp3
+      CustomActions:
+        OnNodeConfigured:
+          Script: https://raw.githubusercontent.com/aws-samples/aws-parallelcluster-monitoring/main/post-install.sh
+          Args:
+            - https://github.com/aws-samples/aws-parallelcluster-monitoring/tarball/main
+            - aws-parallelcluster-monitoring
+            - install-monitoring.sh
+      Iam:
+        AdditionalIamPolicies:
+          - Policy: arn:aws:iam::aws:policy/AmazonSSMManagedInstanceCore
+          - Policy: arn:aws:iam::aws:policy/CloudWatchFullAccess
+          - Policy: arn:aws:iam::aws:policy/AWSPriceListServiceFullAccess
+          - Policy: arn:aws:iam::aws:policy/AmazonSSMFullAccess
+          - Policy: arn:aws:iam::aws:policy/AWSCloudFormationReadOnlyAccess
 Region: us-east-2
 Image:
   Os: alinux2

prometheus/prometheus.yml

@@ -27,8 +27,10 @@ scrape_configs:
     scrape_interval: 5s
     ec2_sd_configs:
       - port: 9100
+        region: __AWS_REGION__
         refresh_interval: 10s
       - port: 9400
+        region: __AWS_REGION__
         refresh_interval: 10s
         filters:
           - name: instance-state-name