251 files changed, 40 insertions, 0 deletions

diff --git a/Monitoring/collectd/collectd.conf b/Monitoring/collectd/collectd.conf
new file mode 100644
index 00000000..8779f418
--- /dev/null
+++ b/Monitoring/collectd/collectd.conf
@@ -0,0 +1,37 @@
+Hostname "HOST1"
+Interval 10
+LoadPlugin cpu
+LoadPlugin df
+LoadPlugin disk
+LoadPlugin interface
+LoadPlugin load
+LoadPlugin memory
+LoadPlugin swap
+LoadPlugin users
+
+<Plugin interface>
+  Interface "eth0"
+  Interface "retiolum"
+</Plugin>
+
+<Plugin df>
+  Device "/dev/xvda1"
+  IgnoreSelected false
+</Plugin>
+<Plugin disk>
+  Disk "/xvda/"
+  IgnoreSelected false
+</Plugin>
+
+LoadPlugin "write_graphite"
+<Plugin "write_graphite">
+ <Carbon>
+   Host "no_omo.retiolum"
+   Port "2003"
+   Prefix "retiolum."
+   #Postfix ""
+   EscapeCharacter "_"
+   StoreRates false
+   AlwaysAppendDS false
+ </Carbon>
+</Plugin>
diff --git a/Monitoring/collectd/supervisor.d/collectd.conf b/Monitoring/collectd/supervisor.d/collectd.conf
new file mode 100644
index 00000000..a6334d70
--- /dev/null
+++ b/Monitoring/collectd/supervisor.d/collectd.conf
@@ -0,0 +1,3 @@
+[program:collectd]
+command=collectd -C /etc/collectd.conf -f
+autorestart=true
diff --git a/Monitoring/Makefile b/Monitoring/nagios/Makefile
index 4730f30d..4730f30d 100644
--- a/Monitoring/Makefile
+++ b/Monitoring/nagios/Makefile
diff --git a/Monitoring/TODO b/Monitoring/nagios/TODO
index e69de29b..e69de29b 100644
--- a/Monitoring/TODO
+++ b/Monitoring/nagios/TODO
diff --git a/Monitoring/conf/extinfo.cfg b/Monitoring/nagios/conf/extinfo.cfg
index e4300b72..e4300b72 100644
--- a/Monitoring/conf/extinfo.cfg
+++ b/Monitoring/nagios/conf/extinfo.cfg
diff --git a/Monitoring/conf/hostgroups_generic.cfg b/Monitoring/nagios/conf/hostgroups_generic.cfg
index 4e3625c5..4e3625c5 100644
--- a/Monitoring/conf/hostgroups_generic.cfg
+++ b/Monitoring/nagios/conf/hostgroups_generic.cfg
diff --git a/Monitoring/conf/krebs_hosts.cfg b/Monitoring/nagios/conf/krebs_hosts.cfg
index a929fa19..a929fa19 100644
--- a/Monitoring/conf/krebs_hosts.cfg
+++ b/Monitoring/nagios/conf/krebs_hosts.cfg
diff --git a/Monitoring/conf/krebsnet.cfg b/Monitoring/nagios/conf/krebsnet.cfg
index ae5b898e..ae5b898e 100644
--- a/Monitoring/conf/krebsnet.cfg
+++ b/Monitoring/nagios/conf/krebsnet.cfg
diff --git a/Monitoring/conf/localhost.cfg b/Monitoring/nagios/conf/localhost.cfg
index 3b098195..3b098195 100644
--- a/Monitoring/conf/localhost.cfg
+++ b/Monitoring/nagios/conf/localhost.cfg
diff --git a/Monitoring/conf/other_hosts.cfg b/Monitoring/nagios/conf/other_hosts.cfg
index bbdc676a..bbdc676a 100644
--- a/Monitoring/conf/other_hosts.cfg
+++ b/Monitoring/nagios/conf/other_hosts.cfg
diff --git a/Monitoring/conf/services.cfg b/Monitoring/nagios/conf/services.cfg
index e3a61eb0..e3a61eb0 100644
--- a/Monitoring/conf/services.cfg
+++ b/Monitoring/nagios/conf/services.cfg
diff --git a/Monitoring/conf/shack_contacts.cfg b/Monitoring/nagios/conf/shack_contacts.cfg
index 832a215e..832a215e 100644
--- a/Monitoring/conf/shack_contacts.cfg
+++ b/Monitoring/nagios/conf/shack_contacts.cfg
diff --git a/Monitoring/conf/shack_guests.cfg b/Monitoring/nagios/conf/shack_guests.cfg
index 67abdfce..67abdfce 100644
--- a/Monitoring/conf/shack_guests.cfg
+++ b/Monitoring/nagios/conf/shack_guests.cfg
diff --git a/Monitoring/conf/shack_infrastructure.cfg b/Monitoring/nagios/conf/shack_infrastructure.cfg
index f404f3e4..f404f3e4 100644
--- a/Monitoring/conf/shack_infrastructure.cfg
+++ b/Monitoring/nagios/conf/shack_infrastructure.cfg
diff --git a/Monitoring/conf/shacknet.cfg b/Monitoring/nagios/conf/shacknet.cfg
index 802e5e3a..802e5e3a 100644
--- a/Monitoring/conf/shacknet.cfg
+++ b/Monitoring/nagios/conf/shacknet.cfg
diff --git a/Monitoring/conf/templates.cfg b/Monitoring/nagios/conf/templates.cfg
index 41807e1c..41807e1c 100644
--- a/Monitoring/conf/templates.cfg
+++ b/Monitoring/nagios/conf/templates.cfg
diff --git a/Monitoring/conf/timeperiods.cfg b/Monitoring/nagios/conf/timeperiods.cfg
index 55ecf9df..55ecf9df 100644
--- a/Monitoring/conf/timeperiods.cfg
+++ b/Monitoring/nagios/conf/timeperiods.cfg
diff --git a/Monitoring/conf/tinc_hosts.cfg b/Monitoring/nagios/conf/tinc_hosts.cfg
index 717c75a8..717c75a8 100644
--- a/Monitoring/conf/tinc_hosts.cfg
+++ b/Monitoring/nagios/conf/tinc_hosts.cfg
diff --git a/Monitoring/conf/tincnet.cfg b/Monitoring/nagios/conf/tincnet.cfg
index f0b35b4e..f0b35b4e 100644
--- a/Monitoring/conf/tincnet.cfg
+++ b/Monitoring/nagios/conf/tincnet.cfg
diff --git a/Monitoring/htdocs/images/logos/krebs/bitcoin_miner.gd2 b/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2
index 5e585c62..5e585c62 100644
--- a/Monitoring/htdocs/images/logos/krebs/bitcoin_miner.gd2
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.gd2
diff --git a/Monitoring/htdocs/images/logos/krebs/bitcoin_miner.png b/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png
index 87200fe4..87200fe4 100644
--- a/Monitoring/htdocs/images/logos/krebs/bitcoin_miner.png
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/bitcoin_miner.png
diff --git a/Monitoring/htdocs/images/logos/krebs/favicon.ico b/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico
index fa18384c..fa18384c 100644
--- a/Monitoring/htdocs/images/logos/krebs/favicon.ico
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/favicon.ico
diff --git a/Monitoring/htdocs/images/logos/krebs/krebs.gd2 b/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2
index 1113f03e..1113f03e 100644
--- a/Monitoring/htdocs/images/logos/krebs/krebs.gd2
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/krebs.gd2
diff --git a/Monitoring/htdocs/images/logos/krebs/krebs.png b/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png
index 3c40512c..3c40512c 100644
--- a/Monitoring/htdocs/images/logos/krebs/krebs.png
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/krebs.png
diff --git a/Monitoring/htdocs/images/logos/krebs/shack.gd2 b/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2
index 8b0d98e5..8b0d98e5 100644
--- a/Monitoring/htdocs/images/logos/krebs/shack.gd2
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/shack.gd2
diff --git a/Monitoring/htdocs/images/logos/krebs/shack.png b/Monitoring/nagios/htdocs/images/logos/krebs/shack.png
index 53f1275b..53f1275b 100644
--- a/Monitoring/htdocs/images/logos/krebs/shack.png
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/shack.png
diff --git a/Monitoring/htdocs/images/logos/krebs/tinc.gd2 b/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2
index 36572d4a..36572d4a 100644
--- a/Monitoring/htdocs/images/logos/krebs/tinc.gd2
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/tinc.gd2
diff --git a/Monitoring/htdocs/images/logos/krebs/tinc.png b/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png
index daa1fdeb..daa1fdeb 100644
--- a/Monitoring/htdocs/images/logos/krebs/tinc.png
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/tinc.png
diff --git a/Monitoring/htdocs/images/logos/krebs/wireless_access_point.gd2 b/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2
index 6e740ec4..6e740ec4 100644
--- a/Monitoring/htdocs/images/logos/krebs/wireless_access_point.gd2
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.gd2
diff --git a/Monitoring/htdocs/images/logos/krebs/wireless_access_point.png b/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png
index 9febe45e..9febe45e 100644
--- a/Monitoring/htdocs/images/logos/krebs/wireless_access_point.png
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point.png
diff --git a/Monitoring/htdocs/images/logos/krebs/wireless_access_point_64.png b/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png
index fe9788af..fe9788af 100644
--- a/Monitoring/htdocs/images/logos/krebs/wireless_access_point_64.png
+++ b/Monitoring/nagios/htdocs/images/logos/krebs/wireless_access_point_64.png
diff --git a/Monitoring/htpasswd.users b/Monitoring/nagios/htpasswd.users
index 7d4bbd6c..7d4bbd6c 100644
--- a/Monitoring/htpasswd.users
+++ b/Monitoring/nagios/htpasswd.users
diff --git a/Monitoring/plugins/check.bat b/Monitoring/nagios/plugins/check.bat
index e69de29b..e69de29b 100755
--- a/Monitoring/plugins/check.bat
+++ b/Monitoring/nagios/plugins/check.bat
diff --git a/Monitoring/plugins/check.sh b/Monitoring/nagios/plugins/check.sh
index 9e62fbee..9e62fbee 100755
--- a/Monitoring/plugins/check.sh
+++ b/Monitoring/nagios/plugins/check.sh
diff --git a/Monitoring/plugins/check_apt b/Monitoring/nagios/plugins/check_apt
index 2371c32d..2371c32d 100755
--- a/Monitoring/plugins/check_apt
+++ b/Monitoring/nagios/plugins/check_apt
diff --git a/Monitoring/plugins/check_bgpstate b/Monitoring/nagios/plugins/check_bgpstate
index 645d7505..645d7505 100755
--- a/Monitoring/plugins/check_bgpstate
+++ b/Monitoring/nagios/plugins/check_bgpstate
diff --git a/Monitoring/plugins/check_breeze b/Monitoring/nagios/plugins/check_breeze
index d0382e69..d0382e69 100755
--- a/Monitoring/plugins/check_breeze
+++ b/Monitoring/nagios/plugins/check_breeze
diff --git a/Monitoring/plugins/check_btcguild_miner b/Monitoring/nagios/plugins/check_btcguild_miner
index 2e6a8de3..2e6a8de3 100755
--- a/Monitoring/plugins/check_btcguild_miner
+++ b/Monitoring/nagios/plugins/check_btcguild_miner
diff --git a/Monitoring/plugins/check_by_ssh b/Monitoring/nagios/plugins/check_by_ssh
index 5f969058..5f969058 100755
--- a/Monitoring/plugins/check_by_ssh
+++ b/Monitoring/nagios/plugins/check_by_ssh
diff --git a/Monitoring/plugins/check_clamd b/Monitoring/nagios/plugins/check_clamd
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_clamd
+++ b/Monitoring/nagios/plugins/check_clamd
diff --git a/Monitoring/plugins/check_cluster b/Monitoring/nagios/plugins/check_cluster
index 8d6dbb90..8d6dbb90 100755
--- a/Monitoring/plugins/check_cluster
+++ b/Monitoring/nagios/plugins/check_cluster
diff --git a/Monitoring/plugins/check_cpu b/Monitoring/nagios/plugins/check_cpu
index 26a93da5..26a93da5 100755
--- a/Monitoring/plugins/check_cpu
+++ b/Monitoring/nagios/plugins/check_cpu
diff --git a/Monitoring/plugins/check_dhcp b/Monitoring/nagios/plugins/check_dhcp
index 6b51224f..6b51224f 100755
--- a/Monitoring/plugins/check_dhcp
+++ b/Monitoring/nagios/plugins/check_dhcp
diff --git a/Monitoring/plugins/check_dig b/Monitoring/nagios/plugins/check_dig
index 650608dc..650608dc 100755
--- a/Monitoring/plugins/check_dig
+++ b/Monitoring/nagios/plugins/check_dig
diff --git a/Monitoring/plugins/check_disk b/Monitoring/nagios/plugins/check_disk
index 43dc43a3..43dc43a3 100755
--- a/Monitoring/plugins/check_disk
+++ b/Monitoring/nagios/plugins/check_disk
diff --git a/Monitoring/plugins/check_disk_smb b/Monitoring/nagios/plugins/check_disk_smb
index 80fa6779..80fa6779 100755
--- a/Monitoring/plugins/check_disk_smb
+++ b/Monitoring/nagios/plugins/check_disk_smb
diff --git a/Monitoring/plugins/check_dns b/Monitoring/nagios/plugins/check_dns
index 8a80b991..8a80b991 100755
--- a/Monitoring/plugins/check_dns
+++ b/Monitoring/nagios/plugins/check_dns
diff --git a/Monitoring/plugins/check_dummy b/Monitoring/nagios/plugins/check_dummy
index b66006ac..b66006ac 100755
--- a/Monitoring/plugins/check_dummy
+++ b/Monitoring/nagios/plugins/check_dummy
diff --git a/Monitoring/plugins/check_dummy.sh b/Monitoring/nagios/plugins/check_dummy.sh
index fe834bd0..fe834bd0 100755
--- a/Monitoring/plugins/check_dummy.sh
+++ b/Monitoring/nagios/plugins/check_dummy.sh
diff --git a/Monitoring/plugins/check_file_age b/Monitoring/nagios/plugins/check_file_age
index 7f20bad7..7f20bad7 100755
--- a/Monitoring/plugins/check_file_age
+++ b/Monitoring/nagios/plugins/check_file_age
diff --git a/Monitoring/plugins/check_flexlm b/Monitoring/nagios/plugins/check_flexlm
index 532785ef..532785ef 100755
--- a/Monitoring/plugins/check_flexlm
+++ b/Monitoring/nagios/plugins/check_flexlm
diff --git a/Monitoring/plugins/check_fping b/Monitoring/nagios/plugins/check_fping
index 3d2b16f9..3d2b16f9 100755
--- a/Monitoring/plugins/check_fping
+++ b/Monitoring/nagios/plugins/check_fping
diff --git a/Monitoring/plugins/check_ftp b/Monitoring/nagios/plugins/check_ftp
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_ftp
+++ b/Monitoring/nagios/plugins/check_ftp
diff --git a/Monitoring/plugins/check_game b/Monitoring/nagios/plugins/check_game
index 68c4bda4..68c4bda4 100755
--- a/Monitoring/plugins/check_game
+++ b/Monitoring/nagios/plugins/check_game
diff --git a/Monitoring/plugins/check_host b/Monitoring/nagios/plugins/check_host
index 97878096..97878096 120000
--- a/Monitoring/plugins/check_host
+++ b/Monitoring/nagios/plugins/check_host
diff --git a/Monitoring/plugins/check_hpjd b/Monitoring/nagios/plugins/check_hpjd
index 75af60de..75af60de 100755
--- a/Monitoring/plugins/check_hpjd
+++ b/Monitoring/nagios/plugins/check_hpjd
diff --git a/Monitoring/plugins/check_http b/Monitoring/nagios/plugins/check_http
index 2143dc6e..2143dc6e 100755
--- a/Monitoring/plugins/check_http
+++ b/Monitoring/nagios/plugins/check_http
diff --git a/Monitoring/plugins/check_icmp b/Monitoring/nagios/plugins/check_icmp
index 3e43c4d6..3e43c4d6 100755
--- a/Monitoring/plugins/check_icmp
+++ b/Monitoring/nagios/plugins/check_icmp
diff --git a/Monitoring/plugins/check_ide_smart b/Monitoring/nagios/plugins/check_ide_smart
index e52727f4..e52727f4 100755
--- a/Monitoring/plugins/check_ide_smart
+++ b/Monitoring/nagios/plugins/check_ide_smart
diff --git a/Monitoring/plugins/check_ifoperstatus b/Monitoring/nagios/plugins/check_ifoperstatus
index 23b25d5d..23b25d5d 100755
--- a/Monitoring/plugins/check_ifoperstatus
+++ b/Monitoring/nagios/plugins/check_ifoperstatus
diff --git a/Monitoring/plugins/check_ifstatus b/Monitoring/nagios/plugins/check_ifstatus
index b977675e..b977675e 100755
--- a/Monitoring/plugins/check_ifstatus
+++ b/Monitoring/nagios/plugins/check_ifstatus
diff --git a/Monitoring/plugins/check_imap b/Monitoring/nagios/plugins/check_imap
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_imap
+++ b/Monitoring/nagios/plugins/check_imap
diff --git a/Monitoring/plugins/check_ircd b/Monitoring/nagios/plugins/check_ircd
index 21d367ed..21d367ed 100755
--- a/Monitoring/plugins/check_ircd
+++ b/Monitoring/nagios/plugins/check_ircd
diff --git a/Monitoring/plugins/check_jabber b/Monitoring/nagios/plugins/check_jabber
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_jabber
+++ b/Monitoring/nagios/plugins/check_jabber
diff --git a/Monitoring/plugins/check_ldap b/Monitoring/nagios/plugins/check_ldap
index ea4e3346..ea4e3346 100755
--- a/Monitoring/plugins/check_ldap
+++ b/Monitoring/nagios/plugins/check_ldap
diff --git a/Monitoring/plugins/check_ldaps b/Monitoring/nagios/plugins/check_ldaps
index 928c9e7c..928c9e7c 120000
--- a/Monitoring/plugins/check_ldaps
+++ b/Monitoring/nagios/plugins/check_ldaps
diff --git a/Monitoring/plugins/check_linux_raid b/Monitoring/nagios/plugins/check_linux_raid
index ab982cd6..ab982cd6 100755
--- a/Monitoring/plugins/check_linux_raid
+++ b/Monitoring/nagios/plugins/check_linux_raid
diff --git a/Monitoring/plugins/check_load b/Monitoring/nagios/plugins/check_load
index 8501ea65..8501ea65 100755
--- a/Monitoring/plugins/check_load
+++ b/Monitoring/nagios/plugins/check_load
diff --git a/Monitoring/plugins/check_log b/Monitoring/nagios/plugins/check_log
index 4b60b5de..4b60b5de 100755
--- a/Monitoring/plugins/check_log
+++ b/Monitoring/nagios/plugins/check_log
diff --git a/Monitoring/plugins/check_mailq b/Monitoring/nagios/plugins/check_mailq
index 01a147b9..01a147b9 100755
--- a/Monitoring/plugins/check_mailq
+++ b/Monitoring/nagios/plugins/check_mailq
diff --git a/Monitoring/plugins/check_mem.pl b/Monitoring/nagios/plugins/check_mem.pl
index 99e2b1f7..99e2b1f7 100755
--- a/Monitoring/plugins/check_mem.pl
+++ b/Monitoring/nagios/plugins/check_mem.pl
diff --git a/Monitoring/plugins/check_mrtg b/Monitoring/nagios/plugins/check_mrtg
index 33a912e6..33a912e6 100755
--- a/Monitoring/plugins/check_mrtg
+++ b/Monitoring/nagios/plugins/check_mrtg
diff --git a/Monitoring/plugins/check_mrtgtraf b/Monitoring/nagios/plugins/check_mrtgtraf
index ca686d72..ca686d72 100755
--- a/Monitoring/plugins/check_mrtgtraf
+++ b/Monitoring/nagios/plugins/check_mrtgtraf
diff --git a/Monitoring/plugins/check_mysql b/Monitoring/nagios/plugins/check_mysql
index 5dd232b2..5dd232b2 100755
--- a/Monitoring/plugins/check_mysql
+++ b/Monitoring/nagios/plugins/check_mysql
diff --git a/Monitoring/plugins/check_mysql_query b/Monitoring/nagios/plugins/check_mysql_query
index c456440f..c456440f 100755
--- a/Monitoring/plugins/check_mysql_query
+++ b/Monitoring/nagios/plugins/check_mysql_query
diff --git a/Monitoring/plugins/check_nagios b/Monitoring/nagios/plugins/check_nagios
index 4cb2614e..4cb2614e 100755
--- a/Monitoring/plugins/check_nagios
+++ b/Monitoring/nagios/plugins/check_nagios
diff --git a/Monitoring/plugins/check_nntp b/Monitoring/nagios/plugins/check_nntp
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_nntp
+++ b/Monitoring/nagios/plugins/check_nntp
diff --git a/Monitoring/plugins/check_nntps b/Monitoring/nagios/plugins/check_nntps
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_nntps
+++ b/Monitoring/nagios/plugins/check_nntps
diff --git a/Monitoring/plugins/check_nt b/Monitoring/nagios/plugins/check_nt
index d1fd06e0..d1fd06e0 100755
--- a/Monitoring/plugins/check_nt
+++ b/Monitoring/nagios/plugins/check_nt
diff --git a/Monitoring/plugins/check_ntp b/Monitoring/nagios/plugins/check_ntp
index 8fdc6857..8fdc6857 100755
--- a/Monitoring/plugins/check_ntp
+++ b/Monitoring/nagios/plugins/check_ntp
diff --git a/Monitoring/plugins/check_ntp_peer b/Monitoring/nagios/plugins/check_ntp_peer
index 967b2a76..967b2a76 100755
--- a/Monitoring/plugins/check_ntp_peer
+++ b/Monitoring/nagios/plugins/check_ntp_peer
diff --git a/Monitoring/plugins/check_ntp_time b/Monitoring/nagios/plugins/check_ntp_time
index e8a78e05..e8a78e05 100755
--- a/Monitoring/plugins/check_ntp_time
+++ b/Monitoring/nagios/plugins/check_ntp_time
diff --git a/Monitoring/plugins/check_nwstat b/Monitoring/nagios/plugins/check_nwstat
index ad53275f..ad53275f 100755
--- a/Monitoring/plugins/check_nwstat
+++ b/Monitoring/nagios/plugins/check_nwstat
diff --git a/Monitoring/plugins/check_oracle b/Monitoring/nagios/plugins/check_oracle
index 95cb68b6..95cb68b6 100755
--- a/Monitoring/plugins/check_oracle
+++ b/Monitoring/nagios/plugins/check_oracle
diff --git a/Monitoring/plugins/check_overcr b/Monitoring/nagios/plugins/check_overcr
index d179627b..d179627b 100755
--- a/Monitoring/plugins/check_overcr
+++ b/Monitoring/nagios/plugins/check_overcr
diff --git a/Monitoring/plugins/check_pgsql b/Monitoring/nagios/plugins/check_pgsql
index 0940a678..0940a678 100755
--- a/Monitoring/plugins/check_pgsql
+++ b/Monitoring/nagios/plugins/check_pgsql
diff --git a/Monitoring/plugins/check_ping b/Monitoring/nagios/plugins/check_ping
index eac2e9a9..eac2e9a9 100755
--- a/Monitoring/plugins/check_ping
+++ b/Monitoring/nagios/plugins/check_ping
diff --git a/Monitoring/plugins/check_pop b/Monitoring/nagios/plugins/check_pop
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_pop
+++ b/Monitoring/nagios/plugins/check_pop
diff --git a/Monitoring/plugins/check_procs b/Monitoring/nagios/plugins/check_procs
index 92c08b4a..92c08b4a 100755
--- a/Monitoring/plugins/check_procs
+++ b/Monitoring/nagios/plugins/check_procs
diff --git a/Monitoring/plugins/check_radius b/Monitoring/nagios/plugins/check_radius
index 71253c3e..71253c3e 100755
--- a/Monitoring/plugins/check_radius
+++ b/Monitoring/nagios/plugins/check_radius
diff --git a/Monitoring/plugins/check_real b/Monitoring/nagios/plugins/check_real
index 408fb8ff..408fb8ff 100755
--- a/Monitoring/plugins/check_real
+++ b/Monitoring/nagios/plugins/check_real
diff --git a/Monitoring/plugins/check_rpc b/Monitoring/nagios/plugins/check_rpc
index 10a847ef..10a847ef 100755
--- a/Monitoring/plugins/check_rpc
+++ b/Monitoring/nagios/plugins/check_rpc
diff --git a/Monitoring/plugins/check_rta_multi b/Monitoring/nagios/plugins/check_rta_multi
index 97878096..97878096 120000
--- a/Monitoring/plugins/check_rta_multi
+++ b/Monitoring/nagios/plugins/check_rta_multi
diff --git a/Monitoring/plugins/check_sensors b/Monitoring/nagios/plugins/check_sensors
index 857a4d5a..857a4d5a 100755
--- a/Monitoring/plugins/check_sensors
+++ b/Monitoring/nagios/plugins/check_sensors
diff --git a/Monitoring/plugins/check_shinken.py b/Monitoring/nagios/plugins/check_shinken.py
index a3827000..a3827000 100755
--- a/Monitoring/plugins/check_shinken.py
+++ b/Monitoring/nagios/plugins/check_shinken.py
diff --git a/Monitoring/plugins/check_simap b/Monitoring/nagios/plugins/check_simap
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_simap
+++ b/Monitoring/nagios/plugins/check_simap
diff --git a/Monitoring/plugins/check_sip b/Monitoring/nagios/plugins/check_sip
index 24374727..24374727 100755
--- a/Monitoring/plugins/check_sip
+++ b/Monitoring/nagios/plugins/check_sip
diff --git a/Monitoring/plugins/check_smtp b/Monitoring/nagios/plugins/check_smtp
index d70a48f0..d70a48f0 100755
--- a/Monitoring/plugins/check_smtp
+++ b/Monitoring/nagios/plugins/check_smtp
diff --git a/Monitoring/plugins/check_snmp b/Monitoring/nagios/plugins/check_snmp
index d3fcd068..d3fcd068 100755
--- a/Monitoring/plugins/check_snmp
+++ b/Monitoring/nagios/plugins/check_snmp
diff --git a/Monitoring/plugins/check_speed b/Monitoring/nagios/plugins/check_speed
index 14a5b612..14a5b612 100755
--- a/Monitoring/plugins/check_speed
+++ b/Monitoring/nagios/plugins/check_speed
diff --git a/Monitoring/plugins/check_spop b/Monitoring/nagios/plugins/check_spop
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_spop
+++ b/Monitoring/nagios/plugins/check_spop
diff --git a/Monitoring/plugins/check_ssh b/Monitoring/nagios/plugins/check_ssh
index a9d69666..a9d69666 100755
--- a/Monitoring/plugins/check_ssh
+++ b/Monitoring/nagios/plugins/check_ssh
diff --git a/Monitoring/plugins/check_ssmtp b/Monitoring/nagios/plugins/check_ssmtp
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_ssmtp
+++ b/Monitoring/nagios/plugins/check_ssmtp
diff --git a/Monitoring/plugins/check_swap b/Monitoring/nagios/plugins/check_swap
index 6015a7a2..6015a7a2 100755
--- a/Monitoring/plugins/check_swap
+++ b/Monitoring/nagios/plugins/check_swap
diff --git a/Monitoring/plugins/check_tcp b/Monitoring/nagios/plugins/check_tcp
index b084eda3..b084eda3 100755
--- a/Monitoring/plugins/check_tcp
+++ b/Monitoring/nagios/plugins/check_tcp
diff --git a/Monitoring/plugins/check_temper b/Monitoring/nagios/plugins/check_temper
index 95191026..95191026 100755
--- a/Monitoring/plugins/check_temper
+++ b/Monitoring/nagios/plugins/check_temper
diff --git a/Monitoring/plugins/check_time b/Monitoring/nagios/plugins/check_time
index 73a12209..73a12209 100755
--- a/Monitoring/plugins/check_time
+++ b/Monitoring/nagios/plugins/check_time
diff --git a/Monitoring/plugins/check_udp b/Monitoring/nagios/plugins/check_udp
index e838da97..e838da97 120000
--- a/Monitoring/plugins/check_udp
+++ b/Monitoring/nagios/plugins/check_udp
diff --git a/Monitoring/plugins/check_ups b/Monitoring/nagios/plugins/check_ups
index cf641a5f..cf641a5f 100755
--- a/Monitoring/plugins/check_ups
+++ b/Monitoring/nagios/plugins/check_ups
diff --git a/Monitoring/plugins/check_users b/Monitoring/nagios/plugins/check_users
index a0617fd4..a0617fd4 100755
--- a/Monitoring/plugins/check_users
+++ b/Monitoring/nagios/plugins/check_users
diff --git a/Monitoring/plugins/check_wave b/Monitoring/nagios/plugins/check_wave
index efef4680..efef4680 100755
--- a/Monitoring/plugins/check_wave
+++ b/Monitoring/nagios/plugins/check_wave
diff --git a/Monitoring/plugins/getwmic.sh b/Monitoring/nagios/plugins/getwmic.sh
index 05ba8f21..05ba8f21 100755
--- a/Monitoring/plugins/getwmic.sh
+++ b/Monitoring/nagios/plugins/getwmic.sh
diff --git a/Monitoring/plugins/link_vmware_host_vm.py b/Monitoring/nagios/plugins/link_vmware_host_vm.py
index b64cefa8..b64cefa8 100755
--- a/Monitoring/plugins/link_vmware_host_vm.py
+++ b/Monitoring/nagios/plugins/link_vmware_host_vm.py
diff --git a/Monitoring/plugins/negate b/Monitoring/nagios/plugins/negate
index 5bfacfaa..5bfacfaa 100755
--- a/Monitoring/plugins/negate
+++ b/Monitoring/nagios/plugins/negate
diff --git a/Monitoring/plugins/nmap_discovery_runner.py b/Monitoring/nagios/plugins/nmap_discovery_runner.py
index 338e211f..338e211f 100755
--- a/Monitoring/plugins/nmap_discovery_runner.py
+++ b/Monitoring/nagios/plugins/nmap_discovery_runner.py
diff --git a/Monitoring/plugins/notify.sh b/Monitoring/nagios/plugins/notify.sh
index 0c88305c..0c88305c 100755
--- a/Monitoring/plugins/notify.sh
+++ b/Monitoring/nagios/plugins/notify.sh
diff --git a/Monitoring/plugins/notify_irc b/Monitoring/nagios/plugins/notify_irc
index e1de0866..e1de0866 100755
--- a/Monitoring/plugins/notify_irc
+++ b/Monitoring/nagios/plugins/notify_irc
diff --git a/Monitoring/plugins/nsca_client.py b/Monitoring/nagios/plugins/nsca_client.py
index 76e551db..76e551db 100755
--- a/Monitoring/plugins/nsca_client.py
+++ b/Monitoring/nagios/plugins/nsca_client.py
diff --git a/Monitoring/plugins/sendmailhost.pl b/Monitoring/nagios/plugins/sendmailhost.pl
index 51e85670..51e85670 100755
--- a/Monitoring/plugins/sendmailhost.pl
+++ b/Monitoring/nagios/plugins/sendmailhost.pl
diff --git a/Monitoring/plugins/sendmailservices.pl b/Monitoring/nagios/plugins/sendmailservices.pl
index ab5464cf..ab5464cf 100755
--- a/Monitoring/plugins/sendmailservices.pl
+++ b/Monitoring/nagios/plugins/sendmailservices.pl
diff --git a/Monitoring/plugins/urlize b/Monitoring/nagios/plugins/urlize
index 119be020..119be020 100755
--- a/Monitoring/plugins/urlize
+++ b/Monitoring/nagios/plugins/urlize
diff --git a/Monitoring/plugins/utils.pm b/Monitoring/nagios/plugins/utils.pm
index 676a06fe..676a06fe 100644
--- a/Monitoring/plugins/utils.pm
+++ b/Monitoring/nagios/plugins/utils.pm
diff --git a/Monitoring/plugins/utils.sh b/Monitoring/nagios/plugins/utils.sh
index 299a5e52..299a5e52 100755
--- a/Monitoring/plugins/utils.sh
+++ b/Monitoring/nagios/plugins/utils.sh
diff --git a/Monitoring/plugins/vmware_discovery_runner.py b/Monitoring/nagios/plugins/vmware_discovery_runner.py
index 3a17c765..3a17c765 100755
--- a/Monitoring/plugins/vmware_discovery_runner.py
+++ b/Monitoring/nagios/plugins/vmware_discovery_runner.py
diff --git a/Monitoring/shinken/brokerd-windows.ini b/Monitoring/nagios/shinken/brokerd-windows.ini
index 12ea6d24..12ea6d24 100644
--- a/Monitoring/shinken/brokerd-windows.ini
+++ b/Monitoring/nagios/shinken/brokerd-windows.ini
diff --git a/Monitoring/shinken/brokerd.ini b/Monitoring/nagios/shinken/brokerd.ini
index baf0b773..baf0b773 100644
--- a/Monitoring/shinken/brokerd.ini
+++ b/Monitoring/nagios/shinken/brokerd.ini
diff --git a/Monitoring/shinken/certs/ca.pem b/Monitoring/nagios/shinken/certs/ca.pem
index bae94d13..bae94d13 100755
--- a/Monitoring/shinken/certs/ca.pem
+++ b/Monitoring/nagios/shinken/certs/ca.pem
diff --git a/Monitoring/shinken/certs/client.pem b/Monitoring/nagios/shinken/certs/client.pem
index 28c2019e..28c2019e 100755
--- a/Monitoring/shinken/certs/client.pem
+++ b/Monitoring/nagios/shinken/certs/client.pem
diff --git a/Monitoring/shinken/certs/server.pem b/Monitoring/nagios/shinken/certs/server.pem
index 28c2019e..28c2019e 100644
--- a/Monitoring/shinken/certs/server.pem
+++ b/Monitoring/nagios/shinken/certs/server.pem
diff --git a/Monitoring/shinken/commands.cfg b/Monitoring/nagios/shinken/commands.cfg
index 79a5e6e0..79a5e6e0 100644
--- a/Monitoring/shinken/commands.cfg
+++ b/Monitoring/nagios/shinken/commands.cfg
diff --git a/Monitoring/shinken/contactgroups.cfg b/Monitoring/nagios/shinken/contactgroups.cfg
index 517f9ead..517f9ead 100644
--- a/Monitoring/shinken/contactgroups.cfg
+++ b/Monitoring/nagios/shinken/contactgroups.cfg
diff --git a/Monitoring/shinken/contacts.cfg b/Monitoring/nagios/shinken/contacts.cfg
index 9a2f9bac..9a2f9bac 100644
--- a/Monitoring/shinken/contacts.cfg
+++ b/Monitoring/nagios/shinken/contacts.cfg
diff --git a/Monitoring/shinken/dependencies.cfg b/Monitoring/nagios/shinken/dependencies.cfg
index 2a2c7449..2a2c7449 100644
--- a/Monitoring/shinken/dependencies.cfg
+++ b/Monitoring/nagios/shinken/dependencies.cfg
diff --git a/Monitoring/shinken/discovery.cfg b/Monitoring/nagios/shinken/discovery.cfg
index d8e9fa9f..d8e9fa9f 100644
--- a/Monitoring/shinken/discovery.cfg
+++ b/Monitoring/nagios/shinken/discovery.cfg
diff --git a/Monitoring/shinken/discovery_rules.cfg b/Monitoring/nagios/shinken/discovery_rules.cfg
index cb3f5c31..cb3f5c31 100644
--- a/Monitoring/shinken/discovery_rules.cfg
+++ b/Monitoring/nagios/shinken/discovery_rules.cfg
diff --git a/Monitoring/shinken/discovery_runs.cfg b/Monitoring/nagios/shinken/discovery_runs.cfg
index d21b0c51..d21b0c51 100644
--- a/Monitoring/shinken/discovery_runs.cfg
+++ b/Monitoring/nagios/shinken/discovery_runs.cfg
diff --git a/Monitoring/shinken/escalations.cfg b/Monitoring/nagios/shinken/escalations.cfg
index a953d871..a953d871 100644
--- a/Monitoring/shinken/escalations.cfg
+++ b/Monitoring/nagios/shinken/escalations.cfg
diff --git a/Monitoring/shinken/hostgroups.cfg b/Monitoring/nagios/shinken/hostgroups.cfg
index fb8713b7..fb8713b7 100644
--- a/Monitoring/shinken/hostgroups.cfg
+++ b/Monitoring/nagios/shinken/hostgroups.cfg
diff --git a/Monitoring/shinken/hosts/localhost.cfg b/Monitoring/nagios/shinken/hosts/localhost.cfg
index a15a9c5d..a15a9c5d 100644
--- a/Monitoring/shinken/hosts/localhost.cfg
+++ b/Monitoring/nagios/shinken/hosts/localhost.cfg
diff --git a/Monitoring/shinken/nagios-windows.cfg b/Monitoring/nagios/shinken/nagios-windows.cfg
index 478d3950..478d3950 100644
--- a/Monitoring/shinken/nagios-windows.cfg
+++ b/Monitoring/nagios/shinken/nagios-windows.cfg
diff --git a/Monitoring/shinken/nagios.cfg b/Monitoring/nagios/shinken/nagios.cfg
index 28d6b88d..28d6b88d 100644
--- a/Monitoring/shinken/nagios.cfg
+++ b/Monitoring/nagios/shinken/nagios.cfg
diff --git a/Monitoring/shinken/objects/groups/root_contact.cfg b/Monitoring/nagios/shinken/objects/groups/root_contact.cfg
index a2c4180a..a2c4180a 100644
--- a/Monitoring/shinken/objects/groups/root_contact.cfg
+++ b/Monitoring/nagios/shinken/objects/groups/root_contact.cfg
diff --git a/Monitoring/shinken/objects/internet/euer.krebsco.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg
index 8701cabc..8701cabc 100644
--- a/Monitoring/shinken/objects/internet/euer.krebsco.de/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg
diff --git a/Monitoring/shinken/objects/internet/euer.krebsco.de/Ssh.cfg b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg
index a1303fec..a1303fec 100644
--- a/Monitoring/shinken/objects/internet/euer.krebsco.de/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg
diff --git a/Monitoring/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg
index 0e9de77f..0e9de77f 100644
--- a/Monitoring/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg
diff --git a/Monitoring/shinken/objects/internet/google.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg
index bd577394..bd577394 100644
--- a/Monitoring/shinken/objects/internet/google.de/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg
diff --git a/Monitoring/shinken/objects/internet/google.de/Https-Certificate.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg
index 3804a0d7..3804a0d7 100644
--- a/Monitoring/shinken/objects/internet/google.de/Https-Certificate.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg
diff --git a/Monitoring/shinken/objects/internet/google.de/Https.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg
index 2bdc664e..2bdc664e 100644
--- a/Monitoring/shinken/objects/internet/google.de/Https.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg
diff --git a/Monitoring/shinken/objects/internet/google.de/google.de.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg
index d903b730..d903b730 100644
--- a/Monitoring/shinken/objects/internet/google.de/google.de.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg
diff --git a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg
index b7b89e51..b7b89e51 100644
--- a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg
diff --git a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg
index d3b07e1a..d3b07e1a 100644
--- a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg
diff --git a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg
index 11f82410..11f82410 100644
--- a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg
diff --git a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg
index 747c17cf..747c17cf 100644
--- a/Monitoring/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/DNS.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg
index 953ad45e..953ad45e 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/DNS.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg
index b09f34c2..b09f34c2 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/Https-Certificate.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg
index 490d1410..490d1410 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/Https-Certificate.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/Https.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg
index f92e1951..f92e1951 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/Https.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/SMTP.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg
index c9afcef9..c9afcef9 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/SMTP.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/Ssh.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg
index a96aefad..a96aefad 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg
diff --git a/Monitoring/shinken/objects/internet/shackspace.de/shackspace.de.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg
index b70b0e98..b70b0e98 100644
--- a/Monitoring/shinken/objects/internet/shackspace.de/shackspace.de.cfg
+++ b/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg
diff --git a/Monitoring/shinken/objects/retiolum/supernode/Http.cfg b/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg
index de2bc56d..de2bc56d 100644
--- a/Monitoring/shinken/objects/retiolum/supernode/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/retiolum/supernode/Http.cfg
diff --git a/Monitoring/shinken/objects/retiolum/supernode/SMTP.cfg b/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg
index 213e9d23..213e9d23 100644
--- a/Monitoring/shinken/objects/retiolum/supernode/SMTP.cfg
+++ b/Monitoring/nagios/shinken/objects/retiolum/supernode/SMTP.cfg
diff --git a/Monitoring/shinken/objects/retiolum/supernode/Ssh.cfg b/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg
index 72b211b4..72b211b4 100644
--- a/Monitoring/shinken/objects/retiolum/supernode/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/retiolum/supernode/Ssh.cfg
diff --git a/Monitoring/shinken/objects/retiolum/supernode/supernode.cfg b/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg
index c3c537b8..c3c537b8 100644
--- a/Monitoring/shinken/objects/retiolum/supernode/supernode.cfg
+++ b/Monitoring/nagios/shinken/objects/retiolum/supernode/supernode.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg
index 1ebc589c..1ebc589c 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/10.42.0.2.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.2/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg
index 47064f61..47064f61 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.2/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.2/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg
index 19333936..19333936 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/10.42.0.20.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.20/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg
index a55221dd..a55221dd 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.20/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.20/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg
index 619bd6e2..619bd6e2 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/10.42.0.3.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.3/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg
index e5a59a81..e5a59a81 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.3/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.3/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg
index 59006c55..59006c55 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.4/10.42.0.4.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg
index dc16615a..dc16615a 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/10.42.0.5.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.5/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg
index 50f1dc61..50f1dc61 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.5/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.5/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg
index 39804385..39804385 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/10.42.0.7.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.7/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg
index 83b9ca97..83b9ca97 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.7/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.7/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg
index 2a65e2fa..2a65e2fa 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/10.42.0.8.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.8/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg
index a7f2d5f5..a7f2d5f5 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.8/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.8/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg
index 99d2e724..99d2e724 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/10.42.0.9.cfg
diff --git a/Monitoring/shinken/objects/shackspace/10.42.0.9/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg
index b46915dd..b46915dd 100644
--- a/Monitoring/shinken/objects/shackspace/10.42.0.9/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/10.42.0.9/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg
index 3a489402..3a489402 100644
--- a/Monitoring/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg
index 94c71033..94c71033 100644
--- a/Monitoring/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/aptproxy.shack/aptproxy.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/dhcp.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg
index 4fec2042..4fec2042 100644
--- a/Monitoring/shinken/objects/shackspace/dhcp.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg
index 85b57629..85b57629 100644
--- a/Monitoring/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/dhcp.shack/dhcp.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/dns.shack/DNS.cfg b/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg
index aa756a5f..aa756a5f 100644
--- a/Monitoring/shinken/objects/shackspace/dns.shack/DNS.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/dns.shack/DNS.cfg
diff --git a/Monitoring/shinken/objects/shackspace/dns.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg
index 12e65611..12e65611 100644
--- a/Monitoring/shinken/objects/shackspace/dns.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/dns.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/dns.shack/dns.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg
index e3be8ce1..e3be8ce1 100644
--- a/Monitoring/shinken/objects/shackspace/dns.shack/dns.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/dns.shack/dns.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/gameds.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg
index 697e5b5a..697e5b5a 100644
--- a/Monitoring/shinken/objects/shackspace/gameds.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg
index 55b152e1..55b152e1 100644
--- a/Monitoring/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/gameds.shack/gameds.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/genericore.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg
index cb1769a4..cb1769a4 100644
--- a/Monitoring/shinken/objects/shackspace/genericore.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg
index c1ca0f82..c1ca0f82 100644
--- a/Monitoring/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/genericore.shack/genericore.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/homepage.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg
index 25db441f..25db441f 100644
--- a/Monitoring/shinken/objects/shackspace/homepage.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/homepage.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg
index 5982bb7c..5982bb7c 100644
--- a/Monitoring/shinken/objects/shackspace/homepage.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg
index a8cde1f7..a8cde1f7 100644
--- a/Monitoring/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/homepage.shack/homepage.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/monitoring.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg
index 4ec14ec2..4ec14ec2 100644
--- a/Monitoring/shinken/objects/shackspace/monitoring.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/monitoring.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg
index e07f5e57..e07f5e57 100644
--- a/Monitoring/shinken/objects/shackspace/monitoring.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg
index e4c245d9..e4c245d9 100644
--- a/Monitoring/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/monitoring.shack/monitoring.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/node1.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg
index c5d0fa5e..c5d0fa5e 100644
--- a/Monitoring/shinken/objects/shackspace/node1.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/node1.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/node1.shack/node1.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg
index 1c25a20e..1c25a20e 100644
--- a/Monitoring/shinken/objects/shackspace/node1.shack/node1.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/node1.shack/node1.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/node2.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg
index d2e6802c..d2e6802c 100644
--- a/Monitoring/shinken/objects/shackspace/node2.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/node2.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/node2.shack/node2.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg
index b22fb16d..b22fb16d 100644
--- a/Monitoring/shinken/objects/shackspace/node2.shack/node2.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/node2.shack/node2.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/plattenschwein.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg
index 65ac9897..65ac9897 100644
--- a/Monitoring/shinken/objects/shackspace/plattenschwein.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg
index f0cdcdd2..f0cdcdd2 100644
--- a/Monitoring/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg
index d27d74b3..d27d74b3 100644
--- a/Monitoring/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/plattenschwein.shack/plattenschwein.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg
index 9ea51887..9ea51887 100644
--- a/Monitoring/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/powerraw.shack/powerraw.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/printer.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg
index 4f143bad..4f143bad 100644
--- a/Monitoring/shinken/objects/shackspace/printer.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/printer.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg
index 725cebd5..725cebd5 100644
--- a/Monitoring/shinken/objects/shackspace/printer.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/printer.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/printer.shack/printer.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg
index 3f8b2b2f..3f8b2b2f 100644
--- a/Monitoring/shinken/objects/shackspace/printer.shack/printer.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/printer.shack/printer.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/pxe.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg
index e1fae603..e1fae603 100644
--- a/Monitoring/shinken/objects/shackspace/pxe.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg
index e7fe0113..e7fe0113 100644
--- a/Monitoring/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/pxe.shack/pxe.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/rzdoku.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg
index 57dc32ba..57dc32ba 100644
--- a/Monitoring/shinken/objects/shackspace/rzdoku.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg
index 544a1d1e..544a1d1e 100644
--- a/Monitoring/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg
index 121c1aa1..121c1aa1 100644
--- a/Monitoring/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/rzdoku.shack/rzdoku.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shack.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg
index b50df34c..b50df34c 100644
--- a/Monitoring/shinken/objects/shackspace/shack.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shack.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shack.shack/shack.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg
index e5858f27..e5858f27 100644
--- a/Monitoring/shinken/objects/shackspace/shack.shack/shack.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shack.shack/shack.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shackgateway.shack/DNS.cfg b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg
index 3d8f832d..3d8f832d 100644
--- a/Monitoring/shinken/objects/shackspace/shackgateway.shack/DNS.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/DNS.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg
index eb42c69c..eb42c69c 100644
--- a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg
index ef9a6411..ef9a6411 100644
--- a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https-Certificate.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Https.cfg b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg
index 991487d4..991487d4 100644
--- a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Https.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Https.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg
index 2d12f2d7..2d12f2d7 100644
--- a/Monitoring/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg
index 3f80764f..3f80764f 100644
--- a/Monitoring/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/shackgateway.shack/shackgateway.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/standby.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg
index 47eca686..47eca686 100644
--- a/Monitoring/shinken/objects/shackspace/standby.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/standby.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg
index 1cc9007e..1cc9007e 100644
--- a/Monitoring/shinken/objects/shackspace/standby.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/standby.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/standby.shack/standby.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg
index f6965c14..f6965c14 100644
--- a/Monitoring/shinken/objects/shackspace/standby.shack/standby.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/standby.shack/standby.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/stats.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg
index e602e163..e602e163 100644
--- a/Monitoring/shinken/objects/shackspace/stats.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/stats.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg
index db54258a..db54258a 100644
--- a/Monitoring/shinken/objects/shackspace/stats.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/stats.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/stats.shack/stats.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg
index e75b1281..e75b1281 100644
--- a/Monitoring/shinken/objects/shackspace/stats.shack/stats.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/stats.shack/stats.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg
index 0b7cbf05..0b7cbf05 100644
--- a/Monitoring/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg
index b5e17567..b5e17567 100644
--- a/Monitoring/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/tuerstatus.shack/tuerstatus.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/upm.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg
index 618d5dd8..618d5dd8 100644
--- a/Monitoring/shinken/objects/shackspace/upm.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/upm.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/upm.shack/upm.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg
index c1560569..c1560569 100644
--- a/Monitoring/shinken/objects/shackspace/upm.shack/upm.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/upm.shack/upm.shack.cfg
diff --git a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Http.cfg b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg
index 3324e3da..3324e3da 100644
--- a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Http.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Http.cfg
diff --git a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg
index bc8adfce..bc8adfce 100644
--- a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https-Certificate.cfg
diff --git a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Https.cfg b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg
index 4a4cf823..4a4cf823 100644
--- a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Https.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Https.cfg
diff --git a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg
index 17cd20a9..17cd20a9 100644
--- a/Monitoring/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/Ssh.cfg
diff --git a/Monitoring/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg
index 5ea44b7a..5ea44b7a 100644
--- a/Monitoring/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg
+++ b/Monitoring/nagios/shinken/objects/shackspace/vollepulle.shack/vollepulle.shack.cfg
diff --git a/Monitoring/shinken/pollerd-windows.ini b/Monitoring/nagios/shinken/pollerd-windows.ini
index 78b34788..78b34788 100644
--- a/Monitoring/shinken/pollerd-windows.ini
+++ b/Monitoring/nagios/shinken/pollerd-windows.ini
diff --git a/Monitoring/shinken/pollerd.ini b/Monitoring/nagios/shinken/pollerd.ini
index a0c66043..a0c66043 100644
--- a/Monitoring/shinken/pollerd.ini
+++ b/Monitoring/nagios/shinken/pollerd.ini
diff --git a/Monitoring/shinken/reactionnerd-windows.ini b/Monitoring/nagios/shinken/reactionnerd-windows.ini
index 36e147b4..36e147b4 100644
--- a/Monitoring/shinken/reactionnerd-windows.ini
+++ b/Monitoring/nagios/shinken/reactionnerd-windows.ini
diff --git a/Monitoring/shinken/reactionnerd.ini b/Monitoring/nagios/shinken/reactionnerd.ini
index 0226e8e1..0226e8e1 100644
--- a/Monitoring/shinken/reactionnerd.ini
+++ b/Monitoring/nagios/shinken/reactionnerd.ini
diff --git a/Monitoring/shinken/receiverd-windows.ini b/Monitoring/nagios/shinken/receiverd-windows.ini
index 6a0933d6..6a0933d6 100644
--- a/Monitoring/shinken/receiverd-windows.ini
+++ b/Monitoring/nagios/shinken/receiverd-windows.ini
diff --git a/Monitoring/shinken/receiverd.ini b/Monitoring/nagios/shinken/receiverd.ini
index 29ef9f0e..29ef9f0e 100644
--- a/Monitoring/shinken/receiverd.ini
+++ b/Monitoring/nagios/shinken/receiverd.ini
diff --git a/Monitoring/shinken/resource.cfg b/Monitoring/nagios/shinken/resource.cfg
index 675674c8..675674c8 100644
--- a/Monitoring/shinken/resource.cfg
+++ b/Monitoring/nagios/shinken/resource.cfg
diff --git a/Monitoring/shinken/schedulerd-windows.ini b/Monitoring/nagios/shinken/schedulerd-windows.ini
index ff4283c7..ff4283c7 100644
--- a/Monitoring/shinken/schedulerd-windows.ini
+++ b/Monitoring/nagios/shinken/schedulerd-windows.ini
diff --git a/Monitoring/shinken/schedulerd.ini b/Monitoring/nagios/shinken/schedulerd.ini
index a0cb8ab2..a0cb8ab2 100644
--- a/Monitoring/shinken/schedulerd.ini
+++ b/Monitoring/nagios/shinken/schedulerd.ini
diff --git a/Monitoring/shinken/servicegroups.cfg b/Monitoring/nagios/shinken/servicegroups.cfg
index 256ed0aa..256ed0aa 100644
--- a/Monitoring/shinken/servicegroups.cfg
+++ b/Monitoring/nagios/shinken/servicegroups.cfg
diff --git a/Monitoring/shinken/services/linux_local.cfg b/Monitoring/nagios/shinken/services/linux_local.cfg
index 7d0f52ef..7d0f52ef 100644
--- a/Monitoring/shinken/services/linux_local.cfg
+++ b/Monitoring/nagios/shinken/services/linux_local.cfg
diff --git a/Monitoring/shinken/shinken-specific-high-availability.cfg b/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg
index f8c6001d..f8c6001d 100644
--- a/Monitoring/shinken/shinken-specific-high-availability.cfg
+++ b/Monitoring/nagios/shinken/shinken-specific-high-availability.cfg
diff --git a/Monitoring/shinken/shinken-specific-load-balanced-only.cfg b/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg
index e7f756d5..e7f756d5 100644
--- a/Monitoring/shinken/shinken-specific-load-balanced-only.cfg
+++ b/Monitoring/nagios/shinken/shinken-specific-load-balanced-only.cfg
diff --git a/Monitoring/shinken/shinken-specific.cfg b/Monitoring/nagios/shinken/shinken-specific.cfg
index b21c619a..b21c619a 100644
--- a/Monitoring/shinken/shinken-specific.cfg
+++ b/Monitoring/nagios/shinken/shinken-specific.cfg
diff --git a/Monitoring/shinken/templates.cfg b/Monitoring/nagios/shinken/templates.cfg
index 02cf1617..02cf1617 100644
--- a/Monitoring/shinken/templates.cfg
+++ b/Monitoring/nagios/shinken/templates.cfg
diff --git a/Monitoring/shinken/timeperiods.cfg b/Monitoring/nagios/shinken/timeperiods.cfg
index 7322827d..7322827d 100644
--- a/Monitoring/shinken/timeperiods.cfg
+++ b/Monitoring/nagios/shinken/timeperiods.cfg