Merge pull request #208 from lorengordon/log-streams

Updates log stream names to more standardized pattern
plus3it · Jul 30, 2019 · b84d02b · b84d02b
2 parents c2cb8fb + e0969c1
commit b84d02b
Show file tree

Hide file tree

Showing 31 changed files with 77 additions and 59 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.3.3
+current_version = 0.3.4
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/scripts/make-guac.sh b/scripts/make-guac.sh
@@ -154,7 +154,7 @@ write_manifest()
         printf "\"translations\" : [ \"translations/en.json\" ]\n"
         printf "}\n"
     ) > "${guac_manifest}"
-    if ! ( [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]] )
+    if ! { [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]]; }
     then
         sed -i '/html/d' "${guac_manifest}"
     fi
@@ -426,7 +426,7 @@ log "Setting up the custom branding extension"
 write_manifest "${GUAC_EXT}"
 write_brand "${GUAC_EXT}"
 
-if ( [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]] )
+if [[ -n "${URL_1}" ]] || [[ -n "${URL_2}" ]]
 then
     # Add custom URLs to Guacamole login page using Guac extensions.
     write_links "${GUAC_EXT}"

diff --git a/templates/db_mssql_alwayson.template.cfn.json b/templates/db_mssql_alwayson.template.cfn.json
@@ -298,7 +298,7 @@
                 }
             }
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "MssqlNode1InstanceId": {

diff --git a/templates/db_rds_mysql_audit_plugin.element.template.cfn.json b/templates/db_rds_mysql_audit_plugin.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This template deploys a MySQL RDS instance",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "JDBCConnectionString": {

diff --git a/templates/ds_ad_primary_dc.element.template.cfn.json b/templates/ds_ad_primary_dc.element.template.cfn.json
@@ -56,7 +56,7 @@
         }
     },
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "DomainAdmin": {

diff --git a/templates/ds_ad_private_hosted_zone.element.template.cfn.json b/templates/ds_ad_private_hosted_zone.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a Route53 private hosted zone, to resolve the domain to the AD Domain Controllers via DHCP.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "HostedZoneId": {

diff --git a/templates/ds_ad_replica_dc.element.template.cfn.json b/templates/ds_ad_replica_dc.element.template.cfn.json
@@ -56,7 +56,7 @@
         }
     },
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "DomainControllerID": {

diff --git a/templates/ds_ad_security_groups.element.template.cfn.json b/templates/ds_ad_security_groups.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates 2 security groups for an Active Directory domain -- one for Domain Controllers and one for Domain Members.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "DomainControllerSGID": {

diff --git a/templates/ds_dhcp_options.element.template.cfn.json b/templates/ds_dhcp_options.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates an Active Directory domain with a single domain controller. The default Domain Administrator password will be the one retrieved from the instance.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Parameters": {
         "DomainControllerIPs": {

diff --git a/templates/ds_singleaz_ad.compound.template.cfn.json b/templates/ds_singleaz_ad.compound.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This template creates an Active Directory infrastructure in a Single AZ.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "DomainAdmin": {

diff --git a/templates/es_service_domain.element.template.cfn.json b/templates/es_service_domain.element.template.cfn.json
@@ -39,7 +39,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "DedicatedMasterCount": {

diff --git a/templates/nw_create_peer_role.element.template.cfn.json b/templates/nw_create_peer_role.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This template creates an assumable role for cross account VPC peering.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "RoleARN": {

diff --git a/templates/nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json b/templates/nw_dualaz_multitier_nat_with_eni.compound.template.cfn.json
@@ -104,7 +104,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/nw_dualaz_multitier_natgateway.compound.template.cfn.json b/templates/nw_dualaz_multitier_natgateway.compound.template.cfn.json
@@ -94,7 +94,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/nw_nat_gateway.element.template.cfn.json b/templates/nw_nat_gateway.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a NAT Gateway with an Elastic IP, Private route table with route to the NAT Gateway.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "NATGatewayElasticIP": {

diff --git a/templates/nw_nat_with_eni.element.template.cfn.json b/templates/nw_nat_with_eni.element.template.cfn.json
@@ -56,7 +56,7 @@
         }
     },
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "NATElasticNetworkInterfaceId": {

diff --git a/templates/nw_peered_sg.element.template.cfn.json b/templates/nw_peered_sg.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a Security Group to allow remote access from instances in the specified security group within the peered account.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "VpcPeerSecurityGroupId": {

diff --git a/templates/nw_private_subnet.element.template.cfn.json b/templates/nw_private_subnet.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a Private Subnet and associates it with a given Route Table.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "AvailabilityZoneName": {

diff --git a/templates/nw_public_subnet.element.template.cfn.json b/templates/nw_public_subnet.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a Public Subnet and associates it with a given Route Table.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "AvailabilityZoneName": {

diff --git a/templates/nw_r53_peered_domain.element.template.cfn.json b/templates/nw_r53_peered_domain.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a Route53 Private Hosted Zone and the associated resource records for a peered domain.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "PrivateHostedZoneId": {

diff --git a/templates/nw_singleaz_multitier_nat_with_eni.compound.template.cfn.json b/templates/nw_singleaz_multitier_nat_with_eni.compound.template.cfn.json
@@ -101,7 +101,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/nw_singleaz_multitier_natgateway.compound.template.cfn.json b/templates/nw_singleaz_multitier_natgateway.compound.template.cfn.json
@@ -92,7 +92,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/nw_tripleaz_multitier_nat_with_eni.compound.template.cfn.json b/templates/nw_tripleaz_multitier_nat_with_eni.compound.template.cfn.json
@@ -108,7 +108,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/nw_tripleaz_multitier_natgateway.compound.template.cfn.json b/templates/nw_tripleaz_multitier_natgateway.compound.template.cfn.json
@@ -96,7 +96,7 @@
                 }
             ]
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/nw_vpc_peering_connection.element.template.cfn.json b/templates/nw_vpc_peering_connection.element.template.cfn.json
@@ -52,7 +52,7 @@
     },
     "Description": "This element creates a VPC peering connection and adds the necessary route to specified route tables.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "VpcPeeringConnection": {

diff --git a/templates/nw_vpc_with_igw.element.template.cfn.json b/templates/nw_vpc_with_igw.element.template.cfn.json
@@ -2,7 +2,7 @@
     "AWSTemplateFormatVersion": "2010-09-09",
     "Description": "This element creates a VPC network with an Internet Gateway.",
     "Metadata": {
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "InternetGatewayId": {

diff --git a/templates/ra_guac_autoscale_public_alb.template.cfn.yaml b/templates/ra_guac_autoscale_public_alb.template.cfn.yaml
@@ -54,7 +54,7 @@ Mappings:
       Parameters:
         Location: 's3://app-chemistry/snippets/instance_type_map.snippet.cfn.yaml'
 Metadata:
-  Version: 0.3.3
+  Version: 0.3.4
   cfn-lint:
     config:
       ignore_checks:

diff --git a/templates/ra_rdcb_fileserver_ha.template.cfn.json b/templates/ra_rdcb_fileserver_ha.template.cfn.json
@@ -207,7 +207,7 @@
                 }
             }
         },
-        "Version": "0.3.3"
+        "Version": "0.3.4"
     },
     "Outputs": {
         "RdcbEc2InstanceId": {

diff --git a/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml b/templates/ra_rdcb_fileserver_standalone.template.cfn.yaml
@@ -71,7 +71,7 @@ Metadata:
     ParameterLabels:
       AmiNameSearchString:
         default: AMI Name Search Pattern
-  Version: 0.3.3
+  Version: 0.3.4
   cfn-lint:
     config:
       ignore_checks:
@@ -563,13 +563,19 @@ Resources:
                             {
                               "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log",
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "cloudwatch_agent_logs_{instance_id}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/AmazonCloudWatchAgent/Logs/amazon-cloudwatch-agent.log",
                               "timestamp_format": "%H:%M:%S %y %b %-d"
                             },
                             {
                               "file_path": "c:\\cfn\\log\\cfn-init.log",
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "cloudformation_init_logs_{instance_id}",
+                              "log_stream_name": "{instance_id}//c/cfn/log/cfn-init.log",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\cfn\\log\\cfn-init-cmd.log",
+                              "log_group_name": "${local_InstanceLogGroup}",
+                              "log_stream_name": "{instance_id}//c/cfn/log/cfn-init-cmd.log",
                               "timestamp_format": "%H:%M:%S %y %b %-d"
                             }
                           ]
@@ -578,37 +584,37 @@ Resources:
                           "collect_list" : [
                             {
                               "event_name": "System",
-                              "event_levels": ["WARNING","ERROR"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "Windows_System_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/System",
                               "event_format": "text"
                             },
                             {
                               "event_name": "Application",
-                              "event_levels": ["WARNING","ERROR"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "Windows_Application_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/Application",
                               "event_format": "text"
                             },
                             {
                               "event_name": "Microsoft-Rdms-UI/Operational",
-                              "event_levels": ["WARNING","ERROR", "INFORMATION"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "MS-Rdms-UI/Oper_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/MS-Rdms-UI/Operational",
                               "event_format": "text"
                             },
                             {
                               "event_name": "Microsoft-Windows-TerminalServices-SessionBroker/Operational",
-                              "event_levels": ["WARNING","ERROR", "INFORMATION"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "Microsoft-Windows-TerminalServices-SessionBroker/Operational_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/Microsoft-Windows-TerminalServices-SessionBroker/Operational",
                               "event_format": "text"
                             },
                             {
                               "event_name": "Microsoft-Rdms-UI/Admin",
-                              "event_levels": ["WARNING","ERROR", "INFORMATION"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "MS-Rdms-UI/Admin_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/MS-Rdms-UI/Admin",
                               "event_format": "text"
                             }
                           ]

diff --git a/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml b/templates/ra_rdgw_autoscale_public_lb.template.cfn.yaml
@@ -83,7 +83,7 @@ Metadata:
         default: AMI Name Search Pattern
       ScaleDownDesiredCapacity:
         default: Scale Down Desired Capacity
-  Version: 0.3.3
+  Version: 0.3.4
   cfn-lint:
     config:
       ignore_checks:
@@ -431,13 +431,19 @@ Resources:
                             {
                               "file_path": "c:\\ProgramData\\Amazon\\AmazonCloudWatchAgent\\Logs\\amazon-cloudwatch-agent.log",
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "cloudwatch_agent_logs_{instance_id}",
+                              "log_stream_name": "{instance_id}//c/ProgramData/Amazon/AmazonCloudWatchAgent/Logs/amazon-cloudwatch-agent.log",
                               "timestamp_format": "%H:%M:%S %y %b %-d"
                             },
                             {
                               "file_path": "c:\\cfn\\log\\cfn-init.log",
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "cloudformation_init_logs_{instance_id}",
+                              "log_stream_name": "{instance_id}//c/cfn/log/cfn-init.log",
+                              "timestamp_format": "%H:%M:%S %y %b %-d"
+                            },
+                            {
+                              "file_path": "c:\\cfn\\log\\cfn-init-cmd.log",
+                              "log_group_name": "${local_InstanceLogGroup}",
+                              "log_stream_name": "{instance_id}//c/cfn/log/cfn-init-cmd.log",
                               "timestamp_format": "%H:%M:%S %y %b %-d"
                             }
                           ]
@@ -446,23 +452,23 @@ Resources:
                           "collect_list" : [
                             {
                               "event_name": "System",
-                              "event_levels": ["WARNING","ERROR"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "Windows_System_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/System",
                               "event_format": "text"
                             },
                             {
                               "event_name": "Application",
-                              "event_levels": ["WARNING","ERROR"],
+                              "event_levels": ["WARNING", "ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "Windows_Application_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/Application",
                               "event_format": "text"
                             },
                             {
                               "event_name": "Microsoft-Windows-TerminalServices-Gateway/Operational",
                               "event_levels": ["WARNING","ERROR", "INFORMATION"],
                               "log_group_name": "${local_InstanceLogGroup}",
-                              "log_stream_name": "RDGW_Connections_{instance_id}",
+                              "log_stream_name": "{instance_id}//EventLog/Microsoft-Windows-TerminalServices-Gateway/Operational",
                               "event_format": "text"
                             }
                           ]