Skip to content

Commit 07bc3e2

Browse files
Fluentd image update 1.7.1 (#122)
* fluentd collector image update to 1.7.1
1 parent ee8786d commit 07bc3e2

File tree

6 files changed

+41
-15
lines changed

6 files changed

+41
-15
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
# 2025-08-12
4+
### Changed
5+
- Fluentd collector container image has been updated to version 1.7.1
6+
37
# 2025-06-17
48
### Added
59
- 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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ apiVersion: v2
55
name: oci-onm-logan
66
description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics.
77
type: application
8-
version: 4.0.0
8+
version: 4.0.1
99
appVersion: "3.0.0"
1010

1111
dependencies:

charts/logan/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ image:
5353
# Image pull secrets for. Secret must be in the namespace defined by namespace
5454
imagePullSecrets:
5555
# -- Replace this value with actual docker image url
56-
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.0
56+
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.1
5757
# -- Image pull policy
5858
imagePullPolicy: Always
5959

charts/oci-onm/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ type: application
1818
# This is the chart version. This version number should be incremented each time you make changes
1919
# to the chart and its templates, including the app version.
2020
# Versions are expected to follow Semantic Versioning (https://semver.org/)
21-
version: 4.0.0
21+
version: 4.0.1
2222

2323
# This is the version number of the application being deployed. This version number should be
2424
# incremented each time you make changes to the application. Versions are not expected to
@@ -32,7 +32,7 @@ dependencies:
3232
repository: "file://../common"
3333
condition: oci-onm-common.enabled
3434
- name: oci-onm-logan
35-
version: "4.0.0"
35+
version: "4.0.1"
3636
repository: "file://../logan"
3737
condition: oci-onm-logan.enabled
3838
- name: oci-onm-mgmt-agent

charts/oci-onm/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ oci-onm-logan:
3131
kubernetesClusterID: "{{ .Values.global.kubernetesClusterID }}"
3232
kubernetesClusterName: "{{ .Values.global.kubernetesClusterName }}"
3333
image:
34-
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.0
34+
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.1
3535
# Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
3636
ociLANamespace:
3737
# OCI Logging Analytics Default Log Group OCID

util/build_stack.sh

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,21 @@ MODULES_SYMLINK="$STACK_BUILD_PATH/modules"
4949

5050
# Usage Instructions
5151
usage="
52-
$(basename "$0") [-h][-n name][-d][-s][-b] -- program to build OCI RMS stack zip file using oracle-quickstart/oci-kubernetes-monitoring repo.
52+
Usage: $(basename "$0") [options]
5353
54-
where:
55-
-h show this help text
56-
-n name of output zip file without extension (Optional)
57-
-l flag to generate build alongside local helm chart
58-
-r flag to generate release build; generates artefact with release name and version
59-
-s flag to turn-off output; only final build file path is printed to stdout
60-
-b flag to generate additional base64 string of stack
54+
Program to build an OCI RMS stack zip file using the oracle-quickstart/oci-kubernetes-monitoring repository.
6155
62-
The zip artifacts shall be stored at -
63-
$RELEASE_PATH"
56+
Options:
57+
-h Show this help message and exit
58+
-n <name> Name of the output zip file (without extension) [Optional]
59+
-l Bundle the local Helm chart within the stack, instead of referencing the public Helm chart repository
60+
-r Create a release build (artifact will be named using the release name and version)
61+
-s Silent mode; suppress output except for the final build file path
62+
-b Generate an additional base64-encoded string of the stack
63+
64+
Artifacts will be stored at:
65+
$RELEASE_PATH
66+
"
6467

6568
# Parse inputs
6669
while getopts "hn:lsbr" option; do
@@ -162,6 +165,23 @@ if [ -n "$INCLUDE_LOCAL_HELM" ]; then
162165
# copy the helm-chart
163166
cp -R "$HELM_SOURCE" "$STACK_BUILD_PATH" || error_and_exit "ERROR: cp -R $HELM_SOURCE $STACK_BUILD_PATH"
164167
log "Copied helm-chart at - $STACK_BUILD_PATH"
168+
169+
# Update stack variable (toggle_use_local_helm_chart) to use local charts
170+
STACK_INPUTS_TF="$STACK_BUILD_PATH/stack-inputs.tf"
171+
if awk '/variable[[:space:]]*"toggle_use_local_helm_chart"/,/\}/ {print}' $STACK_INPUTS_TF | \
172+
grep -q 'default[[:space:]]*=[[:space:]]*false'; then
173+
# Detect OS
174+
if sed --version >/dev/null 2>&1; then
175+
# Linux (GNU sed)
176+
sed -i '/variable "toggle_use_local_helm_chart"/,/^}/ s/default[[:space:]]*=[[:space:]]*false/default = true/' "$STACK_INPUTS_TF"
177+
else
178+
# macOS (BSD sed)
179+
sed -i '' '/variable "toggle_use_local_helm_chart"/,/^}/ s/default[[:space:]]*=[[:space:]]*false/default = true/' "$STACK_INPUTS_TF"
180+
fi
181+
log "Updated toggle_use_local_helm_chart to true - $STACK_INPUTS_TF"
182+
else
183+
error_and_exit "default value for toggle_use_local_helm_chart (false) not found. Nothing to update"
184+
fi
165185
fi
166186

167187
# Remove the terraform modules symlink
@@ -175,6 +195,8 @@ log "Copied terraform modules at - $STACK_BUILD_PATH"
175195
# Update the version
176196
COMMIT_HASH=$(git rev-parse HEAD)
177197

198+
# Update commit hash
199+
178200
# Detect OS
179201
if sed --version >/dev/null 2>&1; then
180202
# Linux (GNU sed)

0 commit comments

Comments
 (0)