CHANGELOG.md

@@ -1,16 +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
@@ -69,7 +56,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 +64,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

@@ -296,7 +296,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 +304,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

@@ -79,13 +79,6 @@ 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
@@ -97,19 +90,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 +148,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 +159,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

meta/main.yml

@@ -7,7 +7,7 @@ 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

tasks/main.yml

@@ -97,19 +97,6 @@
          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:

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,5 +1,5 @@
 [kern]
-	# {{ ansible_managed | comment }}
+	# {{ ansible_managed }}
 	## From ipr-cnrs.xymon role
 	{{ '#DISABLED' if xymon_cli__plug_kern_state else 'DISABLED' }}
 	ENVFILE /etc/xymon/xymonclient.cfg

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,5 +1,5 @@
 [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

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: