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

9 files changed, 235 insertions, 35 deletions

diff --git a/Monitoring/Makefile b/Monitoring/Makefile
index a42707e3..72269101 100644
--- a/Monitoring/Makefile
+++ b/Monitoring/Makefile
@@ -5,13 +5,17 @@ HTDOCS = /usr/share/nagios3/htdocs
 .phony: debian
 debian:
 	[ `which nagios3` ] || apt-get install nagios3
-	rm $(NAGDIR)/conf.d/localhost_nagios2.cfg  || true
-	rm $(NAGDIR)/conf.d/host-gateway_nagios3.cfg  || true
+	rm $(NAGDIR)/conf.d/* || true
 	cp -r conf/* $(NAGDIR)/conf.d/
 	htpasswd -bc htpasswd.users nagiosadmin krebs
 	htpasswd -b htpasswd.users shack shackit
 	sed -i 's/\(authorized_for_all_hosts=nagiosadmin\)$$/\1,shack/' $(NAGDIR)/cgi.cfg
+	sed -i 's/\(check_external_commands=\)0$$/\11/' $(NAGDIR)/nagios.cfg
 	sed -i 's/\(authorized_for_all_services=nagiosadmin\)$$/\1,shack/' $(NAGDIR)/cgi.cfg
 	cp -R htdocs/* $(HTDOCS)
 	cp -r plugins $(NAGLIBDIR)
 	/etc/init.d/nagios3 reload
+	chown nagios:www-data /var/lib/nagios3 || true
+	chown nagios:www-data /var/lib/nagios3/rw || true
+	chmod g+x /var/lib/nagios3 || true
+	chmod ug=rwx /var/lib/nagios3/rw/nagios.cmd || true
diff --git a/Monitoring/conf/extinfo.cfg b/Monitoring/conf/extinfo.cfg
new file mode 100644
index 00000000..e4300b72
--- /dev/null
+++ b/Monitoring/conf/extinfo.cfg
@@ -0,0 +1,9 @@
+define hostextinfo{
+        hostgroup_name   debian-servers
+        notes            Debian GNU/Linux servers
+#       notes_url        http://webserver.localhost.localdomain/hostinfo.pl?host=netware1
+        icon_image       base/debian.png
+        icon_image_alt   Debian GNU/Linux
+        vrml_image       debian.png
+        statusmap_image  base/debian.gd2
+        }
diff --git a/Monitoring/conf/hostgroups_nagios2.cfg b/Monitoring/conf/hostgroups_generic.cfg
index 63acbf50..4e3625c5 100644
--- a/Monitoring/conf/hostgroups_nagios2.cfg
+++ b/Monitoring/conf/hostgroups_generic.cfg
@@ -1,31 +1,28 @@
-# Some generic hostgroup definitions
-
 # A simple wildcard hostgroup
 define hostgroup {
         hostgroup_name  all
-		alias           All Servers
-		members         *
+    alias           All Servers
+    members         *
         }
 
 # A list of your Debian GNU/Linux servers
 define hostgroup {
         hostgroup_name  debian-servers
-		alias           Debian GNU/Linux Servers
-		members         localhost
+    alias           Debian GNU/Linux Servers
+    members         localhost
         }
 
 # A list of your web servers
 define hostgroup {
         hostgroup_name  http-servers
-		alias           HTTP servers
-		members         localhost
+    alias           HTTP servers
+    members         localhost
         }
 
 # A list of your ssh-accessible servers
 define hostgroup {
         hostgroup_name  ssh-servers
-		alias           SSH servers
-		members         localhost
+    alias           SSH servers
+    members         localhost
         }
 
-
diff --git a/Monitoring/conf/services.cfg b/Monitoring/conf/services.cfg
new file mode 100644
index 00000000..e3a61eb0
--- /dev/null
+++ b/Monitoring/conf/services.cfg
@@ -0,0 +1,26 @@
+# check that web services are running
+define service {
+        hostgroup_name                  http-servers
+        service_description             HTTP
+  check_command                   check_http
+        use                             generic-service
+  notification_interval           0 ; set > 0 if you want to be renotified
+}
+
+# check that ssh services are running
+define service {
+        hostgroup_name                  ssh-servers
+        service_description             SSH
+  check_command                   check_ssh
+        use                             generic-service
+  notification_interval           0 ; set > 0 if you want to be renotified
+}
+
+# check that ping-only hosts are up
+define service {
+#        hostgroup_name                  ping-servers
+        service_description             PING
+  check_command                   check_ping!100.0,20%!500.0,60%
+        use                             generic-service
+  notification_interval           0 ; set > 0 if you want to be renotified
+}
diff --git a/Monitoring/conf/shack_contacts.cfg b/Monitoring/conf/shack_contacts.cfg
new file mode 100644
index 00000000..832a215e
--- /dev/null
+++ b/Monitoring/conf/shack_contacts.cfg
@@ -0,0 +1,22 @@
+define contact{
+    contact_name                    makefu
+    alias                           makefu
+    service_notification_period     24x7
+    host_notification_period        24x7
+    service_notification_options    w,u,c,r
+    host_notification_options       d,u,r
+    service_notification_commands   notify-service-by-email
+    host_notification_commands      notify-host-by-email
+    email                           shack_nagios_notification@syntax-fehler.de
+    }
+define contactgroup{
+    contactgroup_name                 krebsminers
+    alias                             Krebsminers
+    members                           makefu
+    }
+    
+define contactgroup{
+    contactgroup_name                 admins
+    alias                             admins
+    }
+    
diff --git a/Monitoring/conf/shack_guests.cfg b/Monitoring/conf/shack_guests.cfg
index 75e92f17..45617461 100644
--- a/Monitoring/conf/shack_guests.cfg
+++ b/Monitoring/conf/shack_guests.cfg
@@ -6,31 +6,61 @@ define host{
         host_name               gauda0
         parents                 shack-serverswitch
         alias                   Gauda0 Bitcoin Mining Rig 0
-        address                 10.42.1.16
+        address                 10.42.0.99
         hostgroups              bitcoin-miner
         }
 define host{
         use                     generic-host
         host_name               gauda1
-        parents                 shack-serverswitch
-        alias                   Gauda0 Bitcoin Mining Rig 1
-        address                 10.42.1.20
+        parents                 shack-serverswitch2
+        alias                   Gauda1 Bitcoin Mining Rig 1
+        address                 10.42.0.98
         hostgroups              bitcoin-miner
         }
 define host{
         use                     generic-host
         host_name               gauda2
-        parents                 shack-serverswitch
-        alias                   Gauda0 Bitcoin Mining Rig 2
-        address                 10.42.1.17
+        parents                 shack-serverswitch2
+        alias                   Gauda2 Bitcoin Mining Rig 2
+        address                 10.42.0.97
         hostgroups              bitcoin-miner
         }
 
 define host{
         use                     generic-host
-        host_name               SaschaPC
+        host_name               chinaman
+        parents                 shack-serverswitch2
+        alias                   Chinaman Bitcoin Mining Rig
+        address                 10.42.0.96
+        _TINC_ADDRESS           10.7.7.6
+        hostgroups              bitcoin-miner,tinc-nodes,ssh-servers
+        contact_groups           krebsminers
+        }
+
+define host{
+        use                     generic-host
+        host_name               Sascha privater Server
         parents                 shack-serverswitch
-        alias                   Saschas Bitcoin Miner
+        alias                   Sascha Server
         address                 10.42.23.100
-        hostgroups              bitcoin-miner
+        #hostgroups              bitcoin-miner
+        }
+
+define host{
+        use                     generic-host
+        host_name               Telefonzelle
+        parents                 shack-coreswitch
+        alias                   Telefonzelle
+        address                 10.42.23.101
+        #hostgroups              bitcoin-miner
+        }
+
+define host{
+        use                     generic-host
+        host_name               shack-pnp
+        alias                   Shack Bestueckungsautomat
+        address                 10.42.100.5
+        parents                 shack-coreswitch
+        #hostgroups              shack-rz
         }
+
diff --git a/Monitoring/conf/shack_infrastructure.cfg b/Monitoring/conf/shack_infrastructure.cfg
index 78c220b1..f404f3e4 100644
--- a/Monitoring/conf/shack_infrastructure.cfg
+++ b/Monitoring/conf/shack_infrastructure.cfg
@@ -63,6 +63,32 @@ define host{
         address                 10.0.10.2
         hostgroups              shack-rz
         }
+#
+# Serverswitch 2
+#
+define host{
+        use                     generic-host
+        host_name               shack-serverswitch2
+        parents                 shack-serverswitch
+        alias                   Shack switch Rack 2 (cisco 3524)
+        address                 10.42.0.5
+        hostgroups              shack-rz
+        }
+
+define service {
+        host_name               shack-serverswitch2
+        service_description     Telnet
+        use                     generic-service
+        check_command           check_telnet
+        }
+
+define service {
+        host_name               shack-serverswitch2
+        service_description     Admin HTTP Terminal
+        use                     generic-service
+        check_command           check_http
+        }
+
 
 define service {
         host_name               shack-gw
@@ -88,14 +114,6 @@ define host{
 
 define host{
         use                     generic-host
-        host_name               shack-wlan-ap1
-        parents                 shack-coreswitch
-        alias                   Shack Wlan Access Point 1
-        address                 10.42.0.5
-        hostgroups              wlan-ap
-        }
-define host{
-        use                     generic-host
         host_name               shack-wlan-ap2
         parents                 shack-coreswitch
         alias                   Shack Wlan Access Point 2
@@ -145,10 +163,6 @@ define service{
         check_command           check_sip
         }
 
-
-
-
-
 #
 # Shack DNS Server
 #
@@ -222,3 +236,6 @@ define service {
         check_command           check_ldap!shammunity
         }
 
+#
+# Random stuff (not necessary located in RZ)
+#
diff --git a/Monitoring/conf/templates.cfg b/Monitoring/conf/templates.cfg
new file mode 100644
index 00000000..41807e1c
--- /dev/null
+++ b/Monitoring/conf/templates.cfg
@@ -0,0 +1,45 @@
+# generic service template definition
+define service{
+        name                            generic-service ; The 'name' of this service template
+        active_checks_enabled           1       ; Active service checks are enabled
+        passive_checks_enabled          1       ; Passive service checks are enabled/accepted
+        parallelize_check               1       ; Active service checks should be parallelized (disabling this can lead to major performance problems)
+        obsess_over_service             1       ; We should obsess over this service (if necessary)
+        check_freshness                 0       ; Default is to NOT check service 'freshness'
+        notifications_enabled           1       ; Service notifications are enabled
+        event_handler_enabled           1       ; Service event handler is enabled
+        flap_detection_enabled          1       ; Flap detection is enabled
+        failure_prediction_enabled      1       ; Failure prediction is enabled
+        process_perf_data               1       ; Process performance data
+        retain_status_information       1       ; Retain status information across program restarts
+        retain_nonstatus_information    1       ; Retain non-status information across program restarts
+    notification_interval           0   ; Only send notifications on status change by default.
+    is_volatile                     0
+    check_period                    24x7
+    normal_check_interval           5
+    retry_check_interval            1
+    max_check_attempts              4
+    notification_period             24x7
+    notification_options            w,u,c,r
+    contact_groups                  admins
+        register                        0       ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL SERVICE, JUST A TEMPLATE!
+        }
+# Generic host definition template - This is NOT a real host, just a template!
+
+define host{
+        name                            generic-host    ; The name of this host template
+        notifications_enabled           1       ; Host notifications are enabled
+        event_handler_enabled           1       ; Host event handler is enabled
+        flap_detection_enabled          1       ; Flap detection is enabled
+        failure_prediction_enabled      1       ; Failure prediction is enabled
+        process_perf_data               1       ; Process performance data
+        retain_status_information       1       ; Retain status information across program restarts
+        retain_nonstatus_information    1       ; Retain non-status information across program restarts
+    check_command                   check-host-alive
+    max_check_attempts              10
+    notification_interval           0
+    notification_period             24x7
+    notification_options            d,u,r
+    contact_groups                  admins
+        register                        0       ; DONT REGISTER THIS DEFINITION - ITS NOT A REAL HOST, JUST A TEMPLATE!
+        }
diff --git a/Monitoring/conf/timeperiods.cfg b/Monitoring/conf/timeperiods.cfg
new file mode 100644
index 00000000..55ecf9df
--- /dev/null
+++ b/Monitoring/conf/timeperiods.cfg
@@ -0,0 +1,50 @@
+###############################################################################
+# timeperiods.cfg
+###############################################################################
+
+# This defines a timeperiod where all times are valid for checks, 
+# notifications, etc.  The classic "24x7" support nightmare. :-)
+
+define timeperiod{
+        timeperiod_name 24x7
+        alias           24 Hours A Day, 7 Days A Week
+        sunday          00:00-24:00
+        monday          00:00-24:00
+        tuesday         00:00-24:00
+        wednesday       00:00-24:00
+        thursday        00:00-24:00
+        friday          00:00-24:00
+        saturday        00:00-24:00
+        }
+
+# Here is a slightly friendlier period during work hours
+define timeperiod{
+        timeperiod_name workhours
+        alias           Standard Work Hours
+        monday          09:00-17:00
+        tuesday         09:00-17:00
+        wednesday       09:00-17:00
+        thursday        09:00-17:00
+        friday          09:00-17:00
+        }
+
+# The complement of workhours
+define timeperiod{
+        timeperiod_name nonworkhours
+        alias           Non-Work Hours
+        sunday          00:00-24:00
+        monday          00:00-09:00,17:00-24:00
+        tuesday         00:00-09:00,17:00-24:00
+        wednesday       00:00-09:00,17:00-24:00
+        thursday        00:00-09:00,17:00-24:00
+        friday          00:00-09:00,17:00-24:00
+        saturday        00:00-24:00
+        }
+
+# This one is a favorite: never :)
+define timeperiod{
+        timeperiod_name never
+        alias           Never
+        }
+
+# end of file