diff options
| -rw-r--r-- | manifests/tozt.pp | 1 | ||||
| -rw-r--r-- | modules/munin/files/munin.conf | 3 | ||||
| -rw-r--r-- | modules/partofme/manifests/monitoring.pp | 45 | ||||
| -rw-r--r-- | modules/tozt/manifests/monitoring.pp | 48 | ||||
| -rw-r--r-- | modules/tozt/manifests/munin.pp | 46 |
5 files changed, 97 insertions, 46 deletions
diff --git a/manifests/tozt.pp b/manifests/tozt.pp index 03ab460..6de5635 100644 --- a/manifests/tozt.pp +++ b/manifests/tozt.pp @@ -10,6 +10,7 @@ node 'tozt', 'tozt.localdomain' { include tozt::backups include tozt::git + include tozt::monitoring include tozt::munin include tozt::pass include tozt::paste diff --git a/modules/munin/files/munin.conf b/modules/munin/files/munin.conf index 1780981..3455b9d 100644 --- a/modules/munin/files/munin.conf +++ b/modules/munin/files/munin.conf @@ -3,3 +3,6 @@ htmldir /srv/http/munin [tozt] address 127.0.0.1 use_node_name yes +[partofme] + address partofme.algo + use_node_name yes diff --git a/modules/partofme/manifests/monitoring.pp b/modules/partofme/manifests/monitoring.pp index f03d36e..95833b0 100644 --- a/modules/partofme/manifests/monitoring.pp +++ b/modules/partofme/manifests/monitoring.pp @@ -1,3 +1,48 @@ class partofme::monitoring { include smartmontools + include munin::node + + munin::plugin { + [ + 'cpu', + 'df', + 'df_inode', + 'entropy', + 'forks', + 'fw_packets', + 'interrupts', + 'irqstats', + 'load', + 'memory', + 'ntp_kernel_err', + 'ntp_kernel_pll_freq', + 'ntp_kernel_pll_off', + 'ntp_offset', + 'open_files', + 'open_inodes', + 'proc_pri', + '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_', + } } diff --git a/modules/tozt/manifests/monitoring.pp b/modules/tozt/manifests/monitoring.pp new file mode 100644 index 0000000..2771ff0 --- /dev/null +++ b/modules/tozt/manifests/monitoring.pp @@ -0,0 +1,48 @@ +class tozt::monitoring { + include munin::node + + munin::plugin { + [ + 'cpu', + 'df', + 'df_inode', + 'entropy', + 'forks', + 'fw_packets', + 'interrupts', + 'irqstats', + 'load', + 'memory', + 'munin_stats', + 'ntp_kernel_err', + 'ntp_kernel_pll_freq', + 'ntp_kernel_pll_off', + 'ntp_offset', + 'open_files', + 'open_inodes', + 'proc_pri', + 'processes', + 'swap', + 'threads', + 'uptime', + 'users', + 'vmstat', + ]: + } + + munin::plugin { + [ + 'if_algo', + 'if_eth0', + ]: + source => 'if_', + } + + munin::plugin { + [ + 'if_err_algo', + 'if_err_eth0', + ]: + source => 'if_err_', + } +} diff --git a/modules/tozt/manifests/munin.pp b/modules/tozt/manifests/munin.pp index 6a7eb22..722a7e8 100644 --- a/modules/tozt/manifests/munin.pp +++ b/modules/tozt/manifests/munin.pp @@ -1,51 +1,5 @@ class tozt::munin { include munin - include munin::node - - munin::plugin { - [ - 'cpu', - 'df', - 'df_inode', - 'entropy', - 'forks', - 'fw_packets', - 'interrupts', - 'irqstats', - 'load', - 'memory', - 'munin_stats', - 'ntp_kernel_err', - 'ntp_kernel_pll_freq', - 'ntp_kernel_pll_off', - 'ntp_offset', - 'open_files', - 'open_inodes', - 'proc_pri', - 'processes', - 'swap', - 'threads', - 'uptime', - 'users', - 'vmstat', - ]: - } - - munin::plugin { - [ - 'if_algo', - 'if_eth0', - ]: - source => 'if_', - } - - munin::plugin { - [ - 'if_err_algo', - 'if_err_eth0', - ]: - source => 'if_err_', - } nginx::site { "munin-tls": |