Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace monit with supervisord in documentation. #16761

Merged
merged 1 commit into from Nov 4, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions cluster/saltbase/salt/README.md
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
6 changes: 3 additions & 3 deletions docs/admin/cluster-components.md
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docs/getting-started-guides/scratch.md
Expand Up @@ -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
```
Expand Down Expand Up @@ -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.
Expand Down