diff --git a/README.md b/README.md
index 28cf3bb3c8e7958786a89ae7f08add381f48b84c..feb9ef2ea0b8479c17307d0efeb7280ee1d2468f 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,6 @@ Role Variables
Variables from default directory :
* nagios_url: URL on which Nagios will be listening
-* win_srv_ip: IP address of Windows server
-* win_b2b_url: URL for B2B exchange server
* webhooks_to_be_called_daily: list of WebHooks to be called daily
* services_to_be_monitored: list of extra services to be monitored
diff --git a/defaults/main.yml b/defaults/main.yml
index d487c0aa98e650335d29dbb46c8c1e56f8b8c554..ae4454ebbcc535b05166dd38ed7b54569fd48aad 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -2,10 +2,6 @@
# Nagios URL
nagios_url: "nagios.example.org"
-# Windows server
-win_srv_ip: 10.12.12.12
-win_b2b_url: b2b.example.org
-
# Webhooks to be triggered daily
webhooks_to_be_called_daily:
- name: Docker Odoo
diff --git a/files/nagios.cfg b/files/nagios.cfg
index be12b318a9fd4017c7216c57a0ea9eb4ec4e8049..ea88698041473cfc2b728a4b6cea9ad7a57a3e3e 100644
--- a/files/nagios.cfg
+++ b/files/nagios.cfg
@@ -37,25 +37,6 @@ cfg_file=/opt/nagios/etc/objects/localhost.cfg
# Definition des serveurs a superviser
cfg_file=/opt/nagios/etc/objects/vps.cfg
-# Definitions for monitoring a Windows machine
-cfg_file=/opt/nagios/etc/objects/windows.cfg
-
-# Definitions for monitoring a router/switch
-#cfg_file=/opt/nagios/etc/objects/switch.cfg
-
-# Definitions for monitoring a network printer
-#cfg_file=/opt/nagios/etc/objects/printer.cfg
-
-
-# You can also tell Nagios to process all config files (with a .cfg
-# extension) in a particular directory by using the cfg_dir
-# directive as shown below:
-
-#cfg_dir=/opt/nagios/etc/servers
-#cfg_dir=/opt/nagios/etc/printers
-#cfg_dir=/opt/nagios/etc/switches
-#cfg_dir=/opt/nagios/etc/routers
-
diff --git a/tasks/main.yml b/tasks/main.yml
index 06ad2f1e6710f6ae49dec2e2006f6f572c7cd1fb..53a396e837e5e5d2d92f02d3eef8196c439ae85c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -80,7 +80,6 @@
- templates.cfg
- contacts.cfg
- commands.cfg
- - windows.cfg
- timeperiods.cfg
notify: restart nagios docker
tags: nagios_config
diff --git a/templates/templates.cfg.j2 b/templates/templates.cfg.j2
index 37dd4a3a63dd61c77c42571d709377668e7605ad..ca7dbf6e6cf77f583641b29efedec68ade6bf389 100644
--- a/templates/templates.cfg.j2
+++ b/templates/templates.cfg.j2
@@ -102,19 +102,19 @@ define servicegroup{
define servicegroup{
servicegroup_name disk-utilisation
alias Utilisation du disque
- members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Espace Disque,') }},Espace Disque,Windows-Server,Espace Disque C:,Windows-Server,Espace Disque U:,Windows-Server,Espace Disque W:
+ members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Espace Disque,') }},Espace Disque
}
define servicegroup{
servicegroup_name cpu-utilisation
alias Utilisation CPU
- members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Charge CPU,') }},Charge CPU,Windows-Server,Charge CPU
+ members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Charge CPU,') }},Charge CPU
}
define servicegroup{
servicegroup_name ram-utilisation
alias Utilisation RAM
- members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Charge RAM,') }},Charge RAM,Windows-Server,Charge RAM
+ members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Charge RAM,') }},Charge RAM
}
define servicegroup{
@@ -126,7 +126,7 @@ define servicegroup{
define servicegroup{
servicegroup_name services
alias Services
- members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',SSHD Service,') }},SSHD Service,{{ groups['odoo_server'] | union(groups['owncloud_server']) | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Nginx Service,') }},Nginx Service,{{ groups['odoo_server'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Odoo Service,') }},Odoo Service,{{ groups['owncloud_server'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Owncloud Service,') }},Owncloud Service,{% for host in groups['full_maintenance'] | sort %}{% if hostvars[host].log_collection %}{{ host }},Filebeat Service,{% endif %}{% endfor %}{{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Services en cours,') }},Services en cours,Windows-Server,NetDrive2,Windows-Server,NsClient++,Windows-Server,RDP,Windows-Server,Services en cours,Windows-Server,Sophos,Nagios Server,Nagios Service
+ members {{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',SSHD Service,') }},SSHD Service,{{ groups['odoo_server'] | union(groups['owncloud_server']) | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Nginx Service,') }},Nginx Service,{{ groups['odoo_server'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Odoo Service,') }},Odoo Service,{{ groups['owncloud_server'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Owncloud Service,') }},Owncloud Service,{% for host in groups['full_maintenance'] | sort %}{% if hostvars[host].log_collection %}{{ host }},Filebeat Service,{% endif %}{% endfor %}{{ groups['all'] | map('extract', hostvars, ['inventory_hostname']) | sort | join(',Services en cours,') }},Services en cours,Nagios Server,Nagios Service
}
define servicegroup{
diff --git a/templates/windows.cfg.j2 b/templates/windows.cfg.j2
deleted file mode 100644
index ed292f64de87222b29360c7e9763223e87b667bf..0000000000000000000000000000000000000000
--- a/templates/windows.cfg.j2
+++ /dev/null
@@ -1,162 +0,0 @@
-###############################################################################
-###############################################################################
-#
-# HOST DEFINITION
-#
-###############################################################################
-###############################################################################
-
-# Define a host for the local machine
-define host{
- use generic-host
- host_name Windows-Server
- alias Windows-Server
- address {{ win_srv_ip }}
- check_command check_nrpe_win!check_os_version
- }
-
-###############################################################################
-###############################################################################
-#
-# HOST GROUP DEFINITION
-#
-###############################################################################
-###############################################################################
-
-# Define an optional hostgroup for Linux machines
-
-define hostgroup{
- hostgroup_name serveurs_win
- alias Serveurs Windows
- members Windows-Server
- }
-
-
-
-###############################################################################
-###############################################################################
-#
-# SERVICE DEFINITIONS
-#
-###############################################################################
-###############################################################################
-
-
-# Define a service to check the disk space of the root partition
-# on the local machine. Warning if < 20% free, critical if
-# < 10% free space on partition.
-
-define service{
- use generic-service,graphed-service
- host_name Windows-Server
- service_description Espace Disque C:
- check_command check_nrpe_win!check_drivesize!-a drive=C show-all
- }
-
-define service{
- use generic-service
- host_name Windows-Server
- service_description Espace Disque U:
- check_command check_nrpe_win!check_drivesize!-t 120 -a drive=U
- }
-
-define service{
- use generic-service
- host_name Windows-Server
- service_description Espace Disque W:
- check_command check_nrpe_win!check_drivesize!-t 120 -a drive=W
- }
-
-define service{
- use daily-service
- host_name Windows-Server
- service_description Fichiers Sophos SECMON
- check_command check_nrpe_win!check_files!-t 120 -a "path=W:\\" "filter=access >= -7d" "ok=count = 4" "warn=count > 4" "crit=count < 4" show-all
- }
-
-define service{
- use daily-service
- host_name Windows-Server
- service_description Fichiers Sophos SOIF
- check_command check_nrpe_win!check_files!-t 120 -a "path=U:\\" "filter=access >= -7d" "ok=count = 3" "warn=count > 3" "crit=count < 3" show-all
- }
-
-# Define a service to check the number of currently running procs
-# on the local machine. Warning if > 250 processes, critical if
-# > 400 processes.
-
-define service{
- use generic-service,graphed-service
- host_name Windows-Server
- service_description Services en cours
- check_command check_nrpe_win!check_process!-a "warn=count > 120" "crit=count > 130" show-all
- }
-
-
-# Define a service to check the load on the local machine.
-
-define service{
- use generic-service,graphed-service
- host_name Windows-Server
- service_description Charge CPU
- check_command check_nrpe_win!check_cpu!-a show-all time=1h time=30m time=15m
- }
-
-# Define a service to check the RAM on the local machine.
-
-define service{
- use generic-service,graphed-service
- host_name Windows-Server
- service_description Charge RAM
- check_command check_nrpe_win!check_memory!-a show-all
- }
-
-# Sophos
-define service{
- use generic-service
- host_name Windows-Server
- service_description Sophos
- check_command check_nrpe_win!check_process!-a process=sqlservr.exe process=SophosUpdateMgr.exe process=SUMService.exe process=MgntSvc.exe process=ManagementAgentNT.exe process=Sophos.FrontEnd.Service.exe show-all
- }
-
-# RDP
-define service{
- use generic-service
- host_name Windows-Server
- service_description RDP
- check_command check_nrpe_win!check_service!-a service=UmRdpService show-all
- }
-
-# NetDrive2
-define service{
- use generic-service
- host_name Windows-Server
- service_description NetDrive2
- check_command check_nrpe_win!check_process!-a process=NetDrive2.exe process=nd2svc.exe show-all
- }
-
-# Log forward
-#define service{
-# use generic-service
-# host_name Windows-Server
-# service_description Log Forwarder
-# check_command check_nrpe_win!check_service!-a service=nxlog show-all
-# }
-
-# NsClient++
-define service{
- use generic-service
- host_name Windows-Server
- service_description NsClient++
- check_command check_nrpe_win!check_service!-a service=nscp show-all
- }
-
-
-# Define a service to check the
-# availability of the Thales B2B portal
-define service{
- use generic-service
- host_name Windows-Server
- service_description Portail B2B
- check_command check_https!'{{ win_b2b_url }}'!/client/index.php/
- }