cellinfo
/
ansible.xymon
2
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow multi-lines with ansible_managed | comment

This commit is contained in:
GARDAIS Jeremy 2024-09-09 16:52:05 +02:00
parent 745f3bd3a6
commit 4571ea58cb
Signed by: jegardai
GPG Key ID: E759BAA22501AF32
23 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,3 +1,8 @@
## v2.2.0
### Enhancements
* Use **comment** filter for ansible_managed, to allow multi-lines.
## v2.1.0 ## v2.1.0
### Enhancements ### Enhancements

2
templates/etc/default/xymon-client.j2
View File

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

2
templates/etc/xymon/apt_no_repo_accept.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/apt.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/ipmi.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/kern.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/libs.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/megaraid.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/mq.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/net.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/netstats.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/ntpq.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/sge.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/smart.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/smartoverall.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/temp.cfg.j2
View File

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

2
templates/etc/xymon/clientlaunch.d/zfs.cfg.j2
View File

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

2
templates/etc/xymon/libs.local.yaml.j2
View File

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

2
templates/etc/xymon/net.yaml.j2
View File

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

2
templates/usr/lib/xymon/client/ext/sge.sh.j2
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# {{ ansible_managed }} # {{ ansible_managed | comment }}
# From ipr-cnrs.xymon role # 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-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/sge.sh
# #

2
templates/usr/lib/xymon/client/ext/smart.j2
View File

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

2
templates/usr/lib/xymon/client/ext/smartoverall.j2
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
# .. vim: foldmarker=[[[,]]]:foldmethod=marker # .. vim: foldmarker=[[[,]]]:foldmethod=marker
# {{ ansible_managed }} # {{ ansible_managed | comment }}
# From ipr-cnrs.xymon role # From ipr-cnrs.xymon role
# Source : # Source :
# https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall # https://git.ipr.univ-rennes.fr/cellinfo/scripts/src/master/xymon/plugins/client/ext/smartoverall

2
templates/usr/lib/xymon/client/ext/zfs.j2
View File

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