Skip to content

Commit c0c1f70

Browse files
committed
[CHANGE] alter how volume definitions for Fluent Bit log collector pods are handled
1 parent 975f69f commit c0c1f70

File tree

2 files changed

+30
-16
lines changed

2 files changed

+30
-16
lines changed

logging/fb/fluent-bit_helm_values_opensearch.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,15 @@ podLabels:
1717
fbout: es
1818
serviceMonitor:
1919
enabled: false
20-
extraVolumeMounts:
20+
daemonSetVolumeMounts:
21+
- name: varlog
22+
mountPath: /var/log
23+
- name: varlibdockercontainers
24+
mountPath: /var/lib/docker/containers
25+
readOnly: true
26+
- name: etcmachineid
27+
mountPath: /etc/machine-id
28+
readOnly: true
2129
- mountPath: /fluent-bit/etc/viya-parsers.conf
2230
name: parsers-config
2331
subPath: viya-parsers.conf
@@ -27,7 +35,17 @@ extraVolumeMounts:
2735
- mountPath: /var/log/v4m-fb-storage
2836
name: v4m-fb-storage
2937
readOnly: false
30-
extraVolumes:
38+
daemonSetVolumes:
39+
- name: varlog
40+
hostPath:
41+
path: /var/log
42+
- name: varlibdockercontainers
43+
hostPath:
44+
path: /var/lib/docker/containers
45+
- name: etcmachineid
46+
hostPath:
47+
path: /etc/machine-id
48+
type: File
3149
- hostPath:
3250
path: /var/log/v4m-fb-storage
3351
type: DirectoryOrCreate

logging/user-values-fluent-bit-opensearch.yaml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1-
# Chart: https://github.com/fluent/helm-charts/blob/fluent-bit-0.40.0/charts/fluent-bit
2-
# Default values: https://github.com/fluent/helm-charts/blob/fluent-bit-0.40.0/charts/fluent-bit/values.yaml
1+
# Refer to https://github.com/sassoftware/viya4-monitoring-kubernetes/blob/stable/ARTIFACT_INVENTORY.md
2+
# to identify the current Helm chart version in use by this project. The links below point to
3+
# the 'main' branch as a general reference and the contents will likely differ to some degree.
4+
5+
# Chart: https://github.com/fluent/helm-charts/tree/main/charts/fluent-bit
6+
# Default values: https://github.com/fluent/helm-charts/blob/main/charts/fluent-bit/values.yaml
7+
38

49
# NOTE: Customizations intended to alter the contents of the Fluent Bit Configuration Files
510
# should be made by altering contents of the fluent-bit_config.configmap_open.yaml files.
611
# Use this file to customize other Helm chart settings.
712

13+
814
#image:
9-
# tag: 2.1.10
15+
# tag: 4.0.9
1016

1117
# ***** extraVolumeMounts/extraVolumes - START *****
1218
#
@@ -26,23 +32,13 @@
2632
# directory cannot be resolved, Fluent Bit
2733
# will run without ERRORs but NO log messages
2834
# will be collected.
29-
#
30-
# NOTE: The extraVolumeMounts and extraVolumes entries
31-
# related to parsers-config need to be uncommented as
32-
# well but should not be edited beyond that.
35+
3336

3437
#extraVolumeMounts:
35-
#- mountPath: /fluent-bit/etc/viya-parsers.conf
36-
# name: parsers-config
37-
# subPath: viya-parsers.conf
3838
#- mountPath: /data01/var/lib/docker/containers
3939
# name: path2dockercontainers
4040
# readOnly: true
4141
#extraVolumes:
42-
#- configMap:
43-
# defaultMode: 420
44-
# name: fb-viya-parsers
45-
# name: parsers-config
4642
#- hostPath:
4743
# path: /data01/var/lib/docker/containers
4844
# type: ""

0 commit comments

Comments
 (0)