diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2015-01-20 18:40:04 +0000 |
| commit | 23201220bf8b7b63da44747be142face0c98eb09 (patch) | |
| tree | c1645f62976281a552963b1309307e0d0b6136f3 /manifests/plugins/linux.pp | |
| parent | 7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff) | |
| parent | eaa092eb1a8f3ae19551e6e80f84d174211b5208 (diff) | |
Merge branch 'merge_immerda' into 'master'
This is my attempt at merging the huge backlog of commits from immerda. I've been pretty verbose about it in redmine so I won't repeat it all here. For details, see:
https://labs.riseup.net/code/issues/4132
Diffstat (limited to 'manifests/plugins/linux.pp')
| -rw-r--r-- | manifests/plugins/linux.pp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/manifests/plugins/linux.pp b/manifests/plugins/linux.pp index a73de63..354d23c 100644 --- a/manifests/plugins/linux.pp +++ b/manifests/plugins/linux.pp @@ -1,8 +1,10 @@ -class munin::plugins::linux { +# Set up plugins for a linux host +class munin::plugins::linux { munin::plugin { - [ df_abs, forks, df_inode, irqstats, entropy, open_inodes ]: + [ 'df_abs', 'forks', 'df_inode', 'irqstats', 'entropy', 'open_inodes', + 'diskstats', 'proc_pri', 'threads', ]: ensure => present; - acpi: + 'acpi': ensure => $::acpi_available; } } |