Skip to content

Commit 438d014

Browse files
authored
Merge pull request #425 from jsoref/grammar
Grammar
2 parents 3abcfb7 + 9b587ab commit 438d014

File tree

1 file changed

+29
-29
lines changed

1 file changed

+29
-29
lines changed

README.md

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[![Build Status](https://travis-ci.org/kubernetes/node-problem-detector.svg?branch=master)](https://travis-ci.org/kubernetes/node-problem-detector) [![Go Report Card](https://goreportcard.com/badge/github.com/kubernetes/node-problem-detector)](https://goreportcard.com/report/github.com/kubernetes/node-problem-detector)
44

55
node-problem-detector aims to make various node problems visible to the upstream
6-
layers in cluster management stack.
7-
It is a daemon which runs on each node, detects node
6+
layers in the cluster management stack.
7+
It is a daemon that runs on each node, detects node
88
problems and reports them to apiserver.
99
node-problem-detector can either run as a
1010
[DaemonSet](http://kubernetes.io/docs/admin/daemons/) or run standalone.
@@ -17,17 +17,17 @@ enabled by default in the GCE cluster.
1717
There are tons of node problems that could possibly affect the pods running on the
1818
node, such as:
1919
* Infrastructure daemon issues: ntp service down;
20-
* Hardware issues: Bad cpu, memory or disk;
20+
* Hardware issues: Bad CPU, memory or disk;
2121
* Kernel issues: Kernel deadlock, corrupted file system;
2222
* Container runtime issues: Unresponsive runtime daemon;
2323
* ...
2424

25-
Currently these problems are invisible to the upstream layers in cluster management
25+
Currently, these problems are invisible to the upstream layers in the cluster management
2626
stack, so Kubernetes will continue scheduling pods to the bad nodes.
2727

2828
To solve this problem, we introduced this new daemon **node-problem-detector** to
2929
collect node problems from various daemons and make them visible to the upstream
30-
layers. Once upstream layers have the visibility to those problems, we can discuss the
30+
layers. Once upstream layers have visibility to those problems, we can discuss the
3131
[remedy system](#remedy-systems).
3232

3333
# Problem API
@@ -45,7 +45,7 @@ A problem daemon is a sub-daemon of node-problem-detector. It monitors a specifi
4545
kind of node problems and reports them to node-problem-detector.
4646

4747
A problem daemon could be:
48-
* A tiny daemon designed for dedicated usecase of Kubernetes.
48+
* A tiny daemon designed for dedicated Kubernetes use-cases.
4949
* An existing node health monitoring daemon integrated with node-problem-detector.
5050

5151
Currently, a problem daemon is running as a goroutine in the node-problem-detector
@@ -62,14 +62,14 @@ List of supported problem daemons:
6262
| Problem Daemon | NodeCondition | Description | Disabling Build Tag |
6363
|----------------|:---------------:|:------------|:--------------------|
6464
| [KernelMonitor](https://github.com/kubernetes/node-problem-detector/blob/master/config/kernel-monitor.json) | KernelDeadlock | A system log monitor monitors kernel log and reports problems and metrics according to predefined rules. | disable_system_log_monitor
65-
| [AbrtAdaptor](https://github.com/kubernetes/node-problem-detector/blob/master/config/abrt-adaptor.json) | None | Monitor ABRT log messages and report them further. ABRT (Automatic Bug Report Tool) is health monitoring daemon able to catch kernel problems as well as application crashes of various kinds occurred on the host. For more information visit the [link](https://github.com/abrt). | disable_system_log_monitor
66-
| [CustomPluginMonitor](https://github.com/kubernetes/node-problem-detector/blob/master/config/custom-plugin-monitor.json) | On-demand(According to users configuration) | A custom plugin monitor for node-problem-detector to invoke and check various node problems with user defined check scripts. See proposal [here](https://docs.google.com/document/d/1jK_5YloSYtboj-DtfjmYKxfNnUxCAvohLnsH5aGCAYQ/edit#). | disable_custom_plugin_monitor
67-
| [SystemStatsMonitor](https://github.com/kubernetes/node-problem-detector/blob/master/config/system-stats-monitor.json) | None(Could be added in the future) | A system stats monitor for node-problem-detector to collect various health-related system stats as metrics. See proposal [here](https://docs.google.com/document/d/1SeaUz6kBavI283Dq8GBpoEUDrHA2a795xtw0OvjM568/edit). | disable_system_stats_monitor
65+
| [AbrtAdaptor](https://github.com/kubernetes/node-problem-detector/blob/master/config/abrt-adaptor.json) | None | Monitor ABRT log messages and report them further. ABRT (Automatic Bug Report Tool) is a health monitoring daemon able to catch kernel problems as well as application crashes of various kinds that occur on the host. For more information visit the [link](https://github.com/abrt). | disable_system_log_monitor
66+
| [CustomPluginMonitor](https://github.com/kubernetes/node-problem-detector/blob/master/config/custom-plugin-monitor.json) | On-demand(According to users configuration) | A custom plugin monitor for node-problem-detector to invoke and check various node problems with user-defined check scripts. See the proposal [here](https://docs.google.com/document/d/1jK_5YloSYtboj-DtfjmYKxfNnUxCAvohLnsH5aGCAYQ/edit#). | disable_custom_plugin_monitor
67+
| [SystemStatsMonitor](https://github.com/kubernetes/node-problem-detector/blob/master/config/system-stats-monitor.json) | None(Could be added in the future) | A system stats monitor for node-problem-detector to collect various health-related system stats as metrics. See the proposal [here](https://docs.google.com/document/d/1SeaUz6kBavI283Dq8GBpoEUDrHA2a795xtw0OvjM568/edit). | disable_system_stats_monitor
6868

6969
# Exporter
7070

7171
An exporter is a component of node-problem-detector. It reports node problems and/or metrics to
72-
certain back end. Some of them can be disable at compile time using a build tag. List of supported exporters:
72+
certain backends. Some of them can be disabled at compile-time using a build tag. List of supported exporters:
7373

7474
| Exporter |Description | Disabling Build Tag |
7575
|----------|:-----------|:--------------------|
@@ -86,21 +86,21 @@ certain back end. Some of them can be disable at compile time using a build tag.
8686

8787
#### For System Log Monitor
8888

89-
* `--config.system-log-monitor`: List of paths to system log monitor configuration files, comma separated, e.g.
89+
* `--config.system-log-monitor`: List of paths to system log monitor configuration files, comma-separated, e.g.
9090
[config/kernel-monitor.json](https://github.com/kubernetes/node-problem-detector/blob/master/config/kernel-monitor.json).
9191
Node problem detector will start a separate log monitor for each configuration. You can
92-
use different log monitors to monitor different system log.
92+
use different log monitors to monitor different system logs.
9393

9494
#### For System Stats Monitor
9595

96-
* `--config.system-stats-monitor`: List of paths to system stats monitor config files, comma separated, e.g.
96+
* `--config.system-stats-monitor`: List of paths to system stats monitor config files, comma-separated, e.g.
9797
[config/system-stats-monitor.json](https://github.com/kubernetes/node-problem-detector/blob/master/config/system-stats-monitor.json).
9898
Node problem detector will start a separate system stats monitor for each configuration. You can
9999
use different system stats monitors to monitor different problem-related system stats.
100100

101101
#### For Custom Plugin Monitor
102102

103-
* `--config.custom-plugin-monitor`: List of paths to custom plugin monitor config files, comma separated, e.g.
103+
* `--config.custom-plugin-monitor`: List of paths to custom plugin monitor config files, comma-separated, e.g.
104104
[config/custom-plugin-monitor.json](https://github.com/kubernetes/node-problem-detector/blob/master/config/custom-plugin-monitor.json).
105105
Node problem detector will start a separate custom plugin monitor for each configuration. You can
106106
use different custom plugin monitors to monitor different node problems.
@@ -109,14 +109,14 @@ certain back end. Some of them can be disable at compile time using a build tag.
109109

110110
* `--enable-k8s-exporter`: Enables reporting to Kubernetes API server, default to `true`.
111111
* `--apiserver-override`: A URI parameter used to customize how node-problem-detector
112-
connects the apiserver. This is ignored if `--enable-k8s-exporter` is `false`. The format is same as the
112+
connects the apiserver. This is ignored if `--enable-k8s-exporter` is `false`. The format is the same as the
113113
[`source`](https://github.com/kubernetes/heapster/blob/master/docs/source-configuration.md#kubernetes)
114114
flag of [Heapster](https://github.com/kubernetes/heapster).
115115
For example, to run without auth, use the following config:
116116
```
117117
http://APISERVER_IP:APISERVER_PORT?inClusterConfig=false
118118
```
119-
Refer [heapster docs](https://github.com/kubernetes/heapster/blob/master/docs/source-configuration.md#kubernetes) for a complete list of available options.
119+
Refer to [heapster docs](https://github.com/kubernetes/heapster/blob/master/docs/source-configuration.md#kubernetes) for a complete list of available options.
120120
* `--address`: The address to bind the node problem detector server.
121121
* `--port`: The port to bind the node problem detector server. Use 0 to disable.
122122

@@ -127,13 +127,13 @@ For example, to run without auth, use the following config:
127127

128128
#### For Stackdriver exporter
129129

130-
* `--exporter.stackdriver`: Path to a Stackdriver exporter config file, e.g. [config/exporter/stackdriver-exporter.json](https://github.com/kubernetes/node-problem-detector/blob/master/config/exporter/stackdriver-exporter.json), default to empty string. Set to empty string to disable.
130+
* `--exporter.stackdriver`: Path to a Stackdriver exporter config file, e.g. [config/exporter/stackdriver-exporter.json](https://github.com/kubernetes/node-problem-detector/blob/master/config/exporter/stackdriver-exporter.json), defaults to empty string. Set to empty string to disable.
131131

132132
### Deprecated Flags
133133

134-
* `--system-log-monitors`: List of paths to system log monitor config files, comma separated. This option is deprecated, replaced by `--config.system-log-monitor`, and will be removed. NPD will panic if both `--system-log-monitors` and `--config.system-log-monitor` are set.
134+
* `--system-log-monitors`: List of paths to system log monitor config files, comma-separated. This option is deprecated, replaced by `--config.system-log-monitor`, and will be removed. NPD will panic if both `--system-log-monitors` and `--config.system-log-monitor` are set.
135135

136-
* `--custom-plugin-monitors`: List of paths to custom plugin monitor config files, comma separated. This option is deprecated, replaced by `--config.custom-plugin-monitor`, and will be removed. NPD will panic if both `--custom-plugin-monitors` and `--config.custom-plugin-monitor` are set.
136+
* `--custom-plugin-monitors`: List of paths to custom plugin monitor config files, comma-separated. This option is deprecated, replaced by `--config.custom-plugin-monitor`, and will be removed. NPD will panic if both `--custom-plugin-monitors` and `--config.custom-plugin-monitor` are set.
137137

138138
## Build Image
139139

@@ -153,19 +153,19 @@ before running `make`. For example:
153153

154154
`BUILD_TAGS="disable_custom_plugin_monitor disable_system_stats_monitor" make`
155155

156-
Above command will compile the node-problem-detector without [Custom Plugin Monitor](https://github.com/kubernetes/node-problem-detector/tree/master/pkg/custompluginmonitor)
156+
The above command will compile the node-problem-detector without [Custom Plugin Monitor](https://github.com/kubernetes/node-problem-detector/tree/master/pkg/custompluginmonitor)
157157
and [System Stats Monitor](https://github.com/kubernetes/node-problem-detector/tree/master/pkg/systemstatsmonitor).
158158
Check out the [Problem Daemon](https://github.com/kubernetes/node-problem-detector#problem-daemon) section
159159
to see how to disable each problem daemon during compilation time.
160160

161161
**Note**:
162-
By default node-problem-detector will be built with systemd support with `make` command. This requires systemd develop files.
163-
You should download the systemd develop files first. For Ubuntu, `libsystemd-journal-dev` package should
164-
be installed. For Debian, `libsystemd-dev` package should be installed.
162+
By default, node-problem-detector will be built with systemd support with the `make` command. This requires systemd develop files.
163+
You should download the systemd develop files first. For Ubuntu, the `libsystemd-journal-dev` package should
164+
be installed. For Debian, the `libsystemd-dev` package should be installed.
165165

166166
## Push Image
167167

168-
`make push` uploads the docker image to registry. By default, the image will be uploaded to
168+
`make push` uploads the docker image to a registry. By default, the image will be uploaded to
169169
`staging-k8s.gcr.io`. It's easy to modify the `Makefile` to push the image
170170
to another registry.
171171

@@ -178,7 +178,7 @@ helm repo add deliveryhero https://charts.deliveryhero.io/
178178
helm install deliveryhero/node-problem-detector
179179
```
180180

181-
Or alternatively, to install node-problem-detector manually:
181+
Alternatively, to install node-problem-detector manually:
182182

183183
1. Edit [node-problem-detector.yaml](deployment/node-problem-detector.yaml) to fit your environment. Set `log` volume to your system log directory (used by SystemLogMonitor). You can use a ConfigMap to overwrite the `config` directory inside the pod.
184184

@@ -216,7 +216,7 @@ For example, to test [KernelMonitor](https://github.com/kubernetes/node-problem-
216216
6. ```sudo sh -c "echo 'kernel: INFO: task docker:20744 blocked for more than 120 seconds.' >> /dev/kmsg"```
217217
7. You can see ```DockerHung``` event and condition in the node-problem-detector log.
218218
8. You can see ```DockerHung``` condition at [http://127.0.0.1:20256/conditions](http://127.0.0.1:20256/conditions).
219-
9. You can see disk related system metrics in Prometheus format at [http://127.0.0.1:20257/metrics](http://127.0.0.1:20257/metrics).
219+
9. You can see disk-related system metrics in Prometheus format at [http://127.0.0.1:20257/metrics](http://127.0.0.1:20257/metrics).
220220

221221
**Note**:
222222
- You can see more rule examples under [test/kernel_log_generator/problems](https://github.com/kubernetes/node-problem-detector/tree/master/test/kernel_log_generator/problems).
@@ -258,17 +258,17 @@ Kubernetes cluster to a healthy state. The following remedy systems exist:
258258

259259
NPD is tested via unit tests, [NPD e2e tests](https://github.com/kubernetes/node-problem-detector/blob/master/test/e2e/README.md), Kubernetes e2e tests and Kubernetes nodes e2e tests. Prow handles the [pre-submit tests](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes/node-problem-detector/node-problem-detector-presubmits.yaml) and [CI tests](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes/node-problem-detector/node-problem-detector-ci.yaml).
260260

261-
CI test results can be found at below:
261+
CI test results can be found below:
262262
1. [Unit tests](https://k8s-testgrid.appspot.com/sig-node-node-problem-detector#ci-npd-test)
263263
2. [NPD e2e tests](https://k8s-testgrid.appspot.com/sig-node-node-problem-detector#ci-npd-e2e-test)
264264
3. [Kubernetes e2e tests](https://k8s-testgrid.appspot.com/sig-node-node-problem-detector#ci-npd-e2e-kubernetes-gce-gci)
265265
4. [Kubernetes nodes e2e tests](https://k8s-testgrid.appspot.com/sig-node-node-problem-detector#ci-npd-e2e-node)
266266

267267
## Running tests
268268

269-
Unit test is ran via `make test`.
269+
Unit tests are run via `make test`.
270270

271-
See [NPD e2e test documentation](https://github.com/kubernetes/node-problem-detector/blob/master/test/e2e/README.md) for how to setup and run NPD e2e tests.
271+
See [NPD e2e test documentation](https://github.com/kubernetes/node-problem-detector/blob/master/test/e2e/README.md) for how to set up and run NPD e2e tests.
272272

273273
## Problem Maker
274274

0 commit comments

Comments
 (0)