CHANGELOG.md

@@ -1,45 +1,3 @@
-## v2.3.0
-
-### Enhancements
-* Add variable/template to fix **kern**'s probe related message on Ubuntu
-  (`Can't check kernel version!`)
-    * See : https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725/comments/35
-
-## v2.2.0
-
-### Enhancements
-* Use **comment** filter for ansible_managed, to allow multi-lines.
-* Update SSSD path for libs white list.
-
-## v2.1.0
-
-### Enhancements
-* Add new kern probe management.
-* Update dependencies for libs probe after hobbit-plugins 20230301 upgrade
-
-### Removed
-* Remove hddtemp dependency. Package is no longer available in Debian Bookworm
-  and replaced by **drivetemp** kernel module (working since Debian Bullseye).
-
-## v2.0.3
-
-### Fix
-* Use flatten to manage packages list.
-* Prefix module with "ansible.builtin.".
-
-### Enhancements
-* Works with Debian Bullseye
-
-## v2.0.2
-
-### Fix
-* Prefix **net** probe command with **sudo** (required for some interfaces).
-
-## v2.0.1
-
-### Fix
-* Correct the path for ZFS probe.
-
 ## v2.0.0
 
 ### Enhancements
@@ -69,7 +27,7 @@
 
 ### Enhancements
 * Possibility to define URLs in order to get the latest version of SMART's scripts.
-* Add sge plugin from https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
+* Add sge plugin from https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
 
 ## v1.4.0
 
@@ -77,7 +35,7 @@
 * Add variables to manage plugin interval.
 * Add netstats plugin managment.
 * Add smart plugin from https://github.com/skazi0/xymon-plugins
-* Add smartoverall plugin from https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
+* Add smartoverall plugin from https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
 * Add description for plugins.
 
 ### Fix

README.md

@@ -60,24 +60,13 @@ sensors and event log.
 * **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`].
 
-#### Kern
-
-Variables for the kern plugin from hobbit-plugins. The plugin check for running
-outdated running kernel and need for reboot.
-
-* **xymon_cli__plug_kern_state** : The state of plugin `kern` [default : `true`].
-* **xymon_cli__plug_kern_package** : The packages to install to provide `kern` plugin [default : `[ 'binutils', 'libfile-slurp-perl', 'libsort-naturally-perl' ]`].
-* **xymon_cli__plug_kern_path** : Configuration file for the `kern` plugin [default : `/etc/xymon/clientlaunch.d/kern.cfg`].
-* **xymon_cli__plug_kern_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/kern.cfg.j2`].
-* **xymon_cli__plug_kern_interval** : Time between each run of the `kern` plugin [default : `5m`].
-
 #### Libs
 
 Variables for the Libs plugin from hobbit-plugins. The plugin check for running
 processes with upgraded libraries.
 
 * **xymon_cli__plug_libs_state** : The state of plugin `libs` [default : `true`].
-* **xymon_cli__plug_libs_package** : The packages to install to provide `libs` plugin [default : `[ 'lsof', 'sudo', 'libyaml-tiny-perl' ]`].
+* **xymon_cli__plug_libs_package** : The packages to install to provide `libs` plugin [default : `[ 'binutils', 'lsof', 'libyaml-tiny-perl', 'libfile-slurp-perl', 'libsort-naturally-perl' ]`].
 * **xymon_cli__plug_libs_path** : Configuration file for the `libs` plugin [default : `/etc/xymon/clientlaunch.d/libs.cfg`].
 * **xymon_cli__plug_libs_tpl** : Template used to generate the previous config file [default : `etc/xymon/clientlaunch.d/libs.cfg.j2`].
 * **xymon_cli__plug_libs_interval** : Time between each run of the `libs` plugin [default : `5m`].
@@ -204,7 +193,7 @@ one's recommended by the vendor and check a recent (<24h) test was done.
 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', 'smartmontools', 'libxml-twig-perl' ]`].
