Skip to content

Commit

Permalink
remove the hardcoded CloudWatch Log Group Name. Thanks to @nonatofabio
Browse files Browse the repository at this point in the history
  • Loading branch information
@nicolaven
nicolaven committed Nov 16, 2020
1 parent 83c44b1 commit bc9dbce
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
24 changes: 12 additions & 12 deletions grafana/dashboards/logs.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /slurmctld/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -116,7 +116,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /slurmd/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -179,7 +179,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /sqswatcher/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -228,7 +228,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /nodewatcher/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -277,7 +277,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /jobwatcher/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -340,7 +340,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /cfn-init/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -389,7 +389,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /cloud-init/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -452,7 +452,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /supervisord/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -501,7 +501,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /system-messages/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -564,7 +564,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /dcv-authenticator/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -613,7 +613,7 @@
"expression": "fields @timestamp, @message, @logStream\n| sort @timestamp desc\n| limit 20\n| filter @logStream like /dcv-server/",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down Expand Up @@ -676,7 +676,7 @@
"expression": "fields @timestamp, @message \n| sort @timestamp desc\n| limit 20",
"id": "",
"logGroupNames": [
"/aws/parallelcluster/grafana2"
"__LOG_GROUP__NAMES__"
],
"matchExact": true,
"metricName": "",
Expand Down
20 changes: 11 additions & 9 deletions parallelcluster-setup/install-monitoring.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ case "${cfn_node_type}" in
cluster_s3_bucket=$(cat /etc/chef/dna.json | grep \"cluster_s3_bucket\" | awk '{print $2}' | sed "s/\",//g;s/\"//g")
cluster_config_s3_key=$(cat /etc/chef/dna.json | grep \"cluster_config_s3_key\" | awk '{print $2}' | sed "s/\",//g;s/\"//g")
cluster_config_version=$(cat /etc/chef/dna.json | grep \"cluster_config_version\" | awk '{print $2}' | sed "s/\",//g;s/\"//g")
log_group_names="/aws/parallelcluster/$(echo ${stack_name} | cut -d "-" -f2-)"

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

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


# replace tokens
sed -i "s/_S3_BUCKET_/${s3_bucket}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/__FSX_ID__/${cfn_fsx_fs_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/__AWS_REGION__/${cfn_region}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/_S3_BUCKET_/${s3_bucket}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/__FSX_ID__/${cfn_fsx_fs_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json
sed -i "s/__AWS_REGION__/${cfn_region}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/ParallelCluster.json

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

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

sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/master-node-details.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-list.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-details.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/master-node-details.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-list.json
sed -i "s/__INSTANCE_ID__/${master_instance_id}/g" /home/${cfn_cluster_user}/${monitoring_dir_name}/grafana/dashboards/compute-node-details.json

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

Expand Down

0 comments on commit bc9dbce

Please sign in to comment.