From 1fc2453886d9c5c1980ec716710676302ade31f3 Mon Sep 17 00:00:00 2001
From: gsmith-sas <65406958+gsmith-sas@users.noreply.github.com>
Date: Fri, 29 Aug 2025 13:00:47 -0400
Subject: [PATCH] [FIX] Log messages from Prometheus Operator pod redirected to
 OpenSearch viya_ops-*

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b76eefd..d4eec066 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # SAS Viya Monitoring for Kubernetes
 ## Unreleased
 * **Logging**
+  * [FIX] Log messages from Prometheus Operator pod redirected to OpenSearch viya_ops-* (rather than viya_logs-*) index
   * [UPGRADE] OpenSearch and OpenSearch Dashboards upgraded from 2.19.2 to 2.19.3
   * [UPGRADE] OpenSearch Helm chart upgraded from 2.34.0 to 2.35.0.
   * [UPGRADE] OpenSearch Dashboards Helm chart upgraded from 2.30.0 to 2.31.0
diff --git a/logging/fb/fluent-bit_config.configmap_azmonitor.yaml b/logging/fb/fluent-bit_config.configmap_azmonitor.yaml
index 3b87e1da..1c4bbe7a 100644
--- a/logging/fb/fluent-bit_config.configmap_azmonitor.yaml
+++ b/logging/fb/fluent-bit_config.configmap_azmonitor.yaml
@@ -6,7 +6,7 @@ data:
     [FILTER]
        Name modify
        Match *
-       Set  fb_configMap_version 0.2.27
+       Set  fb_configMap_version 0.2.28candidate
        #Set clusterID NOT_SET
        # initialized to N to force level standardization
        Set  __temp_level_fixed   N
@@ -975,7 +975,7 @@ data:
        Name             tail
        Alias            tail4logs
        Path             /var/log/containers/*.log
-       Exclude_Path     /var/log/containers/v4m-*.log
+       Exclude_Path     /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log
        Parser           ${KUBERNETES_RUNTIME_LOGFMT}
        Tag              kube.*
        Multiline.parser    ${LOG_MULTILINE_PARSER}
@@ -991,7 +991,7 @@ data:
        # NOTE: ** METALOGGING **
        Name             tail
        Alias            tail4ops
-       Path             /var/log/containers/v4m-*.log
+       Path             /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log
        Parser           ${KUBERNETES_RUNTIME_LOGFMT}
        Tag              opsK.*
        Refresh_Interval    5
diff --git a/logging/fb/fluent-bit_config.configmap_opensearch.yaml b/logging/fb/fluent-bit_config.configmap_opensearch.yaml
index a402cea2..1b138dfe 100644
--- a/logging/fb/fluent-bit_config.configmap_opensearch.yaml
+++ b/logging/fb/fluent-bit_config.configmap_opensearch.yaml
@@ -6,7 +6,7 @@ data:
     [FILTER]
        Name modify
        Match *
-       Set  fb_configMap_version 0.2.27
+       Set  fb_configMap_version 0.2.28candidate
        #Set clusterID NOT_SET
        # initialized to N to force level standardization
        Set  __temp_level_fixed   N
@@ -977,7 +977,7 @@ data:
        Name             tail
        Alias            tail4logs
        Path             /var/log/containers/*.log
-       Exclude_Path     /var/log/containers/v4m-*.log
+       Exclude_Path     /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log
        Parser           ${KUBERNETES_RUNTIME_LOGFMT}
        Tag              kube.*
        Multiline.parser    ${LOG_MULTILINE_PARSER}
@@ -993,7 +993,7 @@ data:
        # NOTE: ** METALOGGING **
        Name             tail
        Alias            tail4ops
-       Path             /var/log/containers/v4m-*.log
+       Path             /var/log/containers/v4m-*.log, /var/log/containers/prometheus-v4m-*.log
        Parser           ${KUBERNETES_RUNTIME_LOGFMT}
        Tag              opsK.*
        Refresh_Interval    5