+* **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' ]`].
 * **xymon_cli__plug_temp_path** : Configuration file for the `temp` plugin [default : `'/etc/xymon/clientlaunch.d/temp.cfg'`].
 * **xymon_cli__plug_temp_tpl** : Template used to generate the previous config file [default : `'etc/xymon/clientlaunch.d/temp.cfg.j2'`].
 * **xymon_cli__plug_temp_interval** : Time between each run of the `temp` plugin [default : `'5m'`]
@@ -271,7 +260,6 @@ This role will :
 
 Some plugins and options can be managed with this role :
 * apt : Check state of packages and repositories.
-* kern : Check for outdated running kernel and need for reboot.
 * libs : Check for running processes with upgraded libraries.
 * mq : Check mail queue.
 * zfs : Check ZFS pools status.
@@ -296,7 +284,7 @@ Jérémy Gardais
 
 [vars directory]: ./vars
 [gogs to github hook]: https://stackoverflow.com/a/21998477
-[xymon source]: https://git.ipr.univ-rennes.fr/cellinfo/ansible.xymon
+[xymon source]: https://git.ipr.univ-rennes1.fr/cellinfo/ansible.xymon
 [xymon github]: https://github.com/ipr-cnrs/xymon
 [wtfpl website]: http://www.wtfpl.net/about/
 [ipr website]: https://ipr.univ-rennes1.fr/
@@ -304,7 +292,7 @@ Jérémy Gardais
 [url hwraid]: https://hwraid.le-vert.net/wiki/DebianPackages
 [megaraid plugin doc]: https://salsa.debian.org/debian/hobbit-plugins#megaraid-check-state-of-lsi-megaraid-sas-controllers
 [net plugin doc]: https://salsa.debian.org/debian/hobbit-plugins#net-check-network-interface-states
-[sge plugin source]: https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
+[sge plugin source]: https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
-[smartoverall plugin source]: https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
+[smartoverall plugin source]: https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
 [smart plugin source]: https://github.com/skazi0/xymon-plugins
 [zfs plugin source]: https://wiki.xymonton.org/doku.php/monitors:bb-zfs

defaults/main.yml

@@ -72,24 +72,9 @@ xymon_cli__plug_ipmi_tpl: 'etc/xymon/clientlaunch.d/ipmi.cfg.j2'
 xymon_cli__plug_ipmi_interval: '5m'
 
 ## ]]]
-## Plugin kern [[[
-xymon_cli__plug_kern_state: true
-xymon_cli__plug_kern_package: [ 'binutils', 'libfile-slurp-perl', 'libsort-naturally-perl' ]
-xymon_cli__plug_kern_path: '/etc/xymon/clientlaunch.d/kern.cfg'
-xymon_cli__plug_kern_tpl: 'etc/xymon/clientlaunch.d/kern.cfg.j2'
-xymon_cli__plug_kern_interval: '5m'
-
-### Related to "Ubuntu - Can't check kernel version" warning message
-### See : https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725/comments/35
-xymon_cli__plug_kern_fix: '{{ True if (ansible_distribution == "Ubuntu")
-                                   else False }}'
-xymon_cli__plug_kern_fix_path: '/etc/kernel/postinst.d/statoverride'
-xymon_cli__plug_kern_fix_tpl: 'etc/kernel/postinst.d/statoverride.j2'
-
-                                                                   # ]]]
 ## Plugin libs [[[
 xymon_cli__plug_libs_state: true
-xymon_cli__plug_libs_package: [ 'lsof', 'sudo', 'libyaml-tiny-perl' ]
+xymon_cli__plug_libs_package: [ 'binutils', 'lsof', 'libyaml-tiny-perl', 'libfile-slurp-perl', 'libsort-naturally-perl' ]
 xymon_cli__plug_libs_path: '/etc/xymon/clientlaunch.d/libs.cfg'
 xymon_cli__plug_libs_tpl: 'etc/xymon/clientlaunch.d/libs.cfg.j2'
 xymon_cli__plug_libs_interval: '5m'
