Skip to content

Commit bc9dbce

Browse files
nicolavennicolaven
committed
remove the hardcoded CloudWatch Log Group Name. Thanks to @nonatofabio 
1 parent 83c44b1 commit bc9dbce

File tree

2 files changed

+23
-21
lines changed

2 files changed

+23
-21
lines changed

‎grafana/dashboards/logs.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /slurmctld/",
6868
"id": "",
6969
"logGroupNames": [
70-
"/aws/parallelcluster/grafana2"
70+
"__LOG_GROUP__NAMES__"
7171
],
7272
"matchExact": true,
7373
"metricName": "",
@@ -116,7 +116,7 @@
116116
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /slurmd/",
117117
"id": "",
118118
"logGroupNames": [
119-
"/aws/parallelcluster/grafana2"
119+
"__LOG_GROUP__NAMES__"
120120
],
121121
"matchExact": true,
122122
"metricName": "",
@@ -179,7 +179,7 @@
179179
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /sqswatcher/",
180180
"id": "",
181181
"logGroupNames": [
182-
"/aws/parallelcluster/grafana2"
182+
"__LOG_GROUP__NAMES__"
183183
],
184184
"matchExact": true,
185185
"metricName": "",
@@ -228,7 +228,7 @@
228228
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /nodewatcher/",
229229
"id": "",
230230
"logGroupNames": [
231-
"/aws/parallelcluster/grafana2"
231+
"__LOG_GROUP__NAMES__"
232232
],
233233
"matchExact": true,
234234
"metricName": "",
@@ -277,7 +277,7 @@
277277
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /jobwatcher/",
278278
"id": "",
279279
"logGroupNames": [
280-
"/aws/parallelcluster/grafana2"
280+
"__LOG_GROUP__NAMES__"
281281
],
282282
"matchExact": true,
283283
"metricName": "",
@@ -340,7 +340,7 @@
340340
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /cfn-init/",
341341
"id": "",
342342
"logGroupNames": [
343-
"/aws/parallelcluster/grafana2"
343+
"__LOG_GROUP__NAMES__"
344344
],
345345
"matchExact": true,
346346
"metricName": "",
@@ -389,7 +389,7 @@
389389
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /cloud-init/",
390390
"id": "",
391391
"logGroupNames": [
392-
"/aws/parallelcluster/grafana2"
392+
"__LOG_GROUP__NAMES__"
393393
],
394394
"matchExact": true,
395395
"metricName": "",
@@ -452,7 +452,7 @@
452452
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /supervisord/",
453453
"id": "",
454454
"logGroupNames": [
455-
"/aws/parallelcluster/grafana2"
455+
"__LOG_GROUP__NAMES__"
456456
],
457457
"matchExact": true,
458458
"metricName": "",
@@ -501,7 +501,7 @@
501501
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /system-messages/",
502502
"id": "",
503503
"logGroupNames": [
504-
"/aws/parallelcluster/grafana2"
504+
"__LOG_GROUP__NAMES__"
505505
],
506506
"matchExact": true,
507507
"metricName": "",
@@ -564,7 +564,7 @@
564564
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /dcv-authenticator/",
565565
"id": "",
566566
"logGroupNames": [
567-
"/aws/parallelcluster/grafana2"
567+
"__LOG_GROUP__NAMES__"
568568
],
569569
"matchExact": true,
570570
"metricName": "",
@@ -613,7 +613,7 @@
613613
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /dcv-server/",
614614
"id": "",
615615
"logGroupNames": [
616-
"/aws/parallelcluster/grafana2"
616+
"__LOG_GROUP__NAMES__"
617617
],
618618
"matchExact": true,
619619
"metricName": "",
@@ -676,7 +676,7 @@
676676
"expression": "fields @timestamp, @message \n| sort @timestamp desc\n| limit 20",
677677
"id": "",
678678
"logGroupNames": [
679-
"/aws/parallelcluster/grafana2"
679+
"__LOG_GROUP__NAMES__"
680680
],
681681
"matchExact": true,
682682
"metricName": "",

‎parallelcluster-setup/install-monitoring.sh‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ case "${cfn_node_type}" in
3535
cluster_s3_bucket=$(cat /etc/chef/dna.json | grep \"cluster_s3_bucket\" | awk '{print $2}' | sed "s/\",//g;s/\"//g")
3636
cluster_config_s3_key=$(cat /etc/chef/dna.json | grep \"cluster_config_s3_key\" | awk '{print $2}' | sed "s/\",//g;s/\"//g")
3737
cluster_config_version=$(cat /etc/chef/dna.json | grep \"cluster_config_version\" | awk '{print $2}' | sed "s/\",//g;s/\"//g")
38+
log_group_names="/aws/parallelcluster/$(echo ${stack_name} | cut -d "-" -f2-)"
3839

3940
aws s3api get-object --bucket $cluster_s3_bucket --key $cluster_config_s3_key --region $cfn_region --version-id $cluster_config_version /home/${cfn_cluster_user}/${monitoring_dir_name}/parallelcluster-setup/cluster-config.json
4041

@@ -51,18 +52,19 @@ case "${cfn_node_type}" in
5152

5253

5354
# replace tokens
54-
sed -i "s/_S3_BUCKET_/${s3_bucket}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
55-
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
56-
sed -i "s/__FSX_ID__/${cfn_fsx_fs_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
57-
sed -i "s/__AWS_REGION__/${cfn_region}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
55+
sed -i "s/_S3_BUCKET_/${s3_bucket}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
56+
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
57+
sed -i "s/__FSX_ID__/${cfn_fsx_fs_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
58+
sed -i "s/__AWS_REGION__/${cfn_region}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
5859

59-
sed -i "s/__AWS_REGION__/${cfn_region}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/logs.json
60+
sed -i "s/__AWS_REGION__/${cfn_region}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/logs.json
61+
sed -i "s/__LOG_GROUP__NAMES__/${log_group_names}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/logs.json
6062

61-
sed -i "s/__Application__/${stack_name}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/prometheus/prometheus.yml
63+
sed -i "s/__Application__/${stack_name}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/prometheus/prometheus.yml
6264

63-
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/master-node-details.json
64-
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-list.json
65-
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-details.json
65+
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/master-node-details.json
66+
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-list.json
67+
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-details.json
6668

6769
sed -i "s/__MONITORING_DIR__/${monitoring_dir_name}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/docker-compose/docker-compose.master.yml
6870

0 commit comments

Comments
 (0)