Skip to content

Commit df7309c

Browse files
committed
Fix ClusterLogging example in LokiStack howto
1 parent 32f9b73 commit df7309c

File tree

4 files changed

+44
-43
lines changed

4 files changed

+44
-43
lines changed

modules/cluster-logging-forwarding-lokistack.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ To configure log forwarding to the LokiStack gateway, you must create a ClusterL
99
.Prerequisites
1010

1111
* {logging-title-uc}: 5.5 and later
12-
* `LokiOperator` Operator
12+
* `Loki Operator` Operator
1313
1414
.Procedure
1515

@@ -23,10 +23,11 @@ metadata:
2323
name: instance
2424
namespace: openshift-logging
2525
spec:
26+
managementState: Managed
2627
logStore:
2728
type: lokistack
2829
lokistack:
29-
name: lokistack-dev
30+
name: logging-loki
3031
collection:
3132
type: vector
3233
----

modules/cluster-logging-loki-deploy.adoc

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ You can use the {product-title} web console to deploy the LokiStack.
1212
1313
.Procedure
1414

15-
. Install the `LokiOperator` Operator:
15+
. Install the `Loki Operator` Operator:
1616

1717
.. In the {product-title} web console, click *Operators* -> *OperatorHub*.
1818

19-
.. Choose *LokiOperator* from the list of available Operators, and click *Install*.
19+
.. Choose *Loki Operator* from the list of available Operators, and click *Install*.
2020

2121
.. Under *Installation Mode*, select *All namespaces on the cluster*.
2222

@@ -40,9 +40,9 @@ You must select this option to ensure that cluster monitoring scrapes the `opens
4040
4141
.. Click *Install*.
4242

43-
.. Verify that you installed the LokiOperator. Visit the *Operators* → *Installed Operators* page and look for *LokiOperator*.
43+
.. Verify that you installed the Loki Operator. Visit the *Operators* → *Installed Operators* page and look for *Loki Operator*.
4444

45-
.. Ensure that *LokiOperator* is listed with *Status* as *Succeeded* in all the projects.
45+
.. Ensure that *Loki Operator* is listed with *Status* as *Succeeded* in all the projects.
4646
+
4747
. Create a `Secret` YAML file that uses the `access_key_id` and `access_key_secret` fields to specify your AWS credentials and `bucketnames`, `endpoint` and `region` to define the object storage location. For example:
4848
+
@@ -65,23 +65,23 @@ stringData:
6565
+
6666
[source,yaml]
6767
----
68-
apiVersion: loki.grafana.com/v1
69-
kind: LokiStack
70-
metadata:
71-
name: logging-loki
72-
namespace: openshift-logging
73-
spec:
74-
size: 1x.small
75-
storage:
76-
schemas:
77-
- version: v12
78-
effectiveDate: '2022-06-01'
79-
secret:
80-
name: logging-loki-s3
81-
type: s3
82-
storageClassName: gp2
83-
tenants:
84-
mode: openshift-logging
68+
apiVersion: loki.grafana.com/v1
69+
kind: LokiStack
70+
metadata:
71+
name: logging-loki
72+
namespace: openshift-logging
73+
spec:
74+
size: 1x.small
75+
storage:
76+
schemas:
77+
- version: v12
78+
effectiveDate: "2022-06-01"
79+
secret:
80+
name: logging-loki-s3
81+
type: s3
82+
storageClassName: gp2
83+
tenants:
84+
mode: openshift-logging
8585
----
8686
+
8787
.. Apply the configuration:
@@ -95,19 +95,19 @@ oc apply -f logging-loki.yaml
9595
+
9696
[source,yaml]
9797
----
98-
apiVersion: logging.openshift.io/v1
99-
kind: ClusterLogging
100-
metadata:
101-
name: instance
102-
namespace: openshift-logging
103-
spec:
104-
managementState: Managed
105-
logStore:
106-
type: lokistack
107-
lokistack:
108-
name: logging-loki
109-
collection:
110-
type: "vector"
98+
apiVersion: logging.openshift.io/v1
99+
kind: ClusterLogging
100+
metadata:
101+
name: instance
102+
namespace: openshift-logging
103+
spec:
104+
managementState: Managed
105+
logStore:
106+
type: lokistack
107+
lokistack:
108+
name: logging-loki
109+
collection:
110+
type: vector
111111
----
112112
+
113113
.. Apply the configuration:

modules/cluster-logging-loki-tech-preview.adoc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@ Loki is a horizontally scalable, highly available, multi-tenant log aggregation
1616
* link:https://grafana.com/docs/loki/latest/[Loki Documentation]
1717

1818
== Deploying the Lokistack
19-
You can use the {product-title} web console to install the LokiOperator.
19+
You can use the {product-title} web console to install the Loki Operator.
2020

2121
.Prerequisites
2222

2323
* {product-title}: 4.11
2424
* {logging-title-uc}: 5.4
2525

26-
To install the LokiOperator using the {product-title} web console:
26+
To install the Loki Operator using the {product-title} web console:
2727

28-
. Install the LokiOperator:
28+
. Install the Loki Operator:
2929

3030
.. In the {product-title} web console, click *Operators* -> *OperatorHub*.
3131

32-
.. Choose *LokiOperator* from the list of available Operators, and click *Install*.
32+
.. Choose *Loki Operator* from the list of available Operators, and click *Install*.
3333

3434
.. Under *Installation Mode*, select *All namespaces on the cluster*.
3535

@@ -54,6 +54,6 @@ scrapes the `openshift-operators-redhat` namespace.
5454

5555
.. Click *Install*.
5656

57-
.. Verify that you installed the LokiOperator. Visit the *Operators* → *Installed Operators* page and look for "LokiOperator."
57+
.. Verify that you installed the Loki Operator. Visit the *Operators* → *Installed Operators* page and look for "Loki Operator."
5858

59-
.. Ensure that *LokiOperator* is listed in all the projects whose *Status* is *Succeeded*.
59+
.. Ensure that *Loki Operator* is listed in all the projects whose *Status* is *Succeeded*.

modules/cluster-logging-rn-5.5.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ JSON formatting of logs varies by application. Because creating too many indices
1717

1818
* With this update, clusters with AWS Security Token Service (STS) enabled may use STS authentication to forward logs to Amazon CloudWatch. (link:https://issues.redhat.com/browse/LOG-1976[LOG-1976])
1919

20-
* With this update, the 'LokiOperator' Operator and Vector collector move from Technical Preview to General Availability. Full feature parity with prior releases are pending, and some APIs remain Technical Previews. See the *Logging with the LokiStack* section for details.
20+
* With this update, the 'Loki Operator' Operator and Vector collector move from Technical Preview to General Availability. Full feature parity with prior releases are pending, and some APIs remain Technical Previews. See the *Logging with the LokiStack* section for details.
2121

2222
[id="openshift-logging-5-5-0-bug-fixes"]
2323
== Bug fixes

0 commit comments

Comments
 (0)