@@ -97,19 +82,13 @@ xymon_cli__plug_libs_interval: '5m'
 xymon_cli__plug_libs_default_whitelist:
   /lib/systemd/systemd:
     - '.*'
-  /usr/libexec/sssd/sssd_autofs:
+  /usr/lib/x86_64-linux-gnu/sssd/sssd_be:
     - '.*'
-  /usr/libexec/sssd/sssd_be:
+  /usr/lib/x86_64-linux-gnu/sssd/sssd_autofs:
     - '.*'
-  /usr/libexec/sssd/sssd_nss:
+  /usr/lib/x86_64-linux-gnu/sssd/sssd_nss:
     - '.*'
-  /usr/libexec/sssd/sssd_pac:
+  /usr/lib/x86_64-linux-gnu/sssd/sssd_pam:
-    - '.*'
-  /usr/libexec/sssd/sssd_pam:
-    - '.*'
-  /usr/libexec/sssd/sssd_ssh:
-    - '.*'
-  /usr/libexec/sssd/sssd_sudo:
     - '.*'
   /usr/sbin/sssd:
     - '.*'
@@ -161,7 +140,7 @@ xymon_cli__plug_ntpq_interval: '5m'
 
 ## ]]]
 ## Plugin SGE [[[
-### From https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
+### From https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
 xymon_cli__plug_sge_state: False
 xymon_cli__plug_sge_script_path: '/usr/lib/xymon/client/ext/sge.sh'
 xymon_cli__plug_sge_script_tpl: 'usr/lib/xymon/client/ext/sge.sh.j2'
@@ -172,7 +151,7 @@ xymon_cli__plug_sge_interval: '5m'
 
                                                                    # ]]]
 ## Plugin smartoverall [[[
-### From https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
+### From https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
 ### And based on https://www.xymon.com/xymon-cgi/viewconf.sh?smart
 ### Mostly for disks unknown from smartmontools's database
 xymon_cli__plug_smartoverall_state: False
@@ -200,7 +179,7 @@ xymon_cli__plug_smart_interval: '10m'
 ## Plugin temp [[[
 ### Enable by default on hardware host
 xymon_cli__plug_temp_state: False
-xymon_cli__plug_temp_package: [ 'libfile-which-perl', 'libyaml-tiny-perl', 'smartmontools', 'libxml-twig-perl' ]
+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' ]
@@ -226,7 +205,6 @@ xymon_cli__plug_zfs_interval: '5m'
 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_kern_package              if xymon_cli__plug_kern_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 [])
@@ -248,9 +226,6 @@ xymon_cli__plug_combined_clientlaunch:
   - name: ipmi
     path: '{{ xymon_cli__plug_ipmi_path }}'
     template: '{{ xymon_cli__plug_ipmi_tpl }}'
-  - name: kern
-    path: '{{ xymon_cli__plug_kern_path }}'
-    template: '{{ xymon_cli__plug_kern_tpl }}'
   - name: libs
     path: '{{ xymon_cli__plug_libs_path }}'
     template: '{{ xymon_cli__plug_libs_tpl }}'
@@ -283,7 +258,7 @@ xymon_cli__plug_combined_clientlaunch:
     template: '{{ xymon_cli__plug_temp_tpl }}'
   - name: zfs
     path: '{{ xymon_cli__plug_zfs_path }}'
-    template: '{{ xymon_cli__plug_zfs_tpl }}'
+    template: '{{ xymon_cli__plug_temp_tpl }}'
 
                                                                    # ]]]
 

meta/main.yml

@@ -7,13 +7,12 @@ galaxy_info:
   description: "Manage Xymon configuration"
   license: WTFPL
   company: IPR
-  issue_tracker_url: https://git.ipr.univ-rennes.fr/cellinfo/ansible.xymon/issues
+  issue_tracker_url: https://git.ipr.univ-rennes1.fr/cellinfo/ansible.xymon/issues
   min_ansible_version: 2.7
   platforms:
   - name: Debian
     versions:
     - buster
