sync from main

Author: prasebha

CHANGELOG.md

@@ -1,12 +1,17 @@
 # Change Log
 
-# 2025-08-07
+
+# 2025-08-13
 ### Added
 - New feature 'Automatic Prometheus Collection' in Management Agent. This enables agent to automatically find and identify metrics emitting pods to monitor, eliminating the need to manually create the Prometheus configuration to collect metrics.
 
 ## Changed
 - Management Agent container image has been updated to version 1.9.0
 
+# 2025-08-12
+### Changed
+- Fluentd collector container image has been updated to version 1.7.1
+
 # 2025-06-17
 ### Added
 - Introduced a new DaemonSet that uses eBPF (Extended Berkeley Packet Filter) to capture TCP connection logs and builds application/network topology representing workload to workload relationships within the Kubernetes cluster.

charts/logan/Chart.yaml

@@ -5,7 +5,7 @@ apiVersion: v2
 name: oci-onm-logan
 description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics.
 type: application
-version: 4.0.0
+version: 4.0.1
 appVersion: "3.0.0"
 
 dependencies:

charts/logan/values.yaml

@@ -53,7 +53,7 @@ image:
    # Image pull secrets for. Secret must be in the namespace defined by namespace
    imagePullSecrets:
    # -- Replace this value with actual docker image url
-   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.0
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.1
    # -- Image pull policy
    imagePullPolicy: Always
 

charts/oci-onm/Chart.yaml

@@ -32,7 +32,7 @@ dependencies:
   repository: "file://../common"
   condition: oci-onm-common.enabled
 - name: oci-onm-logan
-  version: "4.0.0"
+  version: "4.0.1"
   repository: "file://../logan"
   condition: oci-onm-logan.enabled
 - name: oci-onm-mgmt-agent

charts/oci-onm/values.yaml

@@ -31,7 +31,7 @@ oci-onm-logan:
   kubernetesClusterID: "{{ .Values.global.kubernetesClusterID }}"
   kubernetesClusterName: "{{ .Values.global.kubernetesClusterName }}"
   image:
-    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.0
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.1
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID

util/build_stack.sh

@@ -49,18 +49,21 @@ MODULES_SYMLINK="$STACK_BUILD_PATH/modules"
 
 # Usage Instructions
 usage="
-$(basename "$0") [-h][-n name][-d][-s][-b] -- program to build OCI RMS stack zip file using oracle-quickstart/oci-kubernetes-monitoring repo.
+Usage: $(basename "$0") [options]
 
-where:
-    -h  show this help text
-    -n  name of output zip file without extension (Optional)
-    -l  flag to generate build alongside local helm chart
-    -r  flag to generate release build; generates artefact with release name and version
-    -s  flag to turn-off output; only final build file path is printed to stdout
-    -b  flag to generate additional base64 string of stack
+Program to build an OCI RMS stack zip file using the oracle-quickstart/oci-kubernetes-monitoring repository.
 
-The zip artifacts shall be stored at -
-    $RELEASE_PATH"
+Options:
+  -h            Show this help message and exit
+  -n <name>     Name of the output zip file (without extension) [Optional]
+  -l            Bundle the local Helm chart within the stack, instead of referencing the public Helm chart repository
+  -r            Create a release build (artifact will be named using the release name and version)
+  -s            Silent mode; suppress output except for the final build file path
+  -b            Generate an additional base64-encoded string of the stack
+
+Artifacts will be stored at:
+  $RELEASE_PATH
+"
 
 # Parse inputs
 while getopts "hn:lsbr" option; do
@@ -162,6 +165,23 @@ if [ -n "$INCLUDE_LOCAL_HELM" ]; then
     # copy the helm-chart
     cp -R "$HELM_SOURCE" "$STACK_BUILD_PATH" || error_and_exit "ERROR: cp -R $HELM_SOURCE $STACK_BUILD_PATH"
     log "Copied helm-chart at - $STACK_BUILD_PATH"
+
+    # Update stack variable (toggle_use_local_helm_chart) to use local charts
+    STACK_INPUTS_TF="$STACK_BUILD_PATH/stack-inputs.tf"
+    if awk '/variable[[:space:]]*"toggle_use_local_helm_chart"/,/\}/ {print}' $STACK_INPUTS_TF | \
+            grep -q 'default[[:space:]]*=[[:space:]]*false'; then
+        # Detect OS
+        if sed --version >/dev/null 2>&1; then
+            # Linux (GNU sed)
+            sed -i '/variable "toggle_use_local_helm_chart"/,/^}/ s/default[[:space:]]*=[[:space:]]*false/default = true/' "$STACK_INPUTS_TF"
+        else
+            # macOS (BSD sed)
+            sed -i '' '/variable "toggle_use_local_helm_chart"/,/^}/ s/default[[:space:]]*=[[:space:]]*false/default = true/' "$STACK_INPUTS_TF"
+        fi
+        log "Updated toggle_use_local_helm_chart to true - $STACK_INPUTS_TF"
+    else
+        error_and_exit "default value for toggle_use_local_helm_chart (false) not found. Nothing to update"
+    fi
 fi
 
 # Remove the terraform modules symlink
@@ -175,6 +195,8 @@ log "Copied terraform modules at - $STACK_BUILD_PATH"
 # Update the version
 COMMIT_HASH=$(git rev-parse HEAD)
 
+# Update commit hash
+
 # Detect OS
 if sed --version >/dev/null 2>&1; then
     # Linux (GNU sed)