Skip to content

Commit 1994bff

Browse files
authored
Merge pull request #96830 from ochromy/OBSDOCS-2233
[OBSDOCS-2233] fix typos in Logging 6.0
2 parents 0d06569 + 0e8b630 commit 1994bff

15 files changed

+35
-35
lines changed

about/quick-start.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ toc::[]
88

99
.Prerequisites
1010
* You have access to an {ocp-product-title} cluster with `cluster-admin` permissions.
11-
* You installed the {oc-first}.
11+
* You have installed the {oc-first}.
1212
* You have access to a supported object store. For example, AWS S3, Google Cloud Storage, {azure-short}, Swift, Minio, or {rh-storage}.
1313
1414
.Procedure

configuring/configuring-log-forwarding.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ metadata:
3838

3939
== Managing the Operator
4040

41-
The `ClusterLogForwarder` resource has a `managementState` field that controls whether the operator actively manages its resources or leaves them Unmanaged:
41+
The `ClusterLogForwarder` resource has a `managementState` field that controls whether the Operator actively manages its resources or leaves them unmanaged:
4242

43-
Managed:: (default) The operator will drive the logging resources to match the desired state in the CLF spec.
43+
Managed:: (default) The Operator will drive the logging resources to match the desired state in the CLF spec.
4444

45-
Unmanaged:: The operator will not take any action related to the logging components.
45+
Unmanaged:: The Operator will not take any action related to the logging components.
4646

4747
This allows administrators to temporarily pause log forwarding by setting `managementState` to `Unmanaged`.
4848

@@ -85,7 +85,7 @@ googleCloudLogging:: Forwards logs to Google Cloud Logging.
8585
http:: Forwards logs to a generic HTTP endpoint.
8686
kafka:: Forwards logs to a Kafka broker.
8787
loki:: Forwards logs to a Loki logging backend.
88-
lokistack:: Forwards logs to the logging supported combination of Loki and web proxy with {ocp-product-title} authentication integration. LokiStack's proxy uses {ocp-product-title} authentication to enforce multi-tenancy
88+
lokistack:: Forwards logs to the logging supported combination of Loki and web proxy with {ocp-product-title} authentication integration. LokiStack's proxy uses {ocp-product-title} authentication to enforce multi-tenancy.
8989
otlp:: Forwards logs using the OpenTelemetry Protocol.
9090
splunk:: Forwards logs to Splunk.
9191
syslog:: Forwards logs to an external syslog server.

configuring/configuring-the-log-store.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ include::modules/logging-loki-storage-minio.adoc[leveloffset=+2]
2626
include::modules/logging-loki-storage-odf.adoc[leveloffset=+2]
2727
include::modules/logging-loki-storage-swift.adoc[leveloffset=+2]
2828

29-
//Loki stirage STS
29+
//Loki storage STS
3030
[id="installing-log-storage-loki-sts"]
3131
=== Deploying a Loki log store on a cluster that uses short-term credentials
3232

3333
For some storage providers, you can use the Cloud Credential Operator utility (`ccoctl`) during installation to implement short-term credentials. These credentials are created and managed outside the {ocp-product-title} cluster. For more information, see link:https://docs.redhat.com/en/documentation/openshift_container_platform/4.18/html/authentication_and_authorization/managing-cloud-provider-credentials#cco-short-term-creds[Manual mode with short-term credentials for components].
3434

35-
[NOTE]
35+
[IMPORTANT]
3636
====
37-
Short-term credential authentication must be configured during a new installation of {loki-op}, on a cluster that uses this credentials strategy. You cannot configure an existing cluster that uses a different credentials strategy to use this feature.
37+
Short-term credential authentication must be configured during a new installation of {loki-op} on a cluster that uses this credentials strategy. You cannot configure an existing cluster that uses a different credentials strategy to use this feature.
3838
====
3939

4040
include::modules/logging-identity-federation.adoc[leveloffset=+3]