-    - bullseye
     - stretch
   galaxy_tags:
     - system

tasks/main.yml

@@ -4,7 +4,7 @@
 # tasks file for ipr.ansible.xymon
 
 - name: Load specific OS vars for xymon
-  ansible.builtin.include_vars: "{{ item }}"
+  include_vars: "{{ item }}"
   with_first_found:
     - "{{ ansible_distribution|lower }}-{{ ansible_distribution_version }}.yml"
     - "{{ ansible_distribution|lower }}.yml"
@@ -12,16 +12,18 @@
 
 # Manage required client packages [[[1
 - name: client package
-  ansible.builtin.package:
+  package:
-    name: '{{ xymon_cli__pkg_list | flatten }}'
+    name: '{{ item }}'
     state: '{{ xymon_cli__pkg_state }}'
+  with_items:
+    - '{{ xymon_cli__pkg_list | to_nice_json }}'
   register: cli_result
   until: cli_result is success
   when: xymon_cli__manage|bool
 
 # Manage client configuration [[[1
 - name: CONFIG xymon-client service
-  ansible.builtin.template:
+  template:
     src: '{{ xymon_cli__default_conf_tpl }}'
     dest: '{{ xymon_cli__default_conf_path }}'
     owner: root
@@ -32,7 +34,7 @@
   notify: restart xymon-client service
 
 - name: CONFIG xymon user's groups
-  ansible.builtin.user:
+  user:
     name: xymon
     groups: '{{ xymon_cli__user_groups }}'
     append: true
@@ -41,7 +43,7 @@
 
 # Manage service [[[1
 - name: SERVICE manage '{{ xymon_cli__service_name }}'
-  ansible.builtin.service:
+  service:
     name: '{{ xymon_cli__service_name }}'
     state: started
     enabled: '{{ xymon_cli__service_enabled }}'
@@ -50,9 +52,11 @@
 
 # Manage all plugins's packages [[[1
 - name: PLUGINS package and dependencies
-  ansible.builtin.package:
+  package:
-    name: '{{ xymon_cli__plug_combined_packages | flatten }}'
+    name: '{{ item }}'
     state: 'present'
+  with_items:
+    - '{{ xymon_cli__plug_combined_packages | to_nice_json }}'
   when: (xymon_cli__manage|bool and
          xymon_cli__plug_manage|bool)
   register: combined_packages_plug_result
@@ -61,7 +65,7 @@
 
 # Manage plugins clientlaunch files [[[1
 - name: PLUGINS clientlaunch files
-  ansible.builtin.template:
+  template:
     src: '{{ item.template }}'
     dest: '{{ item.path }}'
     owner: root
@@ -75,7 +79,7 @@
 
 # Manage apt plugin [[[1
 - name: PLUGIN apt no_repo_accept whitelist
-  ansible.builtin.template:
+  template:
     src: 'etc/xymon/apt_no_repo_accept.j2'
     dest: '/etc/xymon/apt_no_repo_accept'
     owner: root
@@ -87,7 +91,7 @@
 
 # Manage libs plugin [[[1
 - name: PLUGIN libs whitelist
-  ansible.builtin.template:
+  template:
     src: 'etc/xymon/libs.local.yaml.j2'
     dest: '/etc/xymon/libs.local.yaml'
     owner: root
@@ -97,22 +101,9 @@
          xymon_cli__plug_manage|bool)
   notify: restart xymon-client service
 
-# Manage kern plugin [[[1
-- name: PLUGIN kern workaround
-  ansible.builtin.template:
-    src: '{{ xymon_cli__plug_kern_fix_tpl }}'
-    dest: '{{ xymon_cli__plug_kern_fix_path }}'
-    owner: root
-    group: root
-    mode: 0754
-  when: (xymon_cli__manage|bool and
-         xymon_cli__plug_manage|bool and
-         xymon_cli__plug_kern_fix|bool)
-  notify: restart xymon-client service
-
 # Manage net plugin [[[1
 - name: PLUGIN net config template
