From c09749a3430d4a64501ea4900d662cd565cfeadb Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Fri, 10 Jul 2020 18:52:29 -0400 Subject: remove munin --- manifests/tozt.pp | 1 - modules/mail/manifests/monitoring.pp | 80 ------------------------------- modules/partofme/manifests/monitoring.pp | 69 --------------------------- modules/tozt/manifests/monitoring.pp | 82 -------------------------------- modules/tozt/manifests/munin.pp | 20 -------- 5 files changed, 252 deletions(-) delete mode 100644 modules/tozt/manifests/munin.pp diff --git a/manifests/tozt.pp b/manifests/tozt.pp index cb000f8..448b8f1 100644 --- a/manifests/tozt.pp +++ b/manifests/tozt.pp @@ -18,7 +18,6 @@ node 'tozt', 'tozt.localdomain' { include tozt::git include tozt::metabase include tozt::monitoring - include tozt::munin include tozt::paste include tozt::services include tozt::site diff --git a/modules/mail/manifests/monitoring.pp b/modules/mail/manifests/monitoring.pp index b473b48..1f0f37a 100644 --- a/modules/mail/manifests/monitoring.pp +++ b/modules/mail/manifests/monitoring.pp @@ -1,84 +1,4 @@ class mail::monitoring { - include munin::node - include munin::duplicati - include munin::tarsnap - include munin::archlinux - include munin::mailu - - file { "/etc/munin/plugin-conf.d/mail": - source => "puppet:///modules/mail/munin-plugin-conf", - require => Package["munin-node"], - notify => Service["munin-node"]; - } - - munin::plugin { - [ - 'cpu', - 'df', - 'df_inode', - 'forks', - 'load', - 'memory', - 'ntp_offset', - 'processes', - 'swap', - 'threads', - 'uptime', - 'users', - 'vmstat', - ]: - } - - munin::plugin { - [ - 'fail2ban', - ]: - } - - munin::plugin { - [ - 'if_algo', - 'if_eth0', - ]: - source => 'if_', - } - - munin::plugin { - [ - 'if_err_algo', - 'if_err_eth0', - ]: - source => 'if_err_', - } - - munin::plugin { - [ - 'duplicati_duration', - 'duplicati_file_count', - 'duplicati_file_size', - 'duplicati_last_run', - ]: - } - - munin::plugin { - [ - 'tarsnap', - 'tarsnap_last_run', - ]: - } - - munin::plugin { - [ - 'package_updates', - ]: - } - - munin::plugin { - [ - 'mail_count', - ]: - } - include tick::client::base_plugins class { diff --git a/modules/partofme/manifests/monitoring.pp b/modules/partofme/manifests/monitoring.pp index c84f9f7..0f40b7f 100644 --- a/modules/partofme/manifests/monitoring.pp +++ b/modules/partofme/manifests/monitoring.pp @@ -1,74 +1,5 @@ class partofme::monitoring { include smartmontools - include munin::node - include munin::duplicati - include munin::archlinux - - file { '/etc/munin/plugin-conf.d/partofme': - source => 'puppet:///modules/partofme/munin-plugin-conf', - require => Package['munin-node'], - notify => Service["munin-node"]; - } - - munin::plugin { - [ - 'cpu', - 'df', - 'df_inode', - 'forks', - 'load', - 'memory', - 'ntp_offset', - 'processes', - 'swap', - 'threads', - 'uptime', - 'users', - 'vmstat', - ]: - } - - munin::plugin { - [ - 'if_algo', - 'if_enp3s0', - ]: - source => 'if_'; - } - - munin::plugin { - [ - 'if_err_algo', - 'if_err_enp3s0', - ]: - source => 'if_err_'; - } - - munin::plugin { - [ - 'smart_sda', - 'smart_sdb', - 'smart_sdc', - 'smart_sdd', - ]: - source => 'smart_'; - } - - munin::plugin { - [ - 'duplicati_duration', - 'duplicati_file_count', - 'duplicati_file_size', - 'duplicati_last_run', - ]: - } - - munin::plugin { - [ - 'package_updates', - ]: - } - include tick::client::base_plugins class { "tick::client::plugin::smart": } diff --git a/modules/tozt/manifests/monitoring.pp b/modules/tozt/manifests/monitoring.pp index 93fb9ff..2007ab2 100644 --- a/modules/tozt/manifests/monitoring.pp +++ b/modules/tozt/manifests/monitoring.pp @@ -1,86 +1,4 @@ class tozt::monitoring { - include munin::node - include munin::duplicati - include munin::tarsnap - include munin::archlinux - include munin::certbot - - file { "/etc/munin/plugin-conf.d/tozt": - source => "puppet:///modules/tozt/munin-plugin-conf", - require => Package["munin-node"], - notify => Service["munin-node"]; - } - - munin::plugin { - [ - 'cpu', - 'df', - 'df_inode', - 'forks', - 'load', - 'memory', - 'ntp_offset', - 'processes', - 'swap', - 'threads', - 'uptime', - 'users', - 'vmstat', - ]: - } - - munin::plugin { - [ - 'fail2ban', - 'munin_stats', - 'munin_update', - ]: - } - - munin::plugin { - [ - 'if_algo', - 'if_eth0', - ]: - source => 'if_', - } - - munin::plugin { - [ - 'if_err_algo', - 'if_err_eth0', - ]: - source => 'if_err_', - } - - munin::plugin { - [ - 'duplicati_duration', - 'duplicati_file_count', - 'duplicati_file_size', - 'duplicati_last_run', - ]: - } - - munin::plugin { - [ - 'tarsnap', - 'tarsnap_last_run', - ]: - } - - munin::plugin { - [ - 'package_updates', - ]: - } - - munin::plugin { - [ - 'certbot', - ]: - } - include tick::client::base_plugins tick::client::plugin { "postgresql": diff --git a/modules/tozt/manifests/munin.pp b/modules/tozt/manifests/munin.pp deleted file mode 100644 index 52cf240..0000000 --- a/modules/tozt/manifests/munin.pp +++ /dev/null @@ -1,20 +0,0 @@ -class tozt::munin { - include munin - - secret { "/media/persistent/munin.htpasswd": - source => "munin", - owner => 'http', - require => [ - Class["tozt::persistent"], - Package['nginx'], - ]; - } - - nginx::site { - "munin-tls": - source => 'puppet:///modules/tozt/nginx/munin-tls.conf', - require => Class['certbot']; - "munin": - source => 'puppet:///modules/tozt/nginx/munin.conf'; - } -} -- cgit v1.2.3-54-g00ecf