From f0af1328ea95825ce4b12acdda0d892c3fccb0e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?= Date: Tue, 3 Nov 2020 17:48:21 +0100 Subject: [PATCH] Add extra var for Nvidia support with temp plugin --- CHANGELOG.md | 1 + README.md | 6 +++--- defaults/main.yml | 24 ++++++++++++++---------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 36d335b..1b94c44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ * 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". +* Add extra var for Nvidia support with temp plugin. ## v1.5.1 diff --git a/README.md b/README.md index a115ac0..9ac0182 100644 --- a/README.md +++ b/README.md @@ -191,11 +191,11 @@ Variables for the temp plugin from hobbit-plugins. Simple temperature monitor. ##### Nvidia support 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 : +informations, you need to install `nvidia-smi` package by your own or define +**xymon_cli__plug_temp_extra_package** var : ``` yml -xymon_cli__plug_temp_package: [ 'libfile-which-perl', 'libyaml-tiny-perl', 'hddtemp', 'smartmontools', 'libxml-twig-perl', 'nvidia-smi' ] +xymon_cli__plug_temp_extra_package: [ 'nvidia-smi' ] ``` #### ZFS diff --git a/defaults/main.yml b/defaults/main.yml index 53ce388..0e389ee 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -173,6 +173,9 @@ xymon_cli__plug_smart_interval: '10m' ### Enable by default on hardware host xymon_cli__plug_temp_state: False xymon_cli__plug_temp_package: [ 'libfile-which-perl', 'libyaml-tiny-perl', 'hddtemp', 'smartmontools', 'libxml-twig-perl' ] +# Define xymon_cli__plug_temp_extra_package in your own inventory. +# See Nvidia support in README for more informations +#xymon_cli__plug_temp_extra_package: [ 'nvidia-smi' ] xymon_cli__plug_temp_path: '/etc/xymon/clientlaunch.d/temp.cfg' xymon_cli__plug_temp_tpl: 'etc/xymon/clientlaunch.d/temp.cfg.j2' xymon_cli__plug_temp_interval: '5m' @@ -192,16 +195,17 @@ xymon_cli__plug_zfs_interval: '5m' # # Combine all packages vars related to plugins (only enabled plugins). # -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 []) - + (xymon_cli__plug_mq_package if xymon_cli__plug_mq_state|bool else []) - + (xymon_cli__plug_net_package if xymon_cli__plug_net_state|bool else []) - + (xymon_cli__plug_smartoverall_package if xymon_cli__plug_smartoverall_state|bool else []) - + (xymon_cli__plug_smart_package if xymon_cli__plug_smart_state|bool else []) - + (xymon_cli__plug_temp_package if xymon_cli__plug_temp_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 []) + + (xymon_cli__plug_mq_package if xymon_cli__plug_mq_state|bool else []) + + (xymon_cli__plug_net_package if xymon_cli__plug_net_state|bool else []) + + (xymon_cli__plug_smartoverall_package if xymon_cli__plug_smartoverall_state|bool else []) + + (xymon_cli__plug_smart_package if xymon_cli__plug_smart_state|bool else []) + + (xymon_cli__plug_temp_package if xymon_cli__plug_temp_state|bool else []) + + (xymon_cli__plug_temp_extra_package|d([]) if xymon_cli__plug_temp_state|bool else [])) | sort | unique }}' # ]]] # .. envvar:: xymon_cli__plug_combined_clientlaunch [[[