-  ansible.builtin.template:
+  template:
     src: '{{ xymon_cli__plug_net_conf_tpl }}'
     dest: '{{ xymon_cli__plug_net_conf_path }}'
     owner: root
@@ -124,7 +115,7 @@
 
 # Manage sge plugin [[[1
 - name: PLUGIN sge script file from template
-  ansible.builtin.template:
+  template:
     src: '{{ xymon_cli__plug_sge_script_tpl }}'
     dest: '{{ xymon_cli__plug_sge_script_path }}'
     owner: root
@@ -136,7 +127,7 @@
   notify: restart xymon-client service
 
 - name: PLUGIN sge script file from URL
-  ansible.builtin.get_url:
+  get_url:
     url:   '{{ xymon_cli__plug_sge_script_url }}'
     dest:  '{{ xymon_cli__plug_sge_script_path }}'
     owner: root
@@ -149,7 +140,7 @@
 
 # Manage smartoverall plugin [[[1
 - name: PLUGIN smartoverall script file from template
-  ansible.builtin.template:
+  template:
     src: '{{ xymon_cli__plug_smartoverall_script_tpl }}'
     dest: '{{ xymon_cli__plug_smartoverall_script_path }}'
     owner: root
@@ -161,7 +152,7 @@
   notify: restart xymon-client service
 
 - name: PLUGIN smartoverall script file from URL
-  ansible.builtin.get_url:
+  get_url:
     url:   '{{ xymon_cli__plug_smartoverall_script_url }}'
     dest:  '{{ xymon_cli__plug_smartoverall_script_path }}'
     owner: root
@@ -174,7 +165,7 @@
 
 # Manage smart plugin [[[1
 - name: PLUGIN smart script file from template
-  ansible.builtin.template:
+  template:
     src: '{{ xymon_cli__plug_smart_script_tpl }}'
     dest: '{{ xymon_cli__plug_smart_script_path }}'
     owner: root
@@ -186,7 +177,7 @@
   notify: restart xymon-client service
 
 - name: PLUGIN smart script file from URL
-  ansible.builtin.get_url:
+  get_url:
     url:   '{{ xymon_cli__plug_smart_script_url }}'
     dest:  '{{ xymon_cli__plug_smart_script_path }}'
     owner: root
@@ -199,7 +190,7 @@
 
 # Manage zfs plugin [[[1
 - name: PLUGIN zfs script file
-  ansible.builtin.template:
+  template:
     src: '{{ xymon_cli__plug_zfs_script_tpl }}'
     dest: '{{ xymon_cli__plug_zfs_script_path }}'
     owner: root

templates/etc/default/xymon-client.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 ## From ipr-cnrs.xymon role
 
 # Configure the Xymon client settings.

