Skip to content

Commit 421e4da

Browse files
authored
Merge pull request #14218 from mburke5678/BZ-1691707
Update the EventRouter definition per BZ-1691707
2 parents a946b8f + 648d566 commit 421e4da

File tree

2 files changed

+29
-6
lines changed

2 files changed

+29
-6
lines changed

modules/efk-logging-about-eventrouter.adoc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
[id="efk-logging-about-eventrouter-{context}"]
66
= About Event Router in {product-title}
77

8-
The Event Router forwards {product-title} events for Cluster Logging.
8+
The Event Router is a pod that forwards {product-title} events to cluster logging.
9+
You must manually deploy Event Router.
910

10-
In {product-title} all events are logged to `STDOUT`. The Event Router collects events and converts them into JSON format, where Fluentd and indexes the events to the `.operations` index when
11-
the Event Router is deployed into an operations namespace, such as `openshift-*`. You must manually deploy Event Router.
11+
The Event Router collects events and converts them into JSON format, which takes
12+
those events and pushes them to `STDOUT`. Fluentd indexes the events to the
13+
`.operations` index.

modules/efk-logging-eventrouter-deploy.adoc

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ The following Template object creates the Service Account, ClusterRole, and Clus
1111

1212
.Prerequisite
1313

14-
You need proper permissions to make updates within the `openshift-*` namespace.
14+
* Cluster logging and Elasticsearch must be installed.
15+
16+
* You need proper permissions to make updates within the `openshift-*` namespace.
1517

1618
.Procedure
1719

@@ -31,7 +33,7 @@ objects:
3133
apiVersion: v1
3234
metadata:
3335
name: cluster-logging-eventrouter
34-
namespace: cluster-logging
36+
namespace: ${NAMESPACE}
3537
- kind: ClusterRole <2>
3638
apiVersion: v1
3739
metadata:
@@ -76,7 +78,7 @@ objects:
7678
component: eventrouter
7779
logging-infra: eventrouter
7880
provider: openshift
79-
replicas: "1"
81+
replicas: 1
8082
template:
8183
metadata:
8284
labels:
@@ -130,11 +132,30 @@ parameters:
130132
+
131133
----
132134
$ oc process -f <templatefile> | oc apply -f -
135+
----
136+
+
137+
For example:
138+
+
139+
----
140+
$ oc process -f eventrouter.yaml | oc apply -f -
133141
134142
serviceaccount/cluster-logging-eventrouter created
135143
clusterrole.authorization.openshift.io/event-reader created
136144
clusterrolebinding.authorization.openshift.io/event-reader-binding created
137145
configmap/cluster-logging-eventrouter created
138146
deployment.apps/cluster-logging-eventrouter created
147+
----
148+
149+
. Validate that the Event Router installed:
150+
+
151+
----
152+
$ oc get pods --selector component=eventrouter -o name`
153+
154+
pod/cluster-logging-eventrouter-d649f97c8-qvv8r
155+
----
156+
+
157+
----
158+
$ oc logs cluster-logging-eventrouter-d649f97c8-qvv8r
139159
160+
{"verb":"ADDED","event":{"metadata":{"name":"elasticsearch-operator.v0.0.1.158f402e25397146","namespace":"openshift-operators","selfLink":"/api/v1/namespaces/openshift-operators/events/elasticsearch-operator.v0.0.1.158f402e25397146","uid":"37b7ff11-4f1a-11e9-a7ad-0271b2ca69f0","resourceVersion":"523264","creationTimestamp":"2019-03-25T16:22:43Z"},"involvedObject":{"kind":"ClusterServiceVersion","namespace":"openshift-operators","name":"elasticsearch-operator.v0.0.1","uid":"27b2ca6d-4f1a-11e9-8fba-0ea949ad61f6","apiVersion":"operators.coreos.com/v1alpha1","resourceVersion":"523096"},"reason":"InstallSucceeded","message":"waiting for install components to report healthy","source":{"component":"operator-lifecycle-manager"},"firstTimestamp":"2019-03-25T16:22:43Z","lastTimestamp":"2019-03-25T16:22:43Z","count":1,"type":"Normal"}}
140161
----

0 commit comments

Comments
 (0)