diff --git a/Documentation/exposing-metrics.md b/Documentation/exposing-metrics.md index 1b07bcd52..a88c4ea69 100644 --- a/Documentation/exposing-metrics.md +++ b/Documentation/exposing-metrics.md @@ -42,7 +42,7 @@ cluster. Lastly in some cases it is not a viable option to expose metrics via an HTTP server. For example a `CronJob` may only run for a few seconds - not long enough for Prometheus to be able to scrape the HTTP endpoint. The Pushgateway -was developed to be able to collect metrics in a scenarion like that, however, +was developed to be able to collect metrics in a scenario like that, however, it is highly recommended to not use the Pushgateway if possible. Read more about when to use the Pushgateway and alternative strategies here: https://prometheus.io/docs/practices/pushing/#should-i-be-using-the-pushgateway . diff --git a/Documentation/service-monitor.md b/Documentation/service-monitor.md index 3f17dfa03..eaad7e495 100644 --- a/Documentation/service-monitor.md +++ b/Documentation/service-monitor.md @@ -3,7 +3,7 @@ The `ServiceMonitor` third party resource (TPR) allows to declaratively define how a dynamic set of services should be monitored. Which services are selected to be monitored with the desired configuration is defined using label -selections. This allows an organization to introduce convensions around how +selections. This allows an organization to introduce conventions around how metrics are exposed, and then following these conventions new services are automatically discovered, without the need to reconfigure the system. diff --git a/README.md b/README.md index 308e754ab..6baa1e621 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Prometheus Operator **Project status: *alpha*** Not all planned features are completed. The API, spec, status -and other user facing objects are subject to change. We do not support backward-compability +and other user facing objects are subject to change. We do not support backward-compatibility for the alpha releases. The Prometheus Operator for Kubernetes provides easy monitoring definitions for Kubernetes @@ -58,7 +58,7 @@ kubectl get prometheuses --all-namespaces kubectl get alertmanagers --all-namespaces ``` -For each `Prometheus` and `Alertmanger` object, a respective `PetSet` with the +For each `Prometheus` and `Alertmanager` object, a respective `PetSet` with the same name was created in the same namespace. Those `PetSet`s need to be migrated according to the [official migration documentation](http://kubernetes.io/docs/tasks/manage-stateful-set/upgrade-pet-set-to-stateful-set/). diff --git a/ROADMAP.md b/ROADMAP.md index 6c8312b03..52ee6a169 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -47,7 +47,7 @@ does not exist. ### Deployment -The Alertmanager, in high availablility mode, is a distributed system. A +The Alertmanager, in high availability mode, is a distributed system. A desired deployment ensures no data loss and zero downtime while performing a deployment. Zero downtime is simply done as the Alertmanager is running high availability mode. No data loss is achieved by using PVCs and attaching the