Merge pull request #125 from appuio/feat/vector-as-default

Vector is now the default logging collector
appuio · Mar 1, 2024 · f1e3641 · f1e3641
2 parents ba59818 + eaa875a
commit f1e3641
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 6 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -86,7 +86,7 @@ parameters:
           nodeSelector:
             node-role.kubernetes.io/infra: ''
       collection:
-        type: fluentd
+        type: vector
 
     clusterLogForwarding:
       enabled: false

diff --git a/docs/modules/ROOT/pages/how-tos/upgrade-v2.x-v3.x.adoc b/docs/modules/ROOT/pages/how-tos/upgrade-v2.x-v3.x.adoc
@@ -3,6 +3,10 @@
 Elasticsearch is deprecated.
 The component will deploy Lokistack by default, for keeping elasticsearch apply config below.
 
+Fluentd collector is deprecated.
+The component will deploy Vector by default, for keeping Fluentd apply config below.
+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].
+
 The parameter `clusterLogging.collector.logs` is deprecated.
 The component is backwards compatible, but moving the parameters to `clusterLogging.collector` is highly encouraged.
 
@@ -32,6 +36,21 @@ parameters:
 <3> Set Elasticsearch in `clusterLogging`
 
 
+== Keep Fluentd as Log collector
+
+Set `clusterLogging.collection.type` to `fluentd`:
+
+[source,yaml]
+----
+parameters:
+  openshift4_logging:
+    clusterLogging:
+      collection:
+        type: fluentd <1>
+----
+<1> Set Fluentd in `clusterLogging`
+
+
 == Move `clusterLogging.collector.logs`
 
 Move the `clusterLogging.collector.logs` parameters:

diff --git a/tests/elasticsearch.yml b/tests/elasticsearch.yml
@@ -37,5 +37,7 @@ parameters:
       elasticsearch:
         enabled: true
     clusterLogging:
+      collection:
+        type: fluentd
       logStore:
-        type: lokistack
+        type: elasticsearch
diff --git a/tests/golden/defaults/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/defaults/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    type: fluentd
+    type: vector
   logStore:
     lokistack:
       name: loki

diff --git a/tests/golden/elasticsearch/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/elasticsearch/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -28,7 +28,7 @@ spec:
       infra:
         maxAge: 30d
         pruneNamespacesInterval: 15m
-    type: lokistack
+    type: elasticsearch
   managementState: Managed
   visualization:
     kibana:

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    type: fluentd
+    type: vector
   logStore:
     lokistack:
       name: loki

diff --git a/tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml b/tests/golden/master/openshift4-logging/openshift4-logging/60_lokistack_alerts.yaml
@@ -204,3 +204,14 @@ spec:
             severity: warning
             syn: 'true'
             syn_component: openshift4-logging
+        - alert: SYN_LokistackSchemaUpgradesRequired
+          annotations:
+            message: Object storage schema needs upgrade.
+            runbook_url: https://github.com/grafana/loki/blob/main/operator/docs/lokistack/sop.md#Lokistack-Schema-Upgrades-Required
+            summary: The applied storage schema config is old and should be upgraded.
+          expr: sum by(stack_id) (lokistack_warnings_count) > 0
+          labels:
+            resource: '{{ $labels.stack_id}}'
+            severity: warning
+            syn: 'true'
+            syn_component: openshift4-logging
diff --git a/tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_cluster_logging.yaml b/tests/golden/multilineerr/openshift4-logging/openshift4-logging/30_cluster_logging.yaml
@@ -9,7 +9,7 @@ metadata:
   namespace: openshift-logging
 spec:
   collection:
-    type: fluentd
+    type: vector
   logStore:
     lokistack:
       name: loki