Skip to content

Commit dc82562

Browse files
Merge pull request #2427 from simonpasquier/OCPBUGS-37686
OCPBUGS-37686: fix documentation typos
2 parents e94353e + fb757a1 commit dc82562

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

Documentation/resources.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Expose the admission webhook service which validates `PrometheusRules` and `Aler
6666
=== openshift-user-workload-monitoring/alertmanager-user-workload
6767

6868
Expose the user-defined Alertmanager web server within the cluster on the following ports:
69-
* Port 9095 provides access to the Alertmanager endpoints. Granting access requires binding a user to the `monitoring-alertmanager-api-reader` role (for read-only operations) or `monitoritoring-alertmanager-api-writer` role in the `openshift-user-workload-monitoring` project.
69+
* Port 9095 provides access to the Alertmanager endpoints. Granting access requires binding a user to the `monitoring-alertmanager-api-reader` role (for read-only operations) or `monitoring-alertmanager-api-writer` role in the `openshift-user-workload-monitoring` project.
7070
* Port 9092 provides access to the Alertmanager endpoints restricted to a given project. Granting access requires binding a user to the `monitoring-rules-edit` cluster role or `monitoring-edit` cluster role in the project.
7171
* Port 9097 provides access to the `/metrics` endpoint only. This port is for internal use, and no other usage is guaranteed.
7272

@@ -105,7 +105,7 @@ Expose openshift-state-metrics `/metrics` endpoints within the cluster on the fo
105105

106106
Expose the Prometheus web server within the cluster on the following ports:
107107
* Port 9091 provides access to all the Prometheus endpoints. Granting access requires binding a user to the `cluster-monitoring-view` cluster role.
108-
* Port 9092 provides access the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
108+
* Port 9092 provides access to the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
109109

110110
=== openshift-user-workload-monitoring/prometheus-operator
111111

Documentation/resources.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Expose the admission webhook service which validates `PrometheusRules` and `Aler
4747
### openshift-user-workload-monitoring/alertmanager-user-workload
4848

4949
Expose the user-defined Alertmanager web server within the cluster on the following ports:
50-
* Port 9095 provides access to the Alertmanager endpoints. Granting access requires binding a user to the `monitoring-alertmanager-api-reader` role (for read-only operations) or `monitoritoring-alertmanager-api-writer` role in the `openshift-user-workload-monitoring` project.
50+
* Port 9095 provides access to the Alertmanager endpoints. Granting access requires binding a user to the `monitoring-alertmanager-api-reader` role (for read-only operations) or `monitoring-alertmanager-api-writer` role in the `openshift-user-workload-monitoring` project.
5151
* Port 9092 provides access to the Alertmanager endpoints restricted to a given project. Granting access requires binding a user to the `monitoring-rules-edit` cluster role or `monitoring-edit` cluster role in the project.
5252
* Port 9097 provides access to the `/metrics` endpoint only. This port is for internal use, and no other usage is guaranteed.
5353

@@ -86,7 +86,7 @@ Expose openshift-state-metrics `/metrics` endpoints within the cluster on the fo
8686

8787
Expose the Prometheus web server within the cluster on the following ports:
8888
* Port 9091 provides access to all the Prometheus endpoints. Granting access requires binding a user to the `cluster-monitoring-view` cluster role.
89-
* Port 9092 provides access the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
89+
* Port 9092 provides access to the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
9090

9191
### openshift-user-workload-monitoring/prometheus-operator
9292

assets/alertmanager-user-workload/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
openshift.io/description: |-
66
Expose the user-defined Alertmanager web server within the cluster on the following ports:
7-
* Port 9095 provides access to the Alertmanager endpoints. Granting access requires binding a user to the `monitoring-alertmanager-api-reader` role (for read-only operations) or `monitoritoring-alertmanager-api-writer` role in the `openshift-user-workload-monitoring` project.
7+
* Port 9095 provides access to the Alertmanager endpoints. Granting access requires binding a user to the `monitoring-alertmanager-api-reader` role (for read-only operations) or `monitoring-alertmanager-api-writer` role in the `openshift-user-workload-monitoring` project.
88
* Port 9092 provides access to the Alertmanager endpoints restricted to a given project. Granting access requires binding a user to the `monitoring-rules-edit` cluster role or `monitoring-edit` cluster role in the project.
99
* Port 9097 provides access to the `/metrics` endpoint only. This port is for internal use, and no other usage is guaranteed.
1010
service.beta.openshift.io/serving-cert-secret-name: alertmanager-user-workload-tls

assets/prometheus-k8s/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
openshift.io/description: |-
66
Expose the Prometheus web server within the cluster on the following ports:
77
* Port 9091 provides access to all the Prometheus endpoints. Granting access requires binding a user to the `cluster-monitoring-view` cluster role.
8-
* Port 9092 provides access the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
8+
* Port 9092 provides access to the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
99
service.beta.openshift.io/serving-cert-secret-name: prometheus-k8s-tls
1010
labels:
1111
app.kubernetes.io/component: prometheus

jsonnet/components/alertmanager-user-workload.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ function(params)
4444
* Port %d provides access to the `/metrics` endpoint only. This port is for internal use, and no other usage is guaranteed.
4545
||| % [
4646
$.service.spec.ports[0].port,
47-
requiredRoles([['monitoring-alertmanager-api-reader', 'for read-only operations'], 'monitoritoring-alertmanager-api-writer'], 'openshift-user-workload-monitoring'),
47+
requiredRoles([['monitoring-alertmanager-api-reader', 'for read-only operations'], 'monitoring-alertmanager-api-writer'], 'openshift-user-workload-monitoring'),
4848
$.service.spec.ports[1].port,
4949
requiredClusterRoles(['monitoring-rules-edit', 'monitoring-edit'], false, ''),
5050
$.service.spec.ports[2].port,

jsonnet/components/prometheus.libsonnet

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function(params)
2626
data: {},
2727
},
2828

29-
// OpenShift route to access the Prometheus api.
29+
// OpenShift route to access to the Prometheus api.
3030
apiRoute: {
3131
apiVersion: 'v1',
3232
kind: 'Route',
@@ -53,7 +53,7 @@ function(params)
5353
},
5454
},
5555

56-
// OpenShift route to access the Prometheus federate endpoint.
56+
// OpenShift route to access to the Prometheus federate endpoint.
5757
federateRoute: {
5858
apiVersion: 'v1',
5959
kind: 'Route',
@@ -103,7 +103,7 @@ function(params)
103103
|||
104104
Expose the Prometheus web server within the cluster on the following ports:
105105
* Port %d provides access to all the Prometheus endpoints. %s
106-
* Port %d provides access the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
106+
* Port %d provides access to the `/metrics` and `/federate` endpoints only. This port is for internal use, and no other usage is guaranteed.
107107
||| % [
108108
$.service.spec.ports[0].port,
109109
requiredClusterRoles(['cluster-monitoring-view'], true),

0 commit comments

Comments
 (0)