Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

18 files changed, 0 insertions, 100 deletions

diff --git a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg
deleted file mode 100644
index 8701cabc..00000000
--- a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Http.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Http
-  use   generic-service
-  check_command   check_http
-  host_name   euer.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg
deleted file mode 100644
index a1303fec..00000000
--- a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/Ssh.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Ssh
-  use   generic-service
-  check_command   check_ssh
-  host_name   euer.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg b/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg
deleted file mode 100644
index 0e9de77f..00000000
--- a/Monitoring/nagios/shinken/objects/internet/euer.krebsco.de/euer.krebsco.de.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-define host {
-  use   generic-host
-  host_name   euer.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg
deleted file mode 100644
index bd577394..00000000
--- a/Monitoring/nagios/shinken/objects/internet/google.de/Http.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Http
-  use   generic-service
-  check_command   check_http
-  host_name   google.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg
deleted file mode 100644
index 3804a0d7..00000000
--- a/Monitoring/nagios/shinken/objects/internet/google.de/Https-Certificate.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Https-Certificate
-  use   generic-service
-  check_command   check_https_certificate
-  host_name   google.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg
deleted file mode 100644
index 2bdc664e..00000000
--- a/Monitoring/nagios/shinken/objects/internet/google.de/Https.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Https
-  use   generic-service
-  check_command   check_https
-  host_name   google.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg b/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg
deleted file mode 100644
index d903b730..00000000
--- a/Monitoring/nagios/shinken/objects/internet/google.de/google.de.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-define host {
-  use   generic-host
-  host_name   google.de
-}
diff --git a/Monitoring/nagios/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
deleted file mode 100644
index b7b89e51..00000000
--- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/84-23-80-172.blue.kundencontroller.de.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-define host {
-  use   generic-host
-  host_name   oxberg.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg
deleted file mode 100644
index d3b07e1a..00000000
--- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Http.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Http
-  use   generic-service
-  check_command   check_http
-  host_name   oxberg.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg
deleted file mode 100644
index 11f82410..00000000
--- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/SMTP.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   SMTP
-  use   generic-service
-  check_command   check_smtp
-  host_name   oxberg.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg b/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg
deleted file mode 100644
index 747c17cf..00000000
--- a/Monitoring/nagios/shinken/objects/internet/oxberg.krebsco.de/Ssh.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Ssh
-  use   generic-service
-  check_command   check_ssh
-  host_name   oxberg.krebsco.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg
deleted file mode 100644
index 953ad45e..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/DNS.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   DNS
-  use   generic-service
-  check_command   check_dig!shackspace.de
-  host_name   shackspace.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg
deleted file mode 100644
index b09f34c2..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Http.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Http
-  use   generic-service
-  check_command   check_http
-  host_name   shackspace.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg
deleted file mode 100644
index 490d1410..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https-Certificate.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Https-Certificate
-  use   generic-service
-  check_command   check_https_certificate
-  host_name   shackspace.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg
deleted file mode 100644
index f92e1951..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Https.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Https
-  use   generic-service
-  check_command   check_https
-  host_name   shackspace.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg
deleted file mode 100644
index c9afcef9..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/SMTP.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   SMTP
-  use   generic-service
-  check_command   check_smtp
-  host_name   shackspace.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg
deleted file mode 100644
index a96aefad..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/Ssh.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define service {
-  service_description   Ssh
-  use   generic-service
-  check_command   check_ssh
-  host_name   shackspace.de
-}
diff --git a/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg b/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg
deleted file mode 100644
index b70b0e98..00000000
--- a/Monitoring/nagios/shinken/objects/internet/shackspace.de/shackspace.de.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-define host {
-  use   generic-host
-  host_name   shackspace.de
-}