diff --git a/CHANGELOG.md b/CHANGELOG.md index 32793df..4cc21c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## v1.4.X + +### Enhancements +* Add variables to manage plugin interval. + ## v1.3.3 ### Enhancements diff --git a/README.md b/README.md index d0dd26d..828dfd1 100644 --- a/README.md +++ b/README.md @@ -31,18 +31,26 @@ Manage Xymon (client) installation and configuration. * **xymon_plug_apt_package** : The packages to install to provide `apt` plugin [default : `[ 'libtimedate-perl' ]`]. * **xymon_plug_apt_path** : Configuration file for the `apt` plugin [default : `/etc/xymon/clientlaunch.d/apt.cfg`]. * **xymon_plug_apt_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/apt.cfg.j2`]. +* **xymon_plug_apt_interval** : Time between each run of the `apt` plugin [default : `5m`]. * **xymon_plug_apt_default_whitelist: Default list of allowed packages not installed from repositories [default : `[]`]. * **xymon_plug_apt_whitelist: All hosts list of allowed packages not installed from repositories [default : `[]`]. * **xymon_plug_apt_group_whitelist: Group list of allowed packages not installed from repositories [default : `[]`]. * **xymon_plug_apt_host_whitelist: Host list of allowed packages not installed from repositories [default : `[]`]. +* **xymon_cli__plug_ipmi_state** : The state of plugin `ipmi` [default : `false`]. +* **xymon_cli__plug_ipmi_state** : The packages to install to provide `ipmi` plugin [default : `[ 'ipmitool' ]`]. +* **xymon_cli__plug_ipmi_path** : Configuration file for the `ipmi` plugin [default : `/etc/xymon/clientlaunch.d/ipmi.cfg`]. +* **xymon_cli__plug_ipmi_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/ipmi.cfg.j2`]. +* **xymon_cli__plug_ipmi_interval** : Time between each run of the `ipmi` plugin [default : `5m`]. * **xymon_plug_mq_state** : The state of plugin `mq` [default : `true`]. * **xymon_plug_mq_package** : The packages to install to provide `mq` plugin [default : `[ 'libtimedate-perl' ]`]. * **xymon_plug_mq_path** : Configuration file for the `mq` plugin [default : `/etc/xymon/clientlaunch.d/mq.cfg`]. * **xymon_plug_mq_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/mq.cfg.j2`]. +* **xymon_plug_mq_interval** : Time between each run of the `mq` plugin [default : `5m`]. * **xymon_plug_libs_state** : The state of plugin `libs` [default : `true`]. * **xymon_plug_libs_package** : The packages to install to provide `libs` plugin [default : `[ 'binutils', 'lsof', 'libyaml-tiny-perl', 'libsort-naturally-perl' ]`]. * **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_interval** : Time between each run of the `libs` plugin [default : `5m`]. * **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. @@ -52,6 +60,7 @@ Manage Xymon (client) installation and configuration. * **xymon_cli__plug_zfs_script_tpl** : Template used to generate the previous script [default : `usr/lib/xymon/client/ext/zfs.j2`]. * **xymon_cli__plug_zfs_path** : Configuration file for the `zfs` plugin [default : `/etc/xymon/clientlaunch.d/zfs.cfg`]. * **xymon_cli__plug_zfs_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/zfs.cfg.j2`]. +* **xymon_cli__plug_zfs_interval** : Time between each run of the `zfs` plugin [default : `5m`]. ### OS Specific Variables diff --git a/defaults/main.yml b/defaults/main.yml index 9f49b54..9c7afe2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -53,6 +53,7 @@ xymon_plug_apt_state: true xymon_plug_apt_package: ['dctrl-tools'] xymon_plug_apt_path: '/etc/xymon/clientlaunch.d/apt.cfg' xymon_plug_apt_tpl: 'etc/xymon/clientlaunch.d/apt.cfg.j2' +xymon_plug_apt_interval: '5m' xymon_plug_apt_default_whitelist: [] xymon_plug_apt_whitelist: [] xymon_plug_apt_group_whitelist: [] @@ -62,24 +63,20 @@ xymon_plug_apt_combined_whitelist: '{{ xymon_plug_apt_default_whitelist + xymon_plug_apt_group_whitelist + xymon_plug_apt_host_whitelist }}' -## ]]] -## Plugin mq [[[ -xymon_plug_mq_state: true -xymon_plug_mq_package: ['libtimedate-perl'] -xymon_plug_mq_path: '/etc/xymon/clientlaunch.d/mq.cfg' -xymon_plug_mq_tpl: 'etc/xymon/clientlaunch.d/mq.cfg.j2' ## ]]] ## Plugin ipmi [[[ xymon_cli__plug_ipmi_state: false xymon_cli__plug_ipmi_package: ['ipmitool'] xymon_cli__plug_ipmi_path: '/etc/xymon/clientlaunch.d/ipmi.cfg' xymon_cli__plug_ipmi_tpl: 'etc/xymon/clientlaunch.d/ipmi.cfg.j2' +xymon_cli__plug_ipmi_interval: '5m' ## ]]] ## Plugin libs [[[ xymon_plug_libs_state: true xymon_plug_libs_package: ['binutils', 'lsof', 'libyaml-tiny-perl', 'libsort-naturally-perl'] xymon_plug_libs_path: '/etc/xymon/clientlaunch.d/libs.cfg' xymon_plug_libs_tpl: 'etc/xymon/clientlaunch.d/libs.cfg.j2' +xymon_plug_libs_interval: '5m' xymon_plug_libs_default_whitelist: /lib/systemd/systemd: @@ -95,12 +92,20 @@ xymon_plug_libs_group_whitelist: {} xymon_plug_libs_host_whitelist: {} # ]]] +## Plugin mq [[[ +xymon_plug_mq_state: true +xymon_plug_mq_package: ['libtimedate-perl'] +xymon_plug_mq_path: '/etc/xymon/clientlaunch.d/mq.cfg' +xymon_plug_mq_tpl: 'etc/xymon/clientlaunch.d/mq.cfg.j2' +xymon_plug_mq_interval: '5m' +## ]]] ## Plugin zfs [[[ xymon_cli__plug_zfs_state: false xymon_cli__plug_zfs_script_path: '/usr/lib/xymon/client/ext/zfs' xymon_cli__plug_zfs_script_tpl: 'usr/lib/xymon/client/ext/zfs.j2' xymon_cli__plug_zfs_path: '/etc/xymon/clientlaunch.d/zfs.cfg' xymon_cli__plug_zfs_tpl: 'etc/xymon/clientlaunch.d/zfs.cfg.j2' +xymon_cli__plug_zfs_interval: '5m' # ]]] diff --git a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2 b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2 index cc48dca..51cc673 100644 --- a/templates/etc/xymon/clientlaunch.d/apt.cfg.j2 +++ b/templates/etc/xymon/clientlaunch.d/apt.cfg.j2 @@ -3,4 +3,4 @@ ENVFILE /etc/xymon/xymonclient.cfg CMD $XYMONCLIENTHOME/ext/apt LOGFILE /var/log/xymon/xymonclient.log - INTERVAL 5m + INTERVAL {{ xymon_plug_apt_interval }} diff --git a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2 b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2 index f9479e4..4a62766 100644 --- a/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2 +++ b/templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2 @@ -3,4 +3,4 @@ ENVFILE /etc/xymon/xymonclient.cfg CMD /usr/bin/sudo -E -u root $XYMONCLIENTHOME/ext/ipmi LOGFILE /var/log/xymon/xymonclient.log - INTERVAL 5m + INTERVAL {{ xymon_cli__plug_ipmi_interval }} diff --git a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2 b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2 index 3ee7289..64e5b60 100644 --- a/templates/etc/xymon/clientlaunch.d/libs.cfg.j2 +++ b/templates/etc/xymon/clientlaunch.d/libs.cfg.j2 @@ -3,4 +3,4 @@ ENVFILE /etc/xymon/xymonclient.cfg CMD $XYMONCLIENTHOME/ext/libs LOGFILE /var/log/xymon/xymonclient.log - INTERVAL 5m + INTERVAL {{ xymon_plug_libs_interval }} diff --git a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2 b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2 index c818df7..94e84d1 100644 --- a/templates/etc/xymon/clientlaunch.d/mq.cfg.j2 +++ b/templates/etc/xymon/clientlaunch.d/mq.cfg.j2 @@ -3,4 +3,4 @@ ENVFILE /etc/xymon/xymonclient.cfg CMD $XYMONCLIENTHOME/ext/mq LOGFILE /var/log/xymon/xymonclient.log - INTERVAL 5m + INTERVAL {{ xymon_plug_mq_interval }} diff --git a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2 b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2 index c4e5e29..a95008a 100644 --- a/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2 +++ b/templates/etc/xymon/clientlaunch.d/zfs.cfg.j2 @@ -3,4 +3,4 @@ ENVFILE /etc/xymon/xymonclient.cfg CMD /usr/bin/sudo -E -u root $XYMONCLIENTHOME/ext/zfs LOGFILE /var/log/xymon/zfs.log - INTERVAL 5m + INTERVAL {{ xymon_cli__plug_zfs_interval }}