templates/etc/kernel/postinst.d/statoverride.j2

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-{# Use | comment to manage multilines #}
-# {{ ansible_managed | comment }}
-# Ansible template : {{ template_path }}
-#
-# Allow to fix the warning :
-#   "Kernel image /boot/vmlinuz… unreadable. Can't check kernel version!"
-
-# https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725
-# See comment #34 - https://bugs.launchpad.net/ubuntu/+source/linux/+bug/759725/comments/34
-
-set -e
-version="$1"
-if [ -z "$version" ]; then
-	exit 0
-fi
-exec dpkg-statoverride --force-statoverride-add --update --add root root 0644 "/boot/vmlinuz-${version}"

templates/etc/xymon/apt_no_repo_accept.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 ## From ipr-cnrs.xymon role
 {% for package in xymon_cli__plug_apt_combined_whitelist %}
 {{ package }}

templates/etc/xymon/clientlaunch.d/apt.cfg.j2

@@ -1,5 +1,5 @@
 [apt]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_apt_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2

@@ -1,5 +1,5 @@
 [ipmi]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ipmi_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/kern.cfg.j2

@@ -1,8 +0,0 @@
-[kern]
-	# {{ ansible_managed | comment }}
-	## From ipr-cnrs.xymon role
-	{{ '#DISABLED' if xymon_cli__plug_kern_state else 'DISABLED' }}
-	ENVFILE /etc/xymon/xymonclient.cfg
-	CMD $XYMONCLIENTHOME/ext/kern
-	LOGFILE /var/log/xymon/xymonclient.log
-	INTERVAL {{ xymon_cli__plug_kern_interval }}

templates/etc/xymon/clientlaunch.d/libs.cfg.j2

@@ -1,5 +1,5 @@
 [libs]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_libs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2

@@ -1,6 +1,6 @@
 # Requires megaclisas-status package from https://hwraid.le-vert.net/wiki/DebianPackages
 [megaraid]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_megaraid_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/mq.cfg.j2

@@ -1,5 +1,5 @@
 [mq]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_mq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/net.cfg.j2

@@ -1,8 +1,8 @@
 [net]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_net_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg
-	CMD /usr/bin/sudo -E -u root $XYMONCLIENTHOME/ext/net
+	CMD $XYMONCLIENTHOME/ext/net
 	LOGFILE /var/log/xymon/xymonclient.log
 	INTERVAL {{ xymon_cli__plug_net_interval }}

templates/etc/xymon/clientlaunch.d/netstats.cfg.j2

@@ -1,5 +1,5 @@
 [netstats]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_netstats_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2

@@ -1,5 +1,5 @@
 [ntpq]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_ntpq_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/sge.cfg.j2

@@ -1,5 +1,5 @@
 [sge]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_sge_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/smart.cfg.j2

@@ -1,5 +1,5 @@
 [smart]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_smart_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2

@@ -1,5 +1,5 @@
 [smartoverall]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_smartoverall_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/temp.cfg.j2

@@ -1,5 +1,5 @@
 [temp]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_temp_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/clientlaunch.d/zfs.cfg.j2

@@ -1,5 +1,5 @@
 [zfs]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_zfs_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

templates/etc/xymon/libs.local.yaml.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 ## From ipr-cnrs.xymon role
 {% set inputmerged = xymon_cli__plug_libs_default_whitelist.copy() %}
 {% set _ = inputmerged.update(xymon_cli__plug_libs_whitelist) %}

templates/etc/xymon/net.yaml.j2

@@ -1,4 +1,4 @@
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 ## From ipr-cnrs.xymon role
 {{ ansible_hostname }}:
   - {{ ansible_default_ipv4.interface }}

templates/usr/lib/xymon/client/ext/sge.sh.j2

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 # From ipr-cnrs.xymon role
-# https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
+# https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
 #
 # SGE: Sun Grid Engine check - Xymon external script test
 #

templates/usr/lib/xymon/client/ext/smart.j2

@@ -2,7 +2,7 @@
 # $Id: sensors 70 2011-11-25 09:21:18Z skazi $
 # Author: Jacek Tomasiak <jacek.tomasiak@gmail.com>
 
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 # From ipr-cnrs.xymon role
 # Thanks to Jacek Tomasiak − skazi0
 # https://github.com/skazi0/xymon-plugins/blob/master/client/ext/smart

templates/usr/lib/xymon/client/ext/smartoverall.j2

@@ -1,10 +1,10 @@
 #!/bin/sh
 # .. vim: foldmarker=[[[,]]]:foldmethod=marker
 
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 # From ipr-cnrs.xymon role
 # Source :
-# https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
+# https://git.ipr.univ-rennes1.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall
 
 # NOTE: Must be run as root, so you probably need to setup sudo for this.
 

templates/usr/lib/xymon/client/ext/zfs.j2

@@ -1,6 +1,6 @@
 #!/bin/ksh
 
-# {{ ansible_managed | comment }}
+# {{ ansible_managed }}
 # From ipr-cnrs.xymon role
 
 # Revision History: