Merge pull request #16761 from roberthbailey/supervisord

Auto commit by PR queue bot

cluster/saltbase/salt/README.md

@@ -10,7 +10,6 @@ Key: M = Config applies to master, n = config applies to nodes
 
 Config                                              | GCE   | Vagrant | AWS |
 ----------------------------------------------------|-------|---------|-----|
-[cadvisor](cadvisor/)                               | M n   | M n     | M n |
 [debian-auto-upgrades](debian-auto-upgrades/)       | M n   | M n     | M n |
 [docker](docker/)                                   | M n   | M n     | M n |
 [etcd](etcd/)                                       | M     | M       | M   |
@@ -24,8 +23,7 @@ Config                                              | GCE   | Vagrant | AWS |
 [kube-scheduler](kube-scheduler/)                   | M     | M       | M   |
 [kubelet](kubelet/)                                 | M n   | M n     | M n |
 [logrotate](logrotate/)                             | M n   |   n     | M n |
-[monit](monit/)                                     | M n   | M n     | M n |
-[nginx](nginx/)                                     | M     | M       | M   |
+[supervisord](supervisor/)                          | M n   | M n     | M n |
 [static-routes](static-routes/) (vsphere only)      |       |         |     |
 [base](base.sls)                                    | M n   | M n     | M n |
 [kube-client-tools](kube-client-tools.sls)          | M     | M       | M   |

docs/admin/cluster-components.md

@@ -53,7 +53,7 @@ Documentation for other releases can be found at
     - [kube-proxy](#kube-proxy)
     - [docker](#docker)
     - [rkt](#rkt)
-    - [monit](#monit)
+    - [supervisord](#supervisord)
     - [fluentd](#fluentd)
 
 <!-- END MUNGE: GENERATED_TOC -->
@@ -190,9 +190,9 @@ network rules on the host and performing connection forwarding.
 
 `rkt` is supported experimentally as an alternative to docker.
 
-### monit
+### supervisord
 
-`monit` is a lightweight process babysitting system for keeping kubelet and docker
+`supervisord` is a lightweight process babysitting system for keeping kubelet and docker
 running.
 
 ### fluentd

docs/getting-started-guides/scratch.md

@@ -376,7 +376,7 @@ options, you may have a Docker-created bridge and iptables rules.  You may want
 as follows before proceeding to configure Docker for Kubernetes.
 
 ```sh
-iptables -t nat -F 
+iptables -t nat -F
 ifconfig docker0 down
 brctl delbr docker0
 ```
@@ -500,7 +500,7 @@ traffic to the internet, but have no problem with them inside your GCE Project.
 
 - Enable auto-upgrades for your OS package manager, if desired.
 - Configure log rotation for all node components (e.g. using [logrotate](http://linux.die.net/man/8/logrotate)).
-- Setup liveness-monitoring (e.g. using [monit](http://linux.die.net/man/1/monit)).
+- Setup liveness-monitoring (e.g. using [supervisord](http://supervisord.org/)).
 - Setup volume plugin support (optional)
   - Install any client binaries for optional volume types, such as `glusterfs-client` for GlusterFS
     volumes.