From c7c11d773157b8fb0e4115a263a9a331410699b1 Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Tue, 27 Jan 2015 20:15:24 -0800
Subject: [PATCH] Add monit support for restarting etcd to the master.

---
 cluster/saltbase/salt/monit/etcd     | 10 ++++++++++
 cluster/saltbase/salt/monit/init.sls | 19 +++++++++++++++++++
 cluster/saltbase/salt/top.sls        |  1 +
 3 files changed, 30 insertions(+)
 create mode 100644 cluster/saltbase/salt/monit/etcd
 create mode 100644 cluster/saltbase/salt/monit/init.sls

diff --git a/cluster/saltbase/salt/monit/etcd b/cluster/saltbase/salt/monit/etcd
new file mode 100644
index 00000000000..86203dabb96
--- /dev/null
+++ b/cluster/saltbase/salt/monit/etcd
@@ -0,0 +1,10 @@
+check process etcd with pidfile /var/run/etcd.pid
+group etcd 
+start program = "/etc/init.d/etcd start"
+stop program = "/etc/init.d/etcd stop"
+if failed
+  host 127.0.0.1
+  port 4001
+  protocol http
+  request "/v2/keys/"
+then restart
diff --git a/cluster/saltbase/salt/monit/init.sls b/cluster/saltbase/salt/monit/init.sls
new file mode 100644
index 00000000000..a0e5af0277a
--- /dev/null
+++ b/cluster/saltbase/salt/monit/init.sls
@@ -0,0 +1,19 @@
+monit:
+  pkg:
+    - installed
+
+/etc/monit/conf.d/etcd:
+  file:
+    - managed
+    - source: salt://monit/etcd
+    - user: root
+    - group: root
+    - mode: 644
+
+monit-service:
+  service:
+    - running
+    - name: monit 
+    - watch:
+      - pkg: monit 
+      - file: /etc/monit/conf.d/etcd
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index f58c6cec153..e9139d17d51 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -33,6 +33,7 @@ base:
     - kube-apiserver
     - kube-controller-manager
     - kube-scheduler
+    - monit
     - nginx
     - kube-client-tools
     - logrotate