Updates command text and adds Outputs section

plus3it · Mar 23, 2018 · 6ea6de4 · 6ea6de4
1 parent 86cef58
commit 6ea6de4
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 8 deletions.
diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json b/modules/lx-autoscale/watchmaker-lx-autoscale.cfn.json
@@ -318,6 +318,27 @@
             }
         }
     },
+    "Outputs": {
+        "WatchmakerAutoScalingGroupId": {
+            "Description": "Autoscaling Group ID",
+            "Value": {
+                "Ref": "WatchmakerAutoScalingGroup"
+            }
+        },
+        "WatchmakerLaunchConfigId": {
+            "Description": "Launch Configuration ID",
+            "Value": {
+                "Ref": "WatchmakerLaunchConfig"
+            }
+        },
+        "WatchmakerLaunchConfigLogGroupName": {
+            "Condition": "InstallCloudWatchAgent",
+            "Description": "Log Group Name",
+            "Value": {
+                "Ref": "WatchmakerLaunchConfigLogGroup"
+            }
+        }
+    },
     "Parameters": {
         "AmiDistro": {
             "AllowedValues": [
@@ -775,11 +796,9 @@
                                             " bash -xe install.sh &&",
                                             " systemctl enable amazon-cloudwatch-agent.service &&",
                                             " systemctl start amazon-cloudwatch-agent.service &&",
-                                            " /opt/aws/amazon-cloudwatch-agent/bin/",
-                                            "amazon-cloudwatch-agent-ctl",
+                                            " /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl",
                                             " -a fetch-config -m ec2 -c",
-                                            " file:/opt/aws/amazon-cloudwatch-agent/etc/",
-                                            "amazon-cloudwatch-agent.json -s"
+                                            " file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s"
                                         ]
                                     ]
                                 },

diff --git a/modules/lx-instance/watchmaker-lx-instance.cfn.json b/modules/lx-instance/watchmaker-lx-instance.cfn.json
@@ -742,11 +742,9 @@
                                             " bash -xe install.sh &&",
                                             " systemctl enable amazon-cloudwatch-agent.service &&",
                                             " systemctl start amazon-cloudwatch-agent.service &&",
-                                            " /opt/aws/amazon-cloudwatch-agent/bin/",
-                                            "amazon-cloudwatch-agent-ctl",
+                                            " /opt/aws/amazon-cloudwatch-agent/bin/amazon-cloudwatch-agent-ctl",
                                             " -a fetch-config -m ec2 -c",
-                                            " file:/opt/aws/amazon-cloudwatch-agent/etc/",
-                                            "amazon-cloudwatch-agent.json -s"
+                                            " file:/opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json -s"
                                         ]
                                     ]
                                 },

diff --git a/modules/win-autoscale/watchmaker-win-autoscale.cfn.json b/modules/win-autoscale/watchmaker-win-autoscale.cfn.json
@@ -237,6 +237,27 @@
             }
         }
     },
+    "Outputs": {
+        "WatchmakerAutoScalingGroupId": {
+            "Description": "Autoscaling Group ID",
+            "Value": {
+                "Ref": "WatchmakerAutoScalingGroup"
+            }
+        },
+        "WatchmakerLaunchConfigId": {
+            "Description": "Launch Configuration ID",
+            "Value": {
+                "Ref": "WatchmakerLaunchConfig"
+            }
+        },
+        "WatchmakerLaunchConfigLogGroupName": {
+            "Condition": "InstallCloudWatchAgent",
+            "Description": "Log Group Name",
+            "Value": {
+                "Ref": "WatchmakerLaunchConfigLogGroup"
+            }
+        }
+    },
     "Parameters": {
         "AmiId": {
             "AllowedPattern": "^ami-[0-9a-z]{8}$|^ami-[0-9a-z]{17}$",