diff --git a/CHANGELOG.md b/CHANGELOG.md index e5ac492f..5dd178d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ # SAS Viya Monitoring for Kubernetes +## Unreleased +* **Logging** + * [CHANGE] We have changed how we handle defining extra volumes for the Fluent Bit log collecting pods. +This change should be transparent to virtually all users. However, if you define additional volumes for +these pods, you will need to update your configuration to eliminate references to certain default volumes. +Refer to the updated [samples/generic-base/logging/user-values-fluent-bit-opensearch.yaml](samples/generic-base/logging/user-values-fluent-bit-opensearch.yaml) +file for details and adjust the contents of your `$USER_DIR/logging/user-values-fluent-bit-opensearch.yaml` +file accordingly. + + ## Version 1.2.42 (16SEP2025) * **Logging** * [FIX] Corrected handling of unavailable API endpoint in deploy_opensearch_content.sh diff --git a/logging/fb/fluent-bit_helm_values_opensearch.yaml b/logging/fb/fluent-bit_helm_values_opensearch.yaml index d334c4bb..77931805 100644 --- a/logging/fb/fluent-bit_helm_values_opensearch.yaml +++ b/logging/fb/fluent-bit_helm_values_opensearch.yaml @@ -17,7 +17,15 @@ podLabels: fbout: es serviceMonitor: enabled: false -extraVolumeMounts: +daemonSetVolumeMounts: +- name: varlog + mountPath: /var/log +- name: varlibdockercontainers + mountPath: /var/lib/docker/containers + readOnly: true +- name: etcmachineid + mountPath: /etc/machine-id + readOnly: true - mountPath: /fluent-bit/etc/viya-parsers.conf name: parsers-config subPath: viya-parsers.conf @@ -27,7 +35,17 @@ extraVolumeMounts: - mountPath: /var/log/v4m-fb-storage name: v4m-fb-storage readOnly: false -extraVolumes: +daemonSetVolumes: +- name: varlog + hostPath: + path: /var/log +- name: varlibdockercontainers + hostPath: + path: /var/lib/docker/containers +- name: etcmachineid + hostPath: + path: /etc/machine-id + type: File - hostPath: path: /var/log/v4m-fb-storage type: DirectoryOrCreate diff --git a/logging/user-values-fluent-bit-opensearch.yaml b/logging/user-values-fluent-bit-opensearch.yaml index 7e3591df..09ea873b 100644 --- a/logging/user-values-fluent-bit-opensearch.yaml +++ b/logging/user-values-fluent-bit-opensearch.yaml @@ -1,12 +1,18 @@ -# Chart: https://github.com/fluent/helm-charts/blob/fluent-bit-0.40.0/charts/fluent-bit -# Default values: https://github.com/fluent/helm-charts/blob/fluent-bit-0.40.0/charts/fluent-bit/values.yaml +# Refer to https://github.com/sassoftware/viya4-monitoring-kubernetes/blob/stable/ARTIFACT_INVENTORY.md +# to identify the current Helm chart version in use by this project. The links below point to +# the 'main' branch as a general reference and the contents will likely differ to some degree. + +# Chart: https://github.com/fluent/helm-charts/tree/main/charts/fluent-bit +# Default values: https://github.com/fluent/helm-charts/blob/main/charts/fluent-bit/values.yaml + # NOTE: Customizations intended to alter the contents of the Fluent Bit Configuration Files # should be made by altering contents of the fluent-bit_config.configmap_open.yaml files. # Use this file to customize other Helm chart settings. + #image: -# tag: 2.1.10 +# tag: 4.0.9 # ***** extraVolumeMounts/extraVolumes - START ***** # @@ -26,23 +32,13 @@ # directory cannot be resolved, Fluent Bit # will run without ERRORs but NO log messages # will be collected. -# -# NOTE: The extraVolumeMounts and extraVolumes entries -# related to parsers-config need to be uncommented as -# well but should not be edited beyond that. + #extraVolumeMounts: -#- mountPath: /fluent-bit/etc/viya-parsers.conf -# name: parsers-config -# subPath: viya-parsers.conf #- mountPath: /data01/var/lib/docker/containers # name: path2dockercontainers # readOnly: true #extraVolumes: -#- configMap: -# defaultMode: 420 -# name: fb-viya-parsers -# name: parsers-config #- hostPath: # path: /data01/var/lib/docker/containers # type: "" diff --git a/samples/generic-base/logging/user-values-fluent-bit-opensearch.yaml b/samples/generic-base/logging/user-values-fluent-bit-opensearch.yaml index 7e3591df..09ea873b 100644 --- a/samples/generic-base/logging/user-values-fluent-bit-opensearch.yaml +++ b/samples/generic-base/logging/user-values-fluent-bit-opensearch.yaml @@ -1,12 +1,18 @@ -# Chart: https://github.com/fluent/helm-charts/blob/fluent-bit-0.40.0/charts/fluent-bit -# Default values: https://github.com/fluent/helm-charts/blob/fluent-bit-0.40.0/charts/fluent-bit/values.yaml +# Refer to https://github.com/sassoftware/viya4-monitoring-kubernetes/blob/stable/ARTIFACT_INVENTORY.md +# to identify the current Helm chart version in use by this project. The links below point to +# the 'main' branch as a general reference and the contents will likely differ to some degree. + +# Chart: https://github.com/fluent/helm-charts/tree/main/charts/fluent-bit +# Default values: https://github.com/fluent/helm-charts/blob/main/charts/fluent-bit/values.yaml + # NOTE: Customizations intended to alter the contents of the Fluent Bit Configuration Files # should be made by altering contents of the fluent-bit_config.configmap_open.yaml files. # Use this file to customize other Helm chart settings. + #image: -# tag: 2.1.10 +# tag: 4.0.9 # ***** extraVolumeMounts/extraVolumes - START ***** # @@ -26,23 +32,13 @@ # directory cannot be resolved, Fluent Bit # will run without ERRORs but NO log messages # will be collected. -# -# NOTE: The extraVolumeMounts and extraVolumes entries -# related to parsers-config need to be uncommented as -# well but should not be edited beyond that. + #extraVolumeMounts: -#- mountPath: /fluent-bit/etc/viya-parsers.conf -# name: parsers-config -# subPath: viya-parsers.conf #- mountPath: /data01/var/lib/docker/containers # name: path2dockercontainers # readOnly: true #extraVolumes: -#- configMap: -# defaultMode: 420 -# name: fb-viya-parsers -# name: parsers-config #- hostPath: # path: /data01/var/lib/docker/containers # type: ""