diff --git a/README.md b/README.md
index ffb86249eb74671c5ac2baaa79fa536c50eb6c85..6160bd5c8e4b1f2df88a87494b0410387a926ca1 100644
--- a/README.md
+++ b/README.md
@@ -28,18 +28,13 @@ Hosts from the following groups added to monitoring :
* docker_restrict_internet_access
* full_maintenance
* backup_server
-* docker_auth
* docker_drawio
* docker_etherpad
* docker_framadate
-* docker_jitsi
-* docker_mattermost
* docker_nagios
* docker_nextcloud
* docker_odoo
-* docker_owncloud
* docker_privatebin
-* docker_tuleap
* gitlab
* odoo_server
* owncloud_server
diff --git a/templates/templates.cfg.j2 b/templates/templates.cfg.j2
index a5df96a3e8247ba1b41a0d64569fb6dd0a980e6b..0dc98d731d9d3cc889c54e5d30977013f0557e75 100644
--- a/templates/templates.cfg.j2
+++ b/templates/templates.cfg.j2
@@ -90,7 +90,7 @@ define host{
define servicegroup{
servicegroup_name web-services
alias Services Web
- members {% for host in groups['odoo_server'] | sort %}{{ host }},Odoo {{ hostvars[host].odoo_url }},{% endfor %}{% for host in groups['owncloud_server'] | sort %}{{ host }},OwnCloud {{ hostvars[host].cloud_url }},{% endfor %}{% for host in groups['docker_odoo'] | sort %}{% for name, values in hostvars[host].odoo_instances.items() | default([]) %}{% if values.url is defined %}{{ host }},{{ name }} server {{ values.url }},{% endif %}{% if values.domains is defined and values.domains is string %}{{ host }},{{ name }} server {{ values.domains }},{% else %}{% for domain in values.domains | default([]) %}{{ host }},{{ name }} server {{ domain }},{% endfor %}{% endif %}{% endfor %}{% endfor %}{% for host in groups['docker_owncloud'] | union(groups['docker_nextcloud']) | sort %}{{ host }},Cloud Server {{ hostvars[host].cloud_url }},{% if hostvars[host].cloud_onlyoffice is defined %}{{ host }},OnlyOffice Server {{ hostvars[host].cloud_onlyoffice_url }},{% endif %}{% endfor %}{% for host in groups['docker_auth'] | sort %}{% if loop.index == loop.length %}{{ host }},PhpLdapAdmin {{ hostvars[host].ldap_url }},{{ host }},SSO Server {{ hostvars[host].sso_url }}{% else %}{{ host }},PhpLdapAdmin {{ hostvars[host].ldap_url }},{{ host }},SSO Server {{ hostvars[host].sso_url }},{% endif %}{% endfor %}
+ members {% for host in groups['odoo_server'] | sort %}{{ host }},Odoo {{ hostvars[host].odoo_url }},{% endfor %}{% for host in groups['owncloud_server'] | sort %}{{ host }},OwnCloud {{ hostvars[host].cloud_url }},{% endfor %}{% for host in groups['docker_odoo'] | sort %}{% for name, values in hostvars[host].odoo_instances.items() | default([]) %}{% if values.url is defined %}{{ host }},{{ name }} server {{ values.url }},{% endif %}{% if values.domains is defined and values.domains is string %}{{ host }},{{ name }} server {{ values.domains }},{% else %}{% for domain in values.domains | default([]) %}{{ host }},{{ name }} server {{ domain }},{% endfor %}{% endif %}{% endfor %}{% endfor %}{% for host in groups['docker_nextcloud'] | sort %}{{ host }},Cloud Server {{ hostvars[host].cloud_url }}{% if not loop.last %},{% endif %}{% endfor %}
}
@@ -148,22 +148,17 @@ define servicegroup{
members {{ groups['docker'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Docker Proxy,') }},Docker Proxy
}
-define servicegroup{
- servicegroup_name docker_auth
- alias Auth Dockers
- members {{ groups['docker_auth'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Docker LDAP,') }},Docker LDAP,{{ groups['docker_auth'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Docker SSO,') }},Docker SSO
- }
-
define servicegroup{
servicegroup_name docker_odoo
alias Odoo Dockers
- members {% for host in groups['docker_odoo'] | sort %}{% if host != 'Filament_Odoo' %}{% for name in hostvars[host].odoo_instances.keys() | default([]) %}{{ host }},Docker {{ name }},{% endfor %}{% endif %}{% if hostvars[host].restrict_internet_access and hostvars[host].whitelisted_urls is defined %}{{ host }},Docker Odoo Whitelists,{% endif %}{% endfor %}Filament_Odoo,Docker odoo,Filament_Odoo,Docker Odoo Whitelists
+ members {% for host in groups['docker_odoo'] | sort %}{% set outer_loop = loop %}{% for name in hostvars[host].odoo_instances.keys() | default([]) %}{{ host }},Docker {{ name }}{% if not (outer_loop.last and loop.last) %},{% endif %}{% endfor %}{% if hostvars[host].restrict_internet_access and hostvars[host].whitelisted_urls is defined %}{% if loop.last %},{% endif %}{{ host }},Docker Odoo Whitelists{% if not loop.last %},{% endif %}{% endif %}{% endfor %}
+
}
define servicegroup{
servicegroup_name docker_cloud
alias Cloud Dockers
- members {{ groups['docker_owncloud'] | union(groups['docker_nextcloud']) | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Docker Cloud,') }},Docker Cloud
+ members {{ groups['docker_nextcloud'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Docker Cloud,') }},Docker Cloud
}
# Generic service definition template - This is NOT a real service, just a template!
diff --git a/templates/vps.cfg.j2 b/templates/vps.cfg.j2
index 0b4666d56ca3a9a0c55ed46f52dd154ee1f8ffbe..c87798afb5a73d7f27fe6e8541f45abda2ccef5a 100644
--- a/templates/vps.cfg.j2
+++ b/templates/vps.cfg.j2
@@ -214,26 +214,10 @@ define service{
check_command check_nrpe!check_docker_proxy
}
-# Docker LDAP
-define service{
- use generic-service,graphed-service
- host_name {{ groups['docker_auth'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',') }}
- service_description Docker LDAP
- check_command check_nrpe!check_docker_ldap
- }
-
-# Docker SSO
-define service{
- use generic-service,graphed-service
- host_name {{ groups['docker_auth'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',') }}
- service_description Docker SSO
- check_command check_nrpe!check_docker_sso
- }
-
# Docker Cloud
define service{
use generic-service,graphed-service
- host_name {{ groups['docker_owncloud'] | union(groups.docker_nextcloud) | map('extract', hostvars, ['inventory_hostname']) | sort | join(',') }}
+ host_name {{ groups['docker_nextcloud'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',') }}
service_description Docker Cloud
check_command check_nrpe!check_docker_cloud
}
@@ -262,14 +246,6 @@ define service{
check_command check_nrpe!check_docker_framadate
}
-# Docker Jitsi
-define service{
- use generic-service,graphed-service
- host_name {{ groups['docker_jitsi'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',') }}
- service_description Docker Jitsi
- check_command check_nrpe!check_docker_jitsi
- }
-
# Docker PrivateBin
define service{
use generic-service,graphed-service
@@ -295,24 +271,6 @@ define service{
# Definition des services HTTP
-{% for host in groups['docker_auth'] | sort %}
-# {{ host }} Docker Auth
-define service{
- use generic-service
- host_name {{ host }}
- service_description PhpLdapAdmin {{ hostvars[host].ldap_url }}
- check_command check_https!'{{ hostvars[host].ldap_url }}'!/
- }
-
-define service{
- use generic-service
- host_name {{ host }}
- service_description SSO Server {{ hostvars[host].sso_url }}
- check_command check_https!'{{ hostvars[host].sso_url }}'!/
- }
-
-{% endfor %}
-
{% for host in groups['docker_odoo'] | sort %}
# {{ host }} Docker Odoo
{% if hostvars[host].restrict_internet_access and hostvars[host].whitelisted_urls is defined %}
@@ -364,7 +322,7 @@ define service{
{% endfor %}
{% endfor %}
-{% for host in groups['docker_owncloud'] | union(groups['docker_nextcloud']) | sort %}
+{% for host in groups['docker_nextcloud'] | sort %}
# {{ host }} Docker Cloud
define service{
use generic-service