Patch by mark.
diffs (1037 lines):
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/config/commands.cfg
--- a/nagios/conf.d/config/commands.cfg Wed Aug 05 18:15:17 2009 +0000
+++ b/nagios/conf.d/config/commands.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -44,7 +44,7 @@ define command {
# checks that we are not falling behind on TheSchwartz jobs
define command {
command_name dw_check_theschwartz_queue
- command_line $USER1$/check_mysql_query -H $HOSTADDRESS$ -u $USER5$ -p
$USER6$ -d dw_schwartz -w 50 -c 100 -q "SELECT COUNT(*) FROM job WHERE funcid
NOT IN (10, 11) AND (run_after < UNIX_TIMESTAMP()) AND (grabbed_until <
UNIX_TIMESTAMP())"
+ command_line $USER1$/check_mysql_query -H $HOSTADDRESS$ -u $USER5$ -p
$USER6$ -d dw_schwartz -w 150 -c 300 -q "SELECT COUNT(*) FROM job WHERE funcid
NOT IN (10, 11) AND (run_after < UNIX_TIMESTAMP()) AND (grabbed_until <
UNIX_TIMESTAMP())"
}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/config/hostgroups.cfg
--- a/nagios/conf.d/config/hostgroups.cfg Wed Aug 05 18:15:17 2009 +0000
+++ b/nagios/conf.d/config/hostgroups.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -61,9 +61,17 @@ define hostgroup {
+# mogile trackers
+define hostgroup {
+ hostgroup_name mogilefsd
+ alias Mogile Trackers
+}
+
+
+
# mogile storage nodes
define hostgroup {
- hostgroup_name mog
+ hostgroup_name mogstored
alias Mogile Storage Servers
}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-admin01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-admin01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.124 dfw-admin01
-
-define host {
- host_name dfw-admin01
- alias dfw-admin01
- hostgroups admin
- address 10.176.64.124
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db-a01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db-a01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.71.86 dfw-db-a01
-
-define host {
- host_name dfw-db-a01
- alias dfw-db-a01
- hostgroups db,db_slave
- address 10.176.71.86
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db-a02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db-a02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.71.88 dfw-db-a02
-
-define host {
- host_name dfw-db-a02
- alias dfw-db-a02
- hostgroups db,db_slave
- address 10.176.71.88
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db-b01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db-b01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.71.89 dfw-db-b01
-
-define host {
- host_name dfw-db-b01
- alias dfw-db-b01
- hostgroups db,db_slave
- address 10.176.71.89
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db-b02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db-b02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.71.90 dfw-db-b02
-
-define host {
- host_name dfw-db-b02
- alias dfw-db-b02
- hostgroups db,db_slave
- address 10.176.71.90
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db-c01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db-c01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.74.51 dfw-db-c01
-
-define host {
- host_name dfw-db-c01
- alias dfw-db-c01
- hostgroups db,db_slave
- address 10.176.74.51
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db-c02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db-c02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.74.52 dfw-db-c02
-
-define host {
- host_name dfw-db-c02
- alias dfw-db-c02
- hostgroups db,db_slave
- address 10.176.74.52
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.134 dfw-db01
-
-define host {
- host_name dfw-db01
- alias dfw-db01
- hostgroups db,db_schwartz
- address 10.176.64.134
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-db02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-db02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.135 dfw-db02
-
-define host {
- host_name dfw-db02
- alias dfw-db02
- hostgroups db,db_slave
- address 10.176.64.135
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-jobs01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-jobs01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.133 dfw-jobs01
-
-define host {
- host_name dfw-jobs01
- alias dfw-jobs01
- hostgroups jobs
- address 10.176.64.133
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-jobs02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-jobs02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.68.212 dfw-jobs02
-
-define host {
- host_name dfw-jobs02
- alias dfw-jobs02
- hostgroups jobs
- address 10.176.68.212
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-lb01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-lb01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.125 dfw-lb01
-
-define host {
- host_name dfw-lb01
- alias dfw-lb01
- hostgroups lb
- address 10.176.64.125
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-lb02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-lb02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.126 dfw-lb02
-
-define host {
- host_name dfw-lb02
- alias dfw-lb02
- hostgroups lb
- address 10.176.64.126
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-mail01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-mail01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.137 dfw-mail01
-
-define host {
- host_name dfw-mail01
- alias dfw-mail01
- hostgroups mail
- address 10.176.64.137
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-memc01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-memc01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.127 dfw-memc01
-
-define host {
- host_name dfw-memc01
- alias dfw-memc01
- hostgroups memc
- address 10.176.64.127
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-memc02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-memc02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.128 dfw-memc02
-
-define host {
- host_name dfw-memc02
- alias dfw-memc02
- hostgroups memc
- address 10.176.64.128
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-mog01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-mog01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.129 dfw-mog01
-
-define host {
- host_name dfw-mog01
- alias dfw-mog01
- hostgroups mog
- address 10.176.64.129
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-mog02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-mog02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.130 dfw-mog02
-
-define host {
- host_name dfw-mog02
- alias dfw-mog02
- hostgroups mog
- address 10.176.64.130
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-mog03-auto.cfg
--- a/nagios/conf.d/hosts/dfw-mog03-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.74.58 dfw-mog03
-
-define host {
- host_name dfw-mog03
- alias dfw-mog03
- hostgroups mog
- address 10.176.74.58
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-search01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-search01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.77.95 dfw-search01
-
-define host {
- host_name dfw-search01
- alias dfw-search01
- hostgroups search
- address 10.176.77.95
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-web01-auto.cfg
--- a/nagios/conf.d/hosts/dfw-web01-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.131 dfw-web01
-
-define host {
- host_name dfw-web01
- alias dfw-web01
- hostgroups web
- address 10.176.64.131
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-web02-auto.cfg
--- a/nagios/conf.d/hosts/dfw-web02-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.64.132 dfw-web02
-
-define host {
- host_name dfw-web02
- alias dfw-web02
- hostgroups web
- address 10.176.64.132
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-web03-auto.cfg
--- a/nagios/conf.d/hosts/dfw-web03-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.74.62 dfw-web03
-
-define host {
- host_name dfw-web03
- alias dfw-web03
- hostgroups web
- address 10.176.74.62
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-web04-auto.cfg
--- a/nagios/conf.d/hosts/dfw-web04-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.74.63 dfw-web04
-
-define host {
- host_name dfw-web04
- alias dfw-web04
- hostgroups web
- address 10.176.74.63
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/dfw-web05-auto.cfg
--- a/nagios/conf.d/hosts/dfw-web05-auto.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# Auto-generated at Fri Jul 24 16:08:51 2009
-# 10.176.74.64 dfw-web05
-
-define host {
- host_name dfw-web05
- alias dfw-web05
- hostgroups web
- address 10.176.74.64
- use generic-host
-}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-admin01-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-admin01-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.176 sb-admin01
+
+define host {
+ host_name sb-admin01
+ alias sb-admin01
+ hostgroups admin
+ address 172.20.6.176
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-db01-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-db01-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.169 sb-db01
+
+define host {
+ host_name sb-db01
+ alias sb-db01
+ hostgroups db,db_schwartz,mogilefsd,memc
+ address 172.20.6.169
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-db02-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-db02-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.175 sb-db02
+
+define host {
+ host_name sb-db02
+ alias sb-db02
+ hostgroups db,db_slave,mogilefsd,memc
+ address 172.20.6.175
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-jobs01-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-jobs01-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.166 sb-jobs01
+
+define host {
+ host_name sb-jobs01
+ alias sb-jobs01
+ hostgroups jobs,mogstored
+ address 172.20.6.166
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-jobs02-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-jobs02-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.167 sb-jobs02
+
+define host {
+ host_name sb-jobs02
+ alias sb-jobs02
+ hostgroups jobs,mogstored
+ address 172.20.6.167
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-lb01-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-lb01-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.168 sb-lb01
+
+define host {
+ host_name sb-lb01
+ alias sb-lb01
+ hostgroups lb,mogstored
+ address 172.20.6.168
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-lb02-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-lb02-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.172 sb-lb02
+
+define host {
+ host_name sb-lb02
+ alias sb-lb02
+ hostgroups lb,mogstored,mail
+ address 172.20.6.172
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-search01-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-search01-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.171 sb-search01
+
+define host {
+ host_name sb-search01
+ alias sb-search01
+ hostgroups search
+ address 172.20.6.171
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-web01-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-web01-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.173 sb-web01
+
+define host {
+ host_name sb-web01
+ alias sb-web01
+ hostgroups web,mogstored
+ address 172.20.6.173
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-web02-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-web02-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.174 sb-web02
+
+define host {
+ host_name sb-web02
+ alias sb-web02
+ hostgroups web,mogstored
+ address 172.20.6.174
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/hosts/sb-web03-auto.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/hosts/sb-web03-auto.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,10 @@
+# Auto-generated at Thu Aug 20 19:14:29 2009
+# 172.20.6.170 sb-web03
+
+define host {
+ host_name sb-web03
+ alias sb-web03
+ hostgroups web,mogstored
+ address 172.20.6.170
+ use generic-host
+}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/services/mail.cfg
--- a/nagios/conf.d/services/mail.cfg Wed Aug 05 18:15:17 2009 +0000
+++ b/nagios/conf.d/services/mail.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -15,18 +15,18 @@
# verify that MySQL is responding
-define service {
- hostgroup_name mail
- service_description MySQL
- check_command dw_check_mysql
- use generic-service
-}
-
-
-# verify that MySQL is responding
-define service {
- hostgroup_name mail
- service_description MySQL Replication
- check_command dw_check_mysql_repl
- use generic-service
-}
+#define service {
+# hostgroup_name mail
+# service_description MySQL
+# check_command dw_check_mysql
+# use generic-service
+#}
+#
+#
+## verify that MySQL is responding
+#define service {
+# hostgroup_name mail
+# service_description MySQL Replication
+# check_command dw_check_mysql_repl
+# use generic-service
+#}
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/services/mog.cfg
--- a/nagios/conf.d/services/mog.cfg Wed Aug 05 18:15:17 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-#
-# mog.cfg
-#
-# Checks we run on mogile storage nodes.
-#
-# Authors:
-# Mark Smith <[email protected]>
-#
-# Copyright (c) 2009 by Dreamwidth Studios, LLC.
-#
-# This program is free software; you may redistribute it and/or modify it under
-# the same terms as Perl itself. For a copy of the license, please reference
-# 'perldoc perlartistic' or 'perldoc perlgpl'.
-#
-
-
-# verify that mogstored is responding to HTTP
-define service {
- hostgroup_name mog
- service_description Mogstored
- check_command dw_check_mogstored
- use generic-service
-}
-
-
-# verify lighttpd is up and responding to HTTP too
-define service {
- hostgroup_name mog
- service_description Lighttpd
- check_command dw_check_mogstored_getport
- use generic-service
-}
-
-
-# verify that mogilefsd is responding
-define service {
- hostgroup_name mog
- service_description MogileFSd
- check_command dw_check_mogilefsd
- use generic-service
-}
-
-
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/services/mogilefsd.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/services/mogilefsd.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,25 @@
+#
+# mogilefsd.cfg
+#
+# Checks we run on mogile tracker nodes.
+#
+# Authors:
+# Mark Smith <[email protected]>
+#
+# Copyright (c) 2009 by Dreamwidth Studios, LLC.
+#
+# This program is free software; you may redistribute it and/or modify it under
+# the same terms as Perl itself. For a copy of the license, please reference
+# 'perldoc perlartistic' or 'perldoc perlgpl'.
+#
+
+
+# verify that mogilefsd is responding
+define service {
+ hostgroup_name mogilefsd
+ service_description MogileFSd
+ check_command dw_check_mogilefsd
+ use generic-service
+}
+
+
diff -r b352fd4d49fb -r 482a589de207 nagios/conf.d/services/mogstored.cfg
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/nagios/conf.d/services/mogstored.cfg Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,32 @@
+#
+# mogstored.cfg
+#
+# Checks we run on mogile storage nodes.
+#
+# Authors:
+# Mark Smith <[email protected]>
+#
+# Copyright (c) 2009 by Dreamwidth Studios, LLC.
+#
+# This program is free software; you may redistribute it and/or modify it under
+# the same terms as Perl itself. For a copy of the license, please reference
+# 'perldoc perlartistic' or 'perldoc perlgpl'.
+#
+
+
+# verify that mogstored is responding to HTTP
+define service {
+ hostgroup_name mogstored
+ service_description Mogstored
+ check_command dw_check_mogstored
+ use generic-service
+}
+
+
+# verify lighttpd is up and responding to HTTP too
+define service {
+ hostgroup_name mogstored
+ service_description Lighttpd
+ check_command dw_check_mogstored_getport
+ use generic-service
+}
diff -r b352fd4d49fb -r 482a589de207 puppet/manifests/serverclass/admin.pp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/puppet/manifests/serverclass/admin.pp Wed Sep 23 00:26:36 2009 +0000
@@ -0,0 +1,31 @@
+#
+# serverclass::admin
+#
+# Defines functionality for the configuration of the admin machines.
+#
+# Authors:
+# Mark Smith <[email protected]>
+#
+# Copyright (c) 2009 by Dreamwidth Studios, LLC.
+#
+# This program is free software; you may redistribute it and/or modify it under
+# the same terms as Perl itself. For a copy of the license, please reference
+# 'perldoc perlartistic' or 'perldoc perlgpl'.
+#
+
+class iptables::dreamwidth::admin inherits iptables::dreamwidth {
+ # open up incoming port 80, 443, 22
+ Iptables::Rules["dreamwidth"] { allowed_ports => [ 80, 443, 22 ] }
+}
+
+class serverclass::admin inherits serverclass::dreamwidth {
+ include iptables::dreamwidth::admin
+
+ # make sure Apache is running
+ service { "apache2":
+ ensure => running,
+ pattern => "/usr/sbin/apache2",
+ hasstatus => true,
+ hasrestart => true
+ }
+}
diff -r b352fd4d49fb -r 482a589de207 puppet/manifests/serverclass/dreamwidth.pp
--- a/puppet/manifests/serverclass/dreamwidth.pp Wed Aug 05 18:15:17
2009 +0000
+++ b/puppet/manifests/serverclass/dreamwidth.pp Wed Sep 23 00:26:36
2009 +0000
@@ -18,15 +18,13 @@ class serverclass::dreamwidth {
# Local "dw" user and group
group { dw:
- ensure => present,
- gid => 1000
+ ensure => present
}
user { dw:
ensure => present,
comment => "Dreamwidth",
home => "/home/dw",
managehome => true,
- uid => 1000,
gid => "dw",
shell => "/bin/bash",
require => Group["dw"]
diff -r b352fd4d49fb -r 482a589de207 puppet/manifests/serverclass/mail.pp
--- a/puppet/manifests/serverclass/mail.pp Wed Aug 05 18:15:17 2009 +0000
+++ b/puppet/manifests/serverclass/mail.pp Wed Sep 23 00:26:36 2009 +0000
@@ -15,7 +15,8 @@
class iptables::dreamwidth::mail inherits iptables::dreamwidth {
# open up incoming port 25
- Iptables::Rules["dreamwidth"] { allowed_ports => [ 25 ] }
+ # but also a hack for 80 and 443 because our mailserver is a lb node
+ Iptables::Rules["dreamwidth"] { allowed_ports => [ 25, 80, 443 ] }
}
class serverclass::mail inherits serverclass::dreamwidth {
diff -r b352fd4d49fb -r 482a589de207
puppet/manifests/serverclass/nonwebserver.pp
--- a/puppet/manifests/serverclass/nonwebserver.pp Wed Aug 05 18:15:17
2009 +0000
+++ b/puppet/manifests/serverclass/nonwebserver.pp Wed Sep 23 00:26:36
2009 +0000
@@ -7,10 +7,10 @@
class serverclass::nonwebserver inherits serverclass::dreamwidth {
# make sure Apache is not running
-# service { "apache2":
-# ensure => stopped,
-# pattern => "/usr/sbin/apache2",
-# hasstatus => true,
-# hasrestart => true
-# }
+ service { "apache2":
+ ensure => stopped,
+ pattern => "/usr/sbin/apache2",
+ hasstatus => true,
+ hasrestart => true
+ }
}
diff -r b352fd4d49fb -r 482a589de207 puppet/manifests/serverclass/perlbal.pp
--- a/puppet/manifests/serverclass/perlbal.pp Wed Aug 05 18:15:17 2009 +0000
+++ b/puppet/manifests/serverclass/perlbal.pp Wed Sep 23 00:26:36 2009 +0000
@@ -20,4 +20,12 @@ class iptables::dreamwidth::perlbal inhe
class serverclass::perlbal inherits serverclass::dreamwidth {
include iptables::dreamwidth::perlbal
+
+ # make sure Apache is not running
+ service { "apache2":
+ ensure => stopped,
+ pattern => "/usr/sbin/apache2",
+ hasstatus => true,
+ hasrestart => true
+ }
}
diff -r b352fd4d49fb -r 482a589de207 puppet/manifests/serverclass/webserver.pp
--- a/puppet/manifests/serverclass/webserver.pp Wed Aug 05 18:15:17 2009 +0000
+++ b/puppet/manifests/serverclass/webserver.pp Wed Sep 23 00:26:36 2009 +0000
@@ -5,5 +5,5 @@
class serverclass::webserver inherits serverclass::dreamwidth {
# APACHE2 module
- include apache2::dreamwidth
+# include apache2::dreamwidth
}
diff -r b352fd4d49fb -r 482a589de207 puppet/manifests/site.pp
--- a/puppet/manifests/site.pp Wed Aug 05 18:15:17 2009 +0000
+++ b/puppet/manifests/site.pp Wed Sep 23 00:26:36 2009 +0000
@@ -59,11 +59,13 @@ import "serverclass/*"
# -OR-
# node nodename { include serverclass::nonwebserver }
-node dfw-mail01 { include serverclass::mail }
-node dfw-lb01 { include serverclass::perlbal }
-node dfw-lb02 { include serverclass::perlbal }
-node dfw-lb03 { include serverclass::perlbal }
-node dfw-lb04 { include serverclass::perlbal }
+node sb-lb02 { include serverclass::mail }
+node sb-lb01 { include serverclass::perlbal }
+#node sb-lb02 { include serverclass::perlbal }
+node sb-web01 { include serverclass::webserver }
+node sb-web02 { include serverclass::webserver }
+node sb-web03 { include serverclass::webserver }
+node sb-admin01 { include serverclass::admin }
# A special case exists for the node that will run the Puppet master service.
# This node can be specified as following:
diff -r b352fd4d49fb -r 482a589de207 puppet/modules/apt/manifests/dreamwidth.pp
--- a/puppet/modules/apt/manifests/dreamwidth.pp Wed Aug 05 18:15:17
2009 +0000
+++ b/puppet/modules/apt/manifests/dreamwidth.pp Wed Sep 23 00:26:36
2009 +0000
@@ -3,14 +3,14 @@
# Xenacryst, 15-MAR-2009
#
# Use the local Dreamwidth package cache, available on port 9999, using
-# Ubuntu Hardy.
+# Ubuntu Jaunty.
###############################################################################
class apt::dreamwidth inherits apt {
apt::sources { "dreamwidth":
ensure => present,
- host => 'dfw-admin01',
+ host => 'sb-admin01',
port => '9999',
- release => 'intrepid'
+ release => 'jaunty'
}
}
diff -r b352fd4d49fb -r 482a589de207
puppet/modules/iptables/templates/dreamwidth.erb
--- a/puppet/modules/iptables/templates/dreamwidth.erb Wed Aug 05 18:15:17
2009 +0000
+++ b/puppet/modules/iptables/templates/dreamwidth.erb Wed Sep 23 00:26:36
2009 +0000
@@ -12,56 +12,17 @@
-A INPUT -i ! lo -d 127.0.0.0/8 -j REJECT
# Accept inbound private traffic from one of our servers
--A INPUT -s 10.176.64.124 -j ACCEPT
--A INPUT -s 10.176.64.125 -j ACCEPT
--A INPUT -s 10.176.64.126 -j ACCEPT
--A INPUT -s 10.176.64.127 -j ACCEPT
--A INPUT -s 10.176.64.128 -j ACCEPT
--A INPUT -s 10.176.64.129 -j ACCEPT
--A INPUT -s 10.176.64.130 -j ACCEPT
--A INPUT -s 10.176.64.131 -j ACCEPT
--A INPUT -s 10.176.64.132 -j ACCEPT
--A INPUT -s 10.176.64.133 -j ACCEPT
--A INPUT -s 10.176.64.134 -j ACCEPT
--A INPUT -s 10.176.64.135 -j ACCEPT
--A INPUT -s 10.176.64.137 -j ACCEPT
--A INPUT -s 10.176.68.212 -j ACCEPT
--A INPUT -s 10.176.68.231 -j ACCEPT
--A INPUT -s 10.176.71.86 -j ACCEPT
--A INPUT -s 10.176.71.88 -j ACCEPT
--A INPUT -s 10.176.71.89 -j ACCEPT
--A INPUT -s 10.176.71.90 -j ACCEPT
--A INPUT -s 10.176.73.113 -j ACCEPT
--A INPUT -s 10.176.74.51 -j ACCEPT
--A INPUT -s 10.176.74.52 -j ACCEPT
--A INPUT -s 10.176.74.53 -j ACCEPT
--A INPUT -s 10.176.74.54 -j ACCEPT
--A INPUT -s 10.176.74.55 -j ACCEPT
--A INPUT -s 10.176.74.56 -j ACCEPT
--A INPUT -s 10.176.74.58 -j ACCEPT
--A INPUT -s 10.176.74.59 -j ACCEPT
--A INPUT -s 10.176.74.60 -j ACCEPT
--A INPUT -s 10.176.74.61 -j ACCEPT
--A INPUT -s 10.176.74.62 -j ACCEPT
--A INPUT -s 10.176.74.63 -j ACCEPT
--A INPUT -s 10.176.74.64 -j ACCEPT
--A INPUT -s 10.176.74.65 -j ACCEPT
--A INPUT -s 10.176.74.66 -j ACCEPT
--A INPUT -s 10.176.74.67 -j ACCEPT
--A INPUT -s 10.176.74.68 -j ACCEPT
--A INPUT -s 10.176.74.69 -j ACCEPT
--A INPUT -s 10.176.74.70 -j ACCEPT
--A INPUT -s 10.176.74.71 -j ACCEPT
--A INPUT -s 10.176.74.72 -j ACCEPT
--A INPUT -s 10.176.74.73 -j ACCEPT
--A INPUT -s 10.176.74.74 -j ACCEPT
--A INPUT -s 10.176.74.75 -j ACCEPT
--A INPUT -s 10.176.74.76 -j ACCEPT
--A INPUT -s 10.176.74.77 -j ACCEPT
--A INPUT -s 10.176.74.78 -j ACCEPT
--A INPUT -s 10.176.74.79 -j ACCEPT
--A INPUT -s 10.176.74.80 -j ACCEPT
--A INPUT -s 10.176.77.95 -j ACCEPT
+-A INPUT -s 172.20.6.170 -j ACCEPT
+-A INPUT -s 172.20.6.173 -j ACCEPT
+-A INPUT -s 172.20.6.174 -j ACCEPT
+-A INPUT -s 172.20.6.166 -j ACCEPT
+-A INPUT -s 172.20.6.167 -j ACCEPT
+-A INPUT -s 172.20.6.168 -j ACCEPT
+-A INPUT -s 172.20.6.172 -j ACCEPT
+-A INPUT -s 172.20.6.171 -j ACCEPT
+-A INPUT -s 172.20.6.169 -j ACCEPT
+-A INPUT -s 172.20.6.175 -j ACCEPT
+-A INPUT -s 172.20.6.176 -j ACCEPT
<% if has_variable?("allowed_ports") && !allowed_ports.empty? -%>
# Discards all traffic to/from netblocks on Spamhaus drop list
diff -r b352fd4d49fb -r 482a589de207
puppet/modules/iptables/templates/spamhaus-drop.erb
--- a/puppet/modules/iptables/templates/spamhaus-drop.erb Wed Aug 05
18:15:17 2009 +0000
+++ b/puppet/modules/iptables/templates/spamhaus-drop.erb Wed Sep 23
00:26:36 2009 +0000
@@ -1,7 +1,6 @@ 110.44.0.0/20
110.44.0.0/20
115.166.64.0/19
116.199.128.0/19
-116.50.8.0/21
117.103.40.0/21
119.27.128.0/19
119.42.144.0/21
@@ -15,13 +14,15 @@ 138.43.0.0/16
138.43.0.0/16
139.167.0.0/16
143.49.0.0/16
+150.230.0.0/16
152.147.0.0/16
167.28.0.0/16
167.97.0.0/16
168.151.0.0/16
170.67.0.0/16
+187.16.192.0/19
+190.103.160.0/20
190.112.0.0/19
-190.14.64.0/18
192.160.44.0/24
192.43.153.0/24
192.43.154.0/23
@@ -33,6 +34,7 @@ 193.138.172.0/22
193.138.172.0/22
193.142.244.0/24
193.16.100.0/24
+193.169.12.0/23
193.19.120.0/23
193.238.36.0/22
194.110.160.0/22
@@ -58,18 +60,18 @@ 199.166.200.0/22
199.166.200.0/22
199.245.138.0/24
199.60.102.0/24
-200.108.160.0/20
-200.124.64.0/19
+200.14.120.0/21
+200.50.192.0/19
201.71.0.0/20
202.133.64.0/20
202.6.176.0/20
203.19.101.0/24
203.31.88.0/23
203.34.205.0/24
+203.34.37.0/24
203.34.70.0/23
203.34.71.0/24
204.13.32.0/21
-204.14.24.0/21
204.236.0.0/19
204.52.255.0/24
204.86.116.0/22
@@ -82,12 +84,7 @@ 206.197.177.0/24
206.197.177.0/24
206.197.28.0/24
206.197.29.0/24
-206.51.240.0/21
-208.66.192.0/22
-208.72.168.0/21
-208.73.88.0/21
-208.76.160.0/21
-208.76.48.0/21
+207.166.112.0/20
208.77.224.0/21
208.81.136.0/21
208.82.136.0/21
@@ -97,24 +94,23 @@ 209.145.192.0/18
209.145.192.0/18
209.165.224.0/20
209.213.48.0/20
+213.181.80.0/20
216.21.8.0/22
216.243.240.0/20
-216.255.176.0/20
41.221.112.0/20
-58.65.232.0/21
58.83.12.0/22
58.83.8.0/22
62.122.32.0/21
64.28.176.0/20
66.206.32.0/22
-66.54.91.0/24
66.55.160.0/19
67.210.0.0/20
67.213.128.0/20
-69.50.160.0/19
69.8.176.0/20
69.80.0.0/17
72.2.176.0/20
+72.50.192.0/19
+74.112.184.0/22
78.155.220.0/23
78.157.128.0/19
79.110.160.0/20
@@ -124,7 +120,6 @@ 86.105.230.0/24
86.105.230.0/24
88.214.211.0/24
89.35.0.0/23
-91.193.108.0/23
91.196.232.0/22
91.199.112.0/24
91.203.92.0/22
@@ -138,8 +133,13 @@ 91.209.58.0/24
91.209.58.0/24
91.211.64.0/22
91.211.88.0/22
+91.212.123.0/24
91.212.45.0/24
91.212.65.0/24
+91.213.126.0/24
+91.213.33.0/24
+91.214.44.0/22
+93.118.128.0/18
93.188.160.0/21
94.154.0.0/18
94.154.128.0/18
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
