diff --git a/CHANGELOG.md b/CHANGELOG.md index 068fee9..36d335b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ reads /proc/net/{netstat,snmp} files. * Combine packages vars of all enabled plugins to install them in _one_ task. * Combine clientlaunch files for plugins to manage them in _one_ dedicated task. +* Split base package list in order to allow installation of `xymon-client` without + "hobbit-plugins". ## v1.5.1 diff --git a/README.md b/README.md index cfb31b0..a115ac0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 1. [Overview](#overview) 2. [Role Variables](#role-variables) - * [Plugins Specific Variables](#plugins-specific-variables) + * [Plugins Specific Variables](#plugins-variables) * [OS Specific Variables](#os-specific-variables) 3. [Example Playbook](#example-playbook) 4. [Configuration](#configuration) @@ -31,7 +31,7 @@ Manage Xymon (client) installation and configuration. ### Plugins Variables -* **xymon_cli__plug_combined_packages** : Combine packages vars of all enabled plugins defined below. +* **xymon_cli__plug_combined_packages** : Combine all packages vars related to plugins (only enabled plugins). * **xymon_cli__plug_combined_clientlaunch** : Combine clientlaunch files for all plugins. #### APT @@ -180,7 +180,7 @@ one's recommended by the vendor and check a recent (<24h) test was done. #### Temp -Variables for the Mq plugin from hobbit-plugins. Simple temperature monitor. +Variables for the temp plugin from hobbit-plugins. Simple temperature monitor. * **xymon_cli__plug_temp_state** : The state of plugin `temp` [default : `False`]. * **xymon_cli__plug_temp_package** : The packages to install to provide `temp` plugin [default : `[ 'libfile-which-perl', 'libyaml-tiny-perl', 'hddtemp', 'smartmontools', 'libxml-twig-perl' ]`]. @@ -190,7 +190,7 @@ Variables for the Mq plugin from hobbit-plugins. Simple temperature monitor. ##### Nvidia support -The temp can also checks NVidia GPU temperature. In order to get those +The temp plugin can also checks NVidia GPU temperature. In order to get those informations, you need to install `nvidia-smi` package by your own or override **xymon_cli__plug_temp_package** var : @@ -227,6 +227,7 @@ xymon_cli__plug_temp_state: '{{ True Please see default value by Operating System file in [vars][vars directory] directory. * **xymon_cli__pkg_list** : The list of packages to install to provide `xymon-client`. +* **xymon_cli__plug_pkg_list** : The list of packages to install to provide extra plugins to Xymon client. ## Example Playbook diff --git a/defaults/main.yml b/defaults/main.yml index 5ed4b2f..53ce388 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -190,9 +190,10 @@ xymon_cli__plug_zfs_interval: '5m' # .. envvar:: xymon_cli__plug_combined_packages [[[ # -# Combined packages vars of all enabled plugins. +# Combine all packages vars related to plugins (only enabled plugins). # -xymon_cli__plug_combined_packages: '{{ ((xymon_cli__plug_apt_package if xymon_cli__plug_apt_state|bool else []) +xymon_cli__plug_combined_packages: '{{ ((xymon_cli__plug_pkg_list|d([]) if xymon_cli__plug_manage|bool else []) + + (xymon_cli__plug_apt_package if xymon_cli__plug_apt_state|bool else []) + (xymon_cli__plug_ipmi_package if xymon_cli__plug_ipmi_state|bool else []) + (xymon_cli__plug_libs_package if xymon_cli__plug_libs_state|bool else []) + (xymon_cli__plug_megaraid_package if xymon_cli__plug_megaraid_state|bool else []) diff --git a/tasks/main.yml b/tasks/main.yml index fbb7db3..0f38882 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -50,8 +50,8 @@ when: (xymon_cli__manage|bool and xymon_cli__service_manage|bool) -# Manage all plugins's dependencies [[[1 -- name: PLUGINS dependencies +# Manage all plugins's packages [[[1 +- name: PLUGINS package and dependencies package: name: '{{ item }}' state: 'present' diff --git a/vars/debian.yml b/vars/debian.yml index adeb600..17c4fe3 100644 --- a/vars/debian.yml +++ b/vars/debian.yml @@ -2,4 +2,6 @@ # vars file for Debian-based distros xymon_cli__pkg_list: - xymon-client + +xymon_cli__plug_pkg_list: - hobbit-plugins