From b4191acf24bf110319e0b6bc69c507f6051ea232 Mon Sep 17 00:00:00 2001
From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com>
Date: Wed, 18 Dec 2024 15:55:53 -0500
Subject: [PATCH] Cleanup

---
 CHANGELOG.md                                           | 4 ++--
 logging/fb/fluent-bit_config.configmap_opensearch.yaml | 1 -
 logging/fb/fluent-bit_helm_values_opensearch.yaml      | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f5b319..9c71b5ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,12 @@
 ## Unreleased
 * **Logging**
   * [SECURITY] Fluent Bit log collecting pods no longer run as `root` user.  In addition, the database used to
-maintain state information for the log collector has moved to a hostPath volume and renamed. A new initContainer
+maintain state information for the log collector has moved to a hostPath volume and been renamed. A new initContainer
 has been added to handle migrating any existing state information and make adjustments to file ownership/permissions.
 NOTE: This initContainer runs under as `root` user but only runs briefly during the initial deployment process.
   * [SECURITY] Runtime security controls for all Fluent Bit pods (inc. both log collecting and Kubernetes event
 collecting) have been tightened.  Changes include: adding seecompProfile; and disallowing privileged containers,
-privilege escalation and write access to root filesystem.
+privilege escalation and write access to the root filesystem.
   * [SECURITY] On OpenShift, all Fluent Bit pods now use custom SCC objects to support changes described above.
   * [CHANGE] Improved handling of long log messages and those from some Crunchy Data pods
 
diff --git a/logging/fb/fluent-bit_config.configmap_opensearch.yaml b/logging/fb/fluent-bit_config.configmap_opensearch.yaml
index 2b61323d..83ea3e5a 100644
--- a/logging/fb/fluent-bit_config.configmap_opensearch.yaml
+++ b/logging/fb/fluent-bit_config.configmap_opensearch.yaml
@@ -1056,7 +1056,6 @@ data:
        HTTP_Server  On
        HTTP_Listen  0.0.0.0
        HTTP_Port    2020
-       ###storage.path /tmp/fb_buffer/
        storage.path /var/log/v4m-fb-storage
        storage.checksum off
        storage.sync normal
diff --git a/logging/fb/fluent-bit_helm_values_opensearch.yaml b/logging/fb/fluent-bit_helm_values_opensearch.yaml
index 63d45246..d334c4bb 100644
--- a/logging/fb/fluent-bit_helm_values_opensearch.yaml
+++ b/logging/fb/fluent-bit_helm_values_opensearch.yaml
@@ -28,10 +28,6 @@ extraVolumeMounts:
   name: v4m-fb-storage
   readOnly: false
 extraVolumes:
-###- hostPath:
-###    path: /var/log
-###    #type: DirectoryOrCreate
-###  name: var-log
 - hostPath:
     path: /var/log/v4m-fb-storage
     type: DirectoryOrCreate