Skip to content

Commit

Permalink
[Fix] Corrected word spelling error (#2585)
Browse files Browse the repository at this point in the history
  • Loading branch information
crazyacking authored and brancz committed May 6, 2019
1 parent de9a6e1 commit 1b01652
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Expand Up @@ -12,7 +12,7 @@

## 0.28.0 / 2019-01-24

* [FEATURE] CLI tool to lint YAML against CRD defintions (#2269)
* [FEATURE] CLI tool to lint YAML against CRD definitions (#2269)
* [FEATURE] Support Thanos v0.2 arbitrary object storage configuration (#2264)
* [ENHANCEMENT] Update Alertmanager to v0.16.0 (#2145)
* [ENHANCEMENT] Added AlertResendDelay to Prometheus resource (#2265)
Expand Down Expand Up @@ -210,7 +210,7 @@ This release adds validations as a beta feature. It will only be installed on ne
* [FEATURE] Add ability to specify log level.
* [FEATURE] Add support for dropping metrics at scrape time.
* [ENHANCEMENT] Ensure that resource limit can't make Pods unschedulable.
* [ENHANCEMENT] Allow configuring emtpyDir volumes
* [ENHANCEMENT] Allow configuring emptyDir volumes
* [BUGFIX] Use `--storage.tsdb.no-lockfile` for Prometheus 2.0.
* [BUGFIX] Fix Alertmanager default storage.path.

Expand Down Expand Up @@ -363,7 +363,7 @@ be created properly.
* [FEATURE] Allow not tagging targets with the `namespace` label.
* [FEATURE] Allow specifying `ServiceAccountName` to be used by Prometheus pods.
* [ENHANCEMENT] Label governing services to uniquely identify them.
* [ENHANCEMENT] Reconcile Serive and Endpoints objects.
* [ENHANCEMENT] Reconcile Service and Endpoints objects.
* [ENHANCEMENT] General stability improvements.
* [BUGFIX] Hostname cannot be fqdn when syncing kubelets into Endpoints object.

Expand Down
2 changes: 1 addition & 1 deletion Documentation/additional-scrape-config.md
Expand Up @@ -18,7 +18,7 @@ scrape configs are going to break Prometheus after the upgrade.

First, you will need to create the additional configuration.
Below we are making a simple "prometheus" config. Name this
`prometheus-additional.yaml` or something similiar.
`prometheus-additional.yaml` or something similar.

```
- job_name: "prometheus"
Expand Down
6 changes: 3 additions & 3 deletions Documentation/thanos.md
Expand Up @@ -7,7 +7,7 @@ that can be composed into a highly available
metric system with unlimited storage capacity, if your Object Storage allows for it.
The Prometheus Operator provides integration for allowing Prometheus to connect to Thanos.

Thanos components include the queriers and stores, which Thanos needs to
Thanos components include the queries and stores, which Thanos needs to
be fully functional, and should be deployed independently of the Prometheus
Operator and its Thanos configuration. The
[kube-prometheus](contrib/kube-prometheus/) project has some experimental
Expand Down Expand Up @@ -85,7 +85,7 @@ Deploying the sidecar was the first step towards getting Thanos up and running,
* Query
* Compactor

Again, take a look at the Thanos documentation for more details on these componenets:
Again, take a look at the Thanos documentation for more details on these components:
https://github.com/improbable-eng/thanos/blob/master/docs/getting_started.md#store-api

kube-prometheus has built-in support for these extra components.
Expand All @@ -108,7 +108,7 @@ index fcd2bb01..bcf01c75 100644

```

Now you can rebuild the manifests by running `./build.sh` and all necesarry changes will be written to `manifests/`.
Now you can rebuild the manifests by running `./build.sh` and all necessary changes will be written to `manifests/`.

`git status -s manifests`:
```
Expand Down
Expand Up @@ -179,7 +179,7 @@ This example was tested with the [NGINX Ingress Controller][nginx-ingress]. For
kubectl create -f https://raw.githubusercontent.com/kubernetes/ingress/master/examples/deployment/nginx/nginx-ingress-controller.yaml
```

> Be certain to evaluate available Ingress controllers for the specifics of your production environment. The NGINX Ingress Controller may or may not be suitable. Consider other solutions, like HA Proxy, Træfɪk, GCE, or AWS.
> Be certain to evaluate available Ingress controllers for the specifics of your production environment. The NGINX Ingress Controller may or may not be suitable. Consider other solutions, like HA Proxy, Traefik, GCE, or AWS.
> WARNING: If your Ingress is exposed to the internet, everyone can have full access on your resources. It's strongly recommend to enable an [external authentication][external-auth] or [whitelisting IP address][whitelist-ip].
Expand Down

0 comments on commit 1b01652

Please sign in to comment.