From 2564ddb0650f46c85fa98ba477a93c4da8a02012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Fri, 22 Jun 2018 15:26:36 +0200 Subject: [PATCH] Add all hosts var for the plugin "list" whitelist --- CHANGELOG.md | 1 + README.md | 1 + defaults/main.yml | 1 + templates/etc/xymon/libs.local.yaml.j2 | 1 + 4 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cfe560..0366744 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Add possibility to install `apt` plugin dependencies. * Ensure to apply the config only if wanted. * Some yamllint fix. +* Add a all hosts variable for the plugin "list" whitelist. ## v1.1 diff --git a/README.md b/README.md index 813cb11..7296df6 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Manage Xymon (client) installation and configuration. * **xymon_plug_libs_path** : Configuration file for the `libs` plugin [default : `/etc/xymon/clientlaunch.d/libs.cfg`]. * **xymon_plug_libs_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/libs.cfg.j2`]. * **xymon_plug_libs_default_whitelist** : Default whitelist of processes that should not be monitored with `libs` plugin. +* **xymon_plug_libs_whitelist** : All hosts whitelist of processes that should not be monitored with `libs` plugin. * **xymon_plug_libs_group_whitelist** : Group whitelist of processes that should not be monitored with `libs` plugin. * **xymon_plug_libs_host_whitelist** : Host whitelist of processes that should not be monitored with `libs` plugin. diff --git a/defaults/main.yml b/defaults/main.yml index 1d7f980..de0156d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -76,6 +76,7 @@ xymon_plug_libs_default_whitelist: - '.*' /sbin/multipathd: - '.*' +xymon_plug_libs_whitelist: {} xymon_plug_libs_group_whitelist: {} xymon_plug_libs_host_whitelist: {} diff --git a/templates/etc/xymon/libs.local.yaml.j2 b/templates/etc/xymon/libs.local.yaml.j2 index 6f42ce9..8139529 100644 --- a/templates/etc/xymon/libs.local.yaml.j2 +++ b/templates/etc/xymon/libs.local.yaml.j2 @@ -1,5 +1,6 @@ # {{ ansible_managed }} {% set inputmerged = xymon_plug_libs_default_whitelist.copy() %} +{% set _ = inputmerged.update(xymon_plug_libs_whitelist) %} {% set _ = inputmerged.update(xymon_plug_libs_group_whitelist) %} {% set _ = inputmerged.update(xymon_plug_libs_host_whitelist) %} ---