From 16427770e5709ed72f46a0c22ce037ccd1e63e32 Mon Sep 17 00:00:00 2001 From: Adam Cousins Date: Tue, 22 Dec 2020 22:24:31 +1100 Subject: [PATCH 1/2] fix amazon linux 2 osmajor ref --- manifests/params.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index 6fab0c6..f693b5b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -7,9 +7,10 @@ $osname = $facts['os']['name'] $osmajor = $facts['os']['release']['major'] $oslong = "${osname}${osmajor}" - + case $oslong { 'Amazon2': { $service_name = 'awslogsd' } + 'Amazon4': { $service_name = 'awslogsd' } #Amazon Linux 2 returns 4 for osmajor default: { $service_name = 'awslogs' } } $logging_config_file = '/etc/awslogs/awslogs_dot_log.conf' From f418f3f9c9851cd29a8792ec89d456c5c4f2a238 Mon Sep 17 00:00:00 2001 From: Adam Cousins Date: Tue, 22 Dec 2020 22:32:10 +1100 Subject: [PATCH 2/2] fix service name as var for amazon linux 2 --- manifests/compartment_log.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/compartment_log.pp b/manifests/compartment_log.pp index 0e765e1..49b7761 100644 --- a/manifests/compartment_log.pp +++ b/manifests/compartment_log.pp @@ -4,8 +4,9 @@ $datetime_format = '%b %d %H:%M:%S', $log_group_name = undef, $multi_line_start_pattern = undef, - + $service_name = $::cloudwatchlogs::params::service_name, ){ + if $path == undef { $log_path = $name } else { @@ -36,7 +37,7 @@ ensure_newline => true, warn => true, require => $installed_marker, - notify => Service['awslogs'], + notify => Service[$service_name], } concat::fragment { "cloudwatchlogs_fragment_${name}": target => "/etc/awslogs/config/${name}.conf",