Merge pull request #3857 from brendandburns/sanity

Add monit support for restarting etcd to the master.

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

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

cluster/saltbase/salt/top.sls

@@ -33,6 +33,7 @@ base:
     - kube-apiserver
     - kube-controller-manager
     - kube-scheduler
+    - monit
     - nginx
     - kube-client-tools
     - logrotate