installing/installing-logging.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ If you have the pull secret, add the `redhat-operators` catalog to the `Operator
3434
[id="installing-loki-and-logging-cli_{context}"]
3535
== Installation by using the CLI
3636

37-
The following sections describe installing the {loki-op} and the {clo} by using the CLI.
37+
As an administrator, you can install the {loki-op} and the {clo} by using the CLI.
3838

3939
include::modules/installing-loki-operator-cli.adoc[leveloffset=+2]
4040
include::modules/installing-logging-operator-cli.adoc[leveloffset=+2]
@@ -43,7 +43,7 @@ include::modules/installing-the-logging-ui-plug-in-cli.adoc[leveloffset=+2]
4343
[id="installing-loki-and-logging-gui_{context}"]
4444
== Installation by using the web console
4545

46-
The following sections describe installing the {loki-op} and the {clo} by using the web console.
46+
As an administrator, you can install the {loki-op} and the {clo} by using the web console.
4747

4848
include::modules/installing-loki-operator-web-console.adoc[leveloffset=+2]
4949
include::modules/installing-logging-operator-web-console.adoc[leveloffset=+2]

modules/installing-loki-operator-cli.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ metadata:
2424
labels:
2525
openshift.io/cluster-monitoring: "true" # <2>
2626
----
27-
<1> You must specify `openshift-operators-redhat` as the namespace. To enable monitoring for the operator, configure Cluster Monitoring Operator to scrape metrics from the `openshift-operators-redhat` namespace and not the `openshift-operators` namespace. The `openshift-operators` namespace might contain community operators, which are untrusted and could publish a metric with the same name as an {ocp-product-title} metric, causing conflicts.
27+
<1> You must specify `openshift-operators-redhat` as the namespace. To enable monitoring for the Operator, configure Cluster Monitoring Operator to scrape metrics from the `openshift-operators-redhat` namespace and not the `openshift-operators` namespace. The `openshift-operators` namespace might contain community operators, which are untrusted and could publish a metric with the same name as an {ocp-product-title} metric, causing conflicts.
2828
<2> A string value that specifies the label as shown to ensure that cluster monitoring scrapes the `openshift-operators-redhat` namespace.
2929

3030
. Apply the `Namespace` object by running the following command:
@@ -75,7 +75,7 @@ spec:
7575
----
7676
<1> You must specify `openshift-operators-redhat` as the namespace.
7777
<2> Specify `stable-6.<y>` as the channel.
78-
<3> If the approval strategy in the subscription is set to `Automatic`, the update process initiates as soon as a new operator version is available in the selected channel. If the approval strategy is set to `Manual`, you must manually approve pending updates.
78+
<3> If the approval strategy in the subscription is set to `Automatic`, the update process initiates as soon as a new Operator version is available in the selected channel. If the approval strategy is set to `Manual`, you must manually approve pending updates.
7979
<4> Specify `redhat-operators` as the value. If your {ocp-product-title} cluster is installed on a restricted network, also known as a disconnected cluster, specify the name of the `CatalogSource` object that you created when you configured Operator Lifecycle Manager (OLM).
8080

8181
. Apply the `Subscription` object by running the following command:
@@ -85,7 +85,7 @@ spec:
8585
$ oc apply -f <filename>.yaml
8686
----
8787

88-
. Create a `namespace` object for deploy the LokiStack:
88+
. Create a `namespace` object to deploy the LokiStack:
8989
+
9090
.Example `namespace` object
9191
[source,yaml]

modules/installing-loki-operator-web-console.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,5 +129,5 @@ spec:
129129

130130
.Verification
131131

132-
. In the *LokiStack* tab veriy that you see your `LokiStack` instance.
132+
. In the *LokiStack* tab, verify that you see your `LokiStack` instance.
133133
. In the *Status* column, verify that you see the message `Condition: Ready` with a green checkmark.

modules/logging-creating-new-group-cluster-admin-user-role.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $ oc adm groups new cluster-admin
2424
----
2525
$ oc adm groups add-users cluster-admin <username>
2626
----
27-
. Enter the following command to add `cluster-admin` user role to the group:
27+
. Enter the following command to add the `cluster-admin` user role to the group:
2828
+
2929
[source,terminal]
3030
----

modules/logging-identity-federation.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[id="logging-identity-federation_{context}"]
77
= Authenticating with workload identity federation to access cloud-based log stores
88

9-
You can use workload identity federation with short-lived tokens to authenticate to cloud-based log stores. With workload identity federation, you do not have to store long-lived credentials in your cluster, which reduces the risk of credential leaks and simplifies secret management.
9+
You can use workload identity federation with short-lived tokens to authenticate to cloud-based log stores. With workload identity federation, you do not have to store long-lived credentials in your cluster, reducing the risk of credential leaks and simplifying secret management.
1010

1111
.Prerequisites
1212

@@ -18,7 +18,7 @@ You can use workload identity federation with short-lived tokens to authenticate
1818
1919
** If you used the {ocp-product-title} web console to install the {loki-op}, the system automatically detects clusters that use short-lived tokens. You are prompted to create roles and supply the data required for the {loki-op} to create a `CredentialsRequest` object, which populates a secret.
2020

21-
** If you used the {oc-first} to install the {loki-op}, you must manually create a `Subscription` object. Use the appropriate template for your storage provider, as shown in the following samples. This authentication strategy supports only the storage providers indicated within the samples.
21+
** If you used the {oc-first} to install the {loki-op}, you must manually create a `Subscription` object. Use the appropriate template for your storage provider, as shown in the following samples. This authentication method supports only the providers listed in the examples.
2222
+
2323
.{azure-first} sample subscription
2424
[source,yaml]

modules/logging-loki-log-access.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
:_mod-docs-content-type: CONCEPT
66
[id="logging-loki-log-access_{context}"]
7-
= Fine grained access for Loki logs
7+
= Fine-grained access for Loki logs
88

9-
The {clo} does not grant all users access to logs by default. As an administrator, you must configure your users' access unless the Operator was upgraded and prior configurations are in place. Depending on your configuration and need, you can configure fine grain access to logs using the following:
9+
The {clo} does not grant all users access to logs by default. As an administrator, you must configure your users' access unless the Operator was upgraded and prior configurations are in place. Depending on your configuration and need, you can configure fine-grain access to logs using the following:
1010

11-
* Cluster wide policies
11+
* Cluster-wide policies
1212
* Namespace scoped policies
1313
* Creation of custom admin groups
1414
@@ -18,15 +18,15 @@ As an administrator, you need to create the role bindings and cluster role bindi
1818
* `cluster-logging-infrastructure-view` grants permission to read infrastructure logs.
1919
* `cluster-logging-audit-view` grants permission to read audit logs.
2020
21-
If you have upgraded from a prior version, an additional cluster role `logging-application-logs-reader` and associated cluster role binding `logging-all-authenticated-application-logs-reader` provide backward compatibility, allowing any authenticated user read access in their namespaces.
21+
If you have upgraded from a prior version, an additional `logging-application-logs-reader` cluster role and its associated `logging-all-authenticated-application-logs-reader` cluster role binding provide backward compatibility, allowing any authenticated user read access in their namespaces.
2222

2323
[NOTE]
2424
====
2525
Users with access by namespace must provide a namespace when querying application logs.
2626
====
2727

28-
== Cluster wide access
29-
Cluster role binding resources reference cluster roles, and set permissions cluster wide.
28+
== Cluster-wide access
29+
Cluster role binding resources reference cluster roles, and set permissions cluster-wide.
3030

3131
.Example ClusterRoleBinding
3232
[source,yaml]

modules/logging-loki-reliability-hardening.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ In the {logging} 5.8 and later versions, the {loki-op} supports setting pod anti
1010

1111
include::snippets/about-pod-affinity.adoc[]
1212

13-
The Operator sets default, preferred `podAntiAffinity` rules for all Loki components, which includes the `compactor`, `distributor`, `gateway`, `indexGateway`, `ingester`, `querier`, `queryFrontend`, and `ruler` components.
13+
The Operator sets default, preferred `podAntiAffinity` rules for all Loki components, which include the `compactor`, `distributor`, `gateway`, `indexGateway`, `ingester`, `querier`, `queryFrontend`, and `ruler` components.
1414

1515
You can override the preferred `podAntiAffinity` settings for Loki components by configuring required settings in the `requiredDuringSchedulingIgnoredDuringExecution` field:
1616

0 commit comments

Comments
 (0)