keith/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More Updates to collectd/CGP

Browse source
This commit is contained in:
Keith Whyte 2023-03-28 08:02:13 +02:00
parent ca9e6b2252
commit e1713bbc3a
3 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
modules/rhizo_base/manifests/init.pp
View file

@ -144,6 +144,7 @@ class rhizo_base {
$admin_contact = hiera('rhizo::admin_contact','') $admin_contact = hiera('rhizo::admin_contact','')
$support_contact = hiera('rhizo::support_contact','') $support_contact = hiera('rhizo::support_contact','')
$gpsd = hiera('rhizo::gpsd','172.16.0.11')
#Device Geo Info #Device Geo Info
$bsc_geo_lat = hiera('rhizo::bsc_geo_lat') $bsc_geo_lat = hiera('rhizo::bsc_geo_lat')
$bsc_geo_lon = hiera('rhizo::bsc_geo_lon') $bsc_geo_lon = hiera('rhizo::bsc_geo_lon')
@ -383,9 +384,10 @@ schedule { 'never':
require => File['/root/.ssh/bsc_dev'], require => File['/root/.ssh/bsc_dev'],
} }
file { '/root/collectd-hack': file { '/home/rhizomatica/bin/collectd-graph-panel-hack':
source => 'puppet:///modules/rhizo_base/collectd-hack', source => 'puppet:///modules/rhizo_base/collectd-hack',
mode => '0750' mode => '0750',
notify => Exec['notify-cgp-hack']
} }
file { '/var/rhizomatica/rccn/config_values.py': file { '/var/rhizomatica/rccn/config_values.py':
@ -454,6 +456,11 @@ schedule { 'never':
} }
} }
exec { 'notify-cgp-hack':
command => '/home/rhizomatica/bin/collectd-graph-panel-hack once',
refreshonly => true,
}
exec { 'notify-freeswitch': exec { 'notify-freeswitch':
command => '/home/rhizomatica/bin/notify-freeswitch.sh', command => '/home/rhizomatica/bin/notify-freeswitch.sh',
refreshonly => true, refreshonly => true,
@ -661,10 +668,17 @@ schedule { 'never':
require => Package['apcupsd'], require => Package['apcupsd'],
} }
service { 'collectd':
provider => 'systemd',
enable => true,
ensure => 'running',
}
file { '/etc/collectd/collectd.conf': file { '/etc/collectd/collectd.conf':
ensure => present, ensure => present,
source => 'puppet:///modules/rhizo_base/etc/collectd/collectd.conf', content => template('rhizo_base/collectd.conf.erb'),
require => Package['collectd'], require => Package['collectd'],
notify => Service['collectd']
} }
file { '/etc/default/apcupsd': file { '/etc/default/apcupsd':

4
modules/rhizo_base/manifests/packages.pp
View file

@ -74,7 +74,7 @@ class rhizo_base::packages::buster inherits rhizo_base::packages::common {
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
package { ['libcdk5nc6', 'msmtp-mta', 'ncat' ]: package { ['libcdk5nc6', 'msmtp-mta', 'ncat', 'libgps23' ]:
ensure => installed, ensure => installed,
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
@ -110,7 +110,7 @@ class rhizo_base::packages::stretch inherits rhizo_base::packages::common {
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }
package { ['libcdk5', 'nmap' ]: package { ['libcdk5', 'nmap', 'libgps22' ]:
ensure => installed, ensure => installed,
require => Class['rhizo_base::apt'], require => Class['rhizo_base::apt'],
} }

2
modules/rhizo_base/files/etc/collectd/collectd.conf → modules/rhizo_base/templates/collectd.conf.erb
View file

@ -610,7 +610,7 @@ LoadPlugin users
#</Plugin> #</Plugin>
<Plugin gps> <Plugin gps>
Host "172.16.0.11" Host "<%= @gpsd %>"
Port "2947" Port "2947"
Timeout 0.015 Timeout 0.015
PauseConnect 5 PauseConnect 5