Merge pull request #227 from lorengordon/ssm-logs

plus3it · Jun 10, 2020 · bb68212 · bb68212
2 parents 3e1dfb6 + 4da60d0
commit bb68212
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 6 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.2
+current_version = 2.0.3
 commit = True
 message = Bumps version to {new_version}
 tag = False
@@ -20,4 +20,3 @@ replace = Version: {new_version}
 [bumpversion:file:modules/win-instance/watchmaker-win-instance.template.cfn.yaml]
 search = Version: {current_version}
 replace = Version: {new_version}
-
diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml b/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml
@@ -205,7 +205,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 2.0.2
+  Version: 2.0.3
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -690,6 +690,18 @@ Resources:
                           "files":
                           {
                             "collect_list": [
+                              {
+                                "file_path": "/var/log/amazon/ssm/amazon-ssm-agent.log",
+                                "log_group_name": "/aws/ec2/lx/${AWS::StackName}",
+                                "log_stream_name": "{instance_id}//var/log/amazon/ssm/amazon-ssm-agent.log",
+                                "timestamp_format": "%H:%M:%S %y %b %-d"
+                              },
+                              {
+                                "file_path": "/var/log/amazon/ssm/errors.log",
+                                "log_group_name": "/aws/ec2/lx/${AWS::StackName}",
+                                "log_stream_name": "{instance_id}//var/log/amazon/ssm/errors.log",
+                                "timestamp_format": "%H:%M:%S %y %b %-d"
+                              },
                               {
                                 "file_path": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log",
                                 "log_group_name": "/aws/ec2/lx/${AWS::StackName}",

diff --git a/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml b/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml
@@ -156,7 +156,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 2.0.2
+  Version: 2.0.3
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -503,6 +503,18 @@ Resources:
                           "files":
                           {
                             "collect_list": [
+                              {
+                                "file_path": "/var/log/amazon/ssm/amazon-ssm-agent.log",
+                                "log_group_name": "/aws/ec2/lx/${AWS::StackName}",
+                                "log_stream_name": "{instance_id}//var/log/amazon/ssm/amazon-ssm-agent.log",
+                                "timestamp_format": "%H:%M:%S %y %b %-d"
+                              },
+                              {
+                                "file_path": "/var/log/amazon/ssm/errors.log",
+                                "log_group_name": "/aws/ec2/lx/${AWS::StackName}",
+                                "log_stream_name": "{instance_id}//var/log/amazon/ssm/errors.log",
+                                "timestamp_format": "%H:%M:%S %y %b %-d"
+                              },
                               {
                                 "file_path": "/opt/aws/amazon-cloudwatch-agent/logs/amazon-cloudwatch-agent.log",
                                 "log_group_name": "/aws/ec2/lx/${AWS::StackName}",

diff --git a/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml b/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml
@@ -192,7 +192,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 2.0.2
+  Version: 2.0.3
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -680,6 +680,30 @@ Resources:
                       "logs_collected": {
                         "files": {
                           "collect_list": [
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\AmazonSSMAgent-update.txt",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/AmazonSSMAgent-update.txt",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\errors.txt",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/errors.txt",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\amazon-ssm-agent.log",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/amazon-ssm-agent.log",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\amazon-ssm-cloudwatch.log",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/amazon-ssm-cloudwatch.log",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
                             {
                               "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log",
                               "log_group_name": "/aws/ec2/win/${AWS::StackName}",

diff --git a/modules/win-instance/watchmaker-win-instance.template.cfn.yaml b/modules/win-instance/watchmaker-win-instance.template.cfn.yaml
@@ -141,7 +141,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 2.0.2
+  Version: 2.0.3
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -489,6 +489,30 @@ Resources:
                       "logs_collected": {
                         "files": {
                           "collect_list": [
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\AmazonSSMAgent-update.txt",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/AmazonSSMAgent-update.txt",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\errors.txt",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/errors.txt",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\amazon-ssm-agent.log",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/amazon-ssm-agent.log",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\ProgramData\\Amazon\\SSM\\Logs\\amazon-ssm-cloudwatch.log",
+                              "log_group_name": "/aws/ec2/win/${AWS::StackName}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/SSM/Logs/amazon-ssm-cloudwatch.log",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
                             {
                               "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log",
                               "log_group_name": "/aws/ec2/win/${AWS::StackName}",