Skip to content

Commit f1e3641

Browse files
Merge pull request #125 from appuio/feat/vector-as-default
Vector is now the default logging collector
2 parents ba59818 + eaa875a commit f1e3641

File tree

8 files changed

+38
-6
lines changed

8 files changed

+38
-6
lines changed

class/defaults.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ parameters:
8686
nodeSelector:
8787
node-role.kubernetes.io/infra: ''
8888
collection:
89-
type: fluentd
89+
type: vector
9090

9191
clusterLogForwarding:
9292
enabled: false

docs/modules/ROOT/pages/how-tos/upgrade-v2.x-v3.x.adoc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
Elasticsearch is deprecated.
44
The component will deploy Lokistack by default, for keeping elasticsearch apply config below.
55

6+
Fluentd collector is deprecated.
7+
The component will deploy Vector by default, for keeping Fluentd apply config below.
8+
Vector does not support all forwarding protocols, see https://docs.openshift.com/container-platform/4.15/logging/log_collection_forwarding/log-forwarding.html#log-forwarding-collector-outputs_log-forwarding[OpenShift Documentation].
9+
610
The parameter `clusterLogging.collector.logs` is deprecated.
711
The component is backwards compatible, but moving the parameters to `clusterLogging.collector` is highly encouraged.
812

@@ -32,6 +36,21 @@ parameters:
3236
<3> Set Elasticsearch in `clusterLogging`
3337

3438

39+
== Keep Fluentd as Log collector
40+
41+
Set `clusterLogging.collection.type` to `fluentd`:
42+
43+
[source,yaml]
44+
----
45+
parameters:
46+
openshift4_logging:
47+
clusterLogging:
48+
collection:
49+
type: fluentd <1>
50+
----
51+
<1> Set Fluentd in `clusterLogging`
52+
53+
3554
== Move `clusterLogging.collector.logs`
3655

3756
Move the `clusterLogging.collector.logs` parameters:

tests/elasticsearch.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,7 @@ parameters:
3737
elasticsearch:
3838
enabled: true
3939
clusterLogging:
40+
collection:
41+
type: fluentd
4042
logStore:
41-
type: lokistack
43+
type: elasticsearch

tests/golden/defaults/openshift4-logging/openshift4-logging/30_cluster_logging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
namespace: openshift-logging
1010
spec:
1111
collection:
12-
type: fluentd
12+
type: vector
1313
logStore:
1414
lokistack:
1515
name: loki

tests/golden/elasticsearch/openshift4-logging/openshift4-logging/30_cluster_logging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
infra:
2929
maxAge: 30d
3030
pruneNamespacesInterval: 15m
31-
type: lokistack
31+
type: elasticsearch
3232
managementState: Managed
3333
visualization:
3434
kibana:

tests/golden/master/openshift4-logging/openshift4-logging/30_cluster_logging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
namespace: openshift-logging
1010
spec:
1111
collection:
12-
type: fluentd
12+
type: vector
1313
logStore:
1414
lokistack:
1515
name: loki

tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,3 +204,14 @@ spec:
204204
severity: warning
205205
syn: 'true'
206206
syn_component: openshift4-logging
207+
- alert: SYN_LokistackSchemaUpgradesRequired
208+
annotations:
209+
message: Object storage schema needs upgrade.
210+
runbook_url: https://github.com/grafana/loki/blob/main/operator/docs/lokistack/sop.md#Lokistack-Schema-Upgrades-Required
211+
summary: The applied storage schema config is old and should be upgraded.
212+
expr: sum by(stack_id) (lokistack_warnings_count) > 0
213+
labels:
214+
resource: '{{ $labels.stack_id}}'
215+
severity: warning
216+
syn: 'true'
217+
syn_component: openshift4-logging

tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_cluster_logging.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
namespace: openshift-logging
1010
spec:
1111
collection:
12-
type: fluentd
12+
type: vector
1313
logStore:
1414
lokistack:
1515
name: loki

0 commit comments

Comments
 (0)