From 95e263b1a1742c0b211f1b0f312f3d9b26db2cb9 Mon Sep 17 00:00:00 2001 From: Andy Loftus Date: Tue, 28 Apr 2026 18:48:17 +0000 Subject: [PATCH] SVCPLAN-7087 remove dependency on telegraf --- manifests/telegraf.pp | 2 +- manifests/telegraf_user_resource_usage.pp | 40 ++++++++++++----------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/manifests/telegraf.pp b/manifests/telegraf.pp index 407d031..2e529d6 100644 --- a/manifests/telegraf.pp +++ b/manifests/telegraf.pp @@ -60,7 +60,7 @@ # pkg_name: {pkg_options} # ``` # where `pkg_options` are valid Puppet package attributes. -# +# # @param uid # String of the UID of the local telegraf user # diff --git a/manifests/telegraf_user_resource_usage.pp b/manifests/telegraf_user_resource_usage.pp index 92e8479..5e85d98 100644 --- a/manifests/telegraf_user_resource_usage.pp +++ b/manifests/telegraf_user_resource_usage.pp @@ -13,26 +13,28 @@ Boolean $enable, Hash $telegraf_cfg, ) { - if ($enable and $profile_monitoring::telegraf::enabled) { - $ensure_parm = 'present' - } else { - $ensure_parm = 'absent' - } + if ( $profile_monitoring::telegraf::enabled ) { + if ( $enable ) { + $ensure_parm = 'present' + } else { + $ensure_parm = 'absent' + } - # Script file - file { '/etc/telegraf/scripts/user_resource_usage.sh': - ensure => $ensure_parm, - content => file("${module_name}/user_resource_usage.sh"), - owner => $profile_monitoring::telegraf::config_dirs_default_owner, - group => $profile_monitoring::telegraf::config_dirs_default_group, - mode => '0750', - } + # Script file + file { '/etc/telegraf/scripts/user_resource_usage.sh': + ensure => $ensure_parm, + content => file("${module_name}/user_resource_usage.sh"), + owner => $profile_monitoring::telegraf::config_dirs_default_owner, + group => $profile_monitoring::telegraf::config_dirs_default_group, + mode => '0750', + } - # Telegraf config - telegraf::input { 'user_resource_usage' : - ensure => $ensure_parm, - plugin_type => 'exec', - options => [$telegraf_cfg], - require => File['/etc/telegraf/scripts/user_resource_usage.sh'], + # Telegraf config + telegraf::input { 'user_resource_usage' : + ensure => $ensure_parm, + plugin_type => 'exec', + options => [$telegraf_cfg], + require => File['/etc/telegraf/scripts/user_resource_usage.sh'], + } } }