diff --git a/puppet-manifests/centos/build_srpm.data b/puppet-manifests/centos/build_srpm.data index 5610037e43..8521910bff 100644 --- a/puppet-manifests/centos/build_srpm.data +++ b/puppet-manifests/centos/build_srpm.data @@ -1,2 +1,2 @@ SRC_DIR="src" -TIS_PATCH_VER=74 +TIS_PATCH_VER=75 diff --git a/puppet-manifests/src/modules/platform/manifests/collectd.pp b/puppet-manifests/src/modules/platform/manifests/collectd.pp index f3fef419aa..c8edabb973 100644 --- a/puppet-manifests/src/modules/platform/manifests/collectd.pp +++ b/puppet-manifests/src/modules/platform/manifests/collectd.pp @@ -29,11 +29,16 @@ class platform::collectd content => template('platform/collectd.conf.erb'), } # now start collectd + -> exec { 'collectd-enable': + command => 'systemctl enable collectd', + unless => 'systemctl is-enabled collectd' + } + # ensure that collectd is running -> service { 'collectd': ensure => running, - enable => true, - provider => 'systemd' + provider => 'systemd', + require => Anchor['platform::networking'], } # now get pmond to monitor the process # ensure pmon soft link for process monitoring @@ -54,7 +59,6 @@ class platform::collectd::runtime { class platform::collectd::restart { include ::platform::collectd exec { 'collectd-restart': - command => '/usr/local/sbin/pmon-restart collect' + command => '/usr/local/sbin/pmon-restart collectd' } } - diff --git a/puppet-manifests/src/modules/platform/manifests/influxdb.pp b/puppet-manifests/src/modules/platform/manifests/influxdb.pp index cbdbe9d64a..752ada3c02 100644 --- a/puppet-manifests/src/modules/platform/manifests/influxdb.pp +++ b/puppet-manifests/src/modules/platform/manifests/influxdb.pp @@ -44,6 +44,11 @@ class platform::influxdb content => template('platform/influxdb.conf.erb'), } # now make sure that influxdb is started + -> exec { 'influxdb-enable': + command => 'systemctl enable influxdb', + unless => 'systemctl is-enabled influxdb' + } + # ensure that influxdb is running -> service { 'influxdb': ensure => running, @@ -61,12 +66,10 @@ class platform::influxdb } } - class platform::influxdb::runtime { include ::platform::influxdb } - class platform::influxdb::logrotate::params ( $log_file_name = undef, $log_file_size = undef,