From e1713bbc3aa82fb8c49827dbde800a407b5f1732 Mon Sep 17 00:00:00 2001
From: Keith Whyte <keith@rhizomatica.org>
Date: Tue, 28 Mar 2023 08:02:13 +0200
Subject: [PATCH] More Updates to collectd/CGP

---
 modules/rhizo_base/manifests/init.pp          | 20 ++++++++++++++++---
 modules/rhizo_base/manifests/packages.pp      |  4 ++--
 .../collectd.conf.erb}                        |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)
 rename modules/rhizo_base/{files/etc/collectd/collectd.conf => templates/collectd.conf.erb} (99%)

diff --git a/modules/rhizo_base/manifests/init.pp b/modules/rhizo_base/manifests/init.pp
index fbe24a7..3933274 100644
--- a/modules/rhizo_base/manifests/init.pp
+++ b/modules/rhizo_base/manifests/init.pp
@@ -144,6 +144,7 @@ class rhizo_base {
   $admin_contact       = hiera('rhizo::admin_contact','')
   $support_contact     = hiera('rhizo::support_contact','')
 
+  $gpsd                = hiera('rhizo::gpsd','172.16.0.11')
   #Device Geo Info
   $bsc_geo_lat         = hiera('rhizo::bsc_geo_lat')
   $bsc_geo_lon         = hiera('rhizo::bsc_geo_lon')
@@ -383,9 +384,10 @@ schedule { 'never':
     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',
-      mode    => '0750'
+      mode    => '0750',
+      notify  => Exec['notify-cgp-hack']
     }
 
   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':
       command     => '/home/rhizomatica/bin/notify-freeswitch.sh',
       refreshonly => true,
@@ -661,10 +668,17 @@ schedule { 'never':
       require => Package['apcupsd'],
     }
 
+  service { 'collectd':
+    provider   => 'systemd',
+    enable     => true,
+    ensure     => 'running',
+  }
+
   file { '/etc/collectd/collectd.conf':
       ensure  => present,
-      source  => 'puppet:///modules/rhizo_base/etc/collectd/collectd.conf',
+      content => template('rhizo_base/collectd.conf.erb'),
       require => Package['collectd'],
+      notify  => Service['collectd']
     }
 
   file { '/etc/default/apcupsd':
diff --git a/modules/rhizo_base/manifests/packages.pp b/modules/rhizo_base/manifests/packages.pp
index f2dba7f..bacbd78 100644
--- a/modules/rhizo_base/manifests/packages.pp
+++ b/modules/rhizo_base/manifests/packages.pp
@@ -74,7 +74,7 @@ class rhizo_base::packages::buster inherits rhizo_base::packages::common {
       require => Class['rhizo_base::apt'],
     }
 
-  package { ['libcdk5nc6', 'msmtp-mta', 'ncat' ]:
+  package { ['libcdk5nc6', 'msmtp-mta', 'ncat', 'libgps23' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
@@ -110,7 +110,7 @@ class rhizo_base::packages::stretch inherits rhizo_base::packages::common {
       require => Class['rhizo_base::apt'],
     }
 
-  package { ['libcdk5', 'nmap' ]:
+  package { ['libcdk5', 'nmap', 'libgps22' ]:
       ensure  => installed,
       require => Class['rhizo_base::apt'],
     }
diff --git a/modules/rhizo_base/files/etc/collectd/collectd.conf b/modules/rhizo_base/templates/collectd.conf.erb
similarity index 99%
rename from modules/rhizo_base/files/etc/collectd/collectd.conf
rename to modules/rhizo_base/templates/collectd.conf.erb
index 3246d34..4ef11b9 100644
--- a/modules/rhizo_base/files/etc/collectd/collectd.conf
+++ b/modules/rhizo_base/templates/collectd.conf.erb
@@ -610,7 +610,7 @@ LoadPlugin users
 #</Plugin>
 
 <Plugin gps>
-	Host "172.16.0.11"
+	Host "<%= @gpsd %>"
 	Port "2947"
 	Timeout 0.015
 	PauseConnect 5