From 32d66d6f7382ead81c182a057fcdba8e33179096 Mon Sep 17 00:00:00 2001
From: Zev Benjamin <zev@zulip.com>
Date: Fri, 7 Feb 2014 14:02:24 -0500
Subject: [PATCH] [manual] Monitor the new redis servers with nagios and munin

We have to start the tunnels up manually and add them to the wiki

(imported from commit aa5f80630a651c3fb33bba321e9d4444b5c498a2)
---
 puppet/zulip_internal/files/munin/munin.conf     | 10 ++++++++++
 .../files/nagios3/conf.d/hosts.cfg               | 16 ++++++++++++++++
 .../files/nagios3/conf.d/localhost.cfg           |  2 +-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/puppet/zulip_internal/files/munin/munin.conf b/puppet/zulip_internal/files/munin/munin.conf
index b7d34e6d68..498363f4d7 100644
--- a/puppet/zulip_internal/files/munin/munin.conf
+++ b/puppet/zulip_internal/files/munin/munin.conf
@@ -61,3 +61,13 @@ rundir      /var/run/munin
     address 127.0.0.1
     port 5009
     use_node_name yes
+
+[redis0]
+    address 127.0.0.1
+    port 5010
+    use_node_name yes
+
+[redis1]
+    address 127.0.0.1
+    port 5011
+    use_node_name yes
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg b/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
index 67865f6b53..4674653fcc 100644
--- a/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
+++ b/puppet/zulip_internal/files/nagios3/conf.d/hosts.cfg
@@ -85,3 +85,19 @@ define host{
        address          stats.zulip.net
        hostgroups       all,not_pageable_servers
        }
+
+define host{
+       use              generic-host
+       host_name        redis0
+       alias            redis0
+       address          redis0.zulip.net
+       hostgroups       all,not_pageable_servers
+       }
+
+define host{
+       use              generic-host
+       host_name        redis1
+       alias            redis1
+       address          redis1.zulip.net
+       hostgroups       all,not_pageable_servers
+       }
diff --git a/puppet/zulip_internal/files/nagios3/conf.d/localhost.cfg b/puppet/zulip_internal/files/nagios3/conf.d/localhost.cfg
index 4b6c714074..6e34ce7ad0 100644
--- a/puppet/zulip_internal/files/nagios3/conf.d/localhost.cfg
+++ b/puppet/zulip_internal/files/nagios3/conf.d/localhost.cfg
@@ -41,7 +41,7 @@ define service{
         service_description             Number of autossh processes
         # If you change the number of munin autossh processes, change
         # the second and third arguments, below.
-        check_command                   check_named_procs!autossh!10:10!10:15
+        check_command                   check_named_procs!autossh!12:12!12:17
         }
 
 define service{