Update contenthealth check alarm shinesolutions#44

mbloch1986 · May 21, 2018 · cd8fb38 · cd8fb38
1 parent af5a696
commit cd8fb38
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/com/shinesolutions/aemorchestrator/model/InstanceTags.java b/src/main/java/com/shinesolutions/aemorchestrator/model/InstanceTags.java
@@ -9,6 +9,7 @@ public enum InstanceTags {
     AEM_AUTHOR_HOST("AuthorHost"),
     SNAPSHOT_ID("SnapshotId"),
     SNAPSHOT_TYPE("SnapshotType"),
+    STACK_PREFIX("StackPrefix"),
     NAME("Name");
 
     private final String tagName;

diff --git a/src/main/java/com/shinesolutions/aemorchestrator/service/AemInstanceHelperService.java b/src/main/java/com/shinesolutions/aemorchestrator/service/AemInstanceHelperService.java
@@ -55,9 +55,6 @@ public class AemInstanceHelperService {
 
     @Value("${aws.snapshot.tags}")
     private List<String> tagsToApplyToSnapshot;
-
-    @Value("${aws.cloudformation.stackName.publishDispatcher}")
-    private String awsPublishDispatcherStackName;
 
     @Resource
     private EnvironmentValues envValues;
@@ -365,7 +362,7 @@ public void createContentHealthAlarmForPublisher(String instanceId) {
             getContentHealthCheckAlarmName(instanceId), 
             "Content Health Alarm for Publish Instance " + instanceId,
             instanceId,
-            awsPublishDispatcherStackName,
+            "AEM",
             envValues.getTopicArn());
     }
 

diff --git a/src/main/java/com/shinesolutions/aemorchestrator/service/AwsHelperService.java b/src/main/java/com/shinesolutions/aemorchestrator/service/AwsHelperService.java
@@ -288,12 +288,17 @@ public String readFileFromS3(String s3Uri) throws IOException {
      */
     public void createContentHealthCheckAlarm(String alarmName, String alarmDescription,  
         String publishInstanceId, String namespace, String topicArn) {
+        String publishStackPrefix = getTags(publishInstanceId).get(InstanceTags.STACK_PREFIX.getTagName());
+
         amazonCloudWatchClient.putMetricAlarm(new PutMetricAlarmRequest()
             .withAlarmName(alarmName)
             .withAlarmDescription(alarmDescription)
             .withDimensions(new Dimension()
                 .withName(InstanceTags.PAIR_INSTANCE_ID.getTagName())
-                .withValue(publishInstanceId))
+                .withValue(publishInstanceId),
+                new Dimension()
+                .withName(InstanceTags.STACK_PREFIX.getTagName())
+                .withValue(publishStackPrefix))
             .withMetricName("contentHealthCheck")
             .withNamespace(namespace)
             .withPeriod(60)