Skip to content

Commit 924df5b

Browse files
Address CVEs in logan fluentd container image (#141)
* address CVEs in logan fluentd container image
1 parent 8b8defe commit 924df5b

9 files changed

Lines changed: 34 additions & 22 deletions

File tree

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@ releases/
7474
.vscode
7575

7676
# debug files
77-
tf-debug/
77+
tf-debug/
78+
/.codex
79+
/.idea/

CHANGELOG.md

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

3+
# 2026-04-29
4+
### Changed
5+
- Fluentd collector container image has been updated to version 1.7.5 having Oracle Linux Base Image Updates and dependency gem updates.
6+
- Similar updates to build files (Dockerfile, Gemfile) that helps building custom container image.
7+
38
# 2026-02-17
49
### Changed
510
- Fluentd collector container image has been updated to version 1.7.4 having OS and discovery gem update

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 Log Analytics.
77
type: application
8-
version: 4.2.0
8+
version: 4.2.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.4
56+
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.5
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.2.0
21+
version: 4.2.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.2.0"
35+
version: "4.2.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.4
34+
url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.7.5
3535
# Go to OCI Log Analytics Administration, click Service Details, and note the namespace value.
3636
ociLANamespace:
3737
# OCI Log Analytics Default Log Group OCID

logan/docker-images/v1.0/oraclelinux/8-slim/Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
2020
COPY Gemfile* /fluentd/
2121
COPY tcpconnect.* /fluentd/
2222

23-
# Install ruby, ruby-libs along with rubygems and bundler.
24-
RUN microdnf -y module enable ruby:3.3 \
23+
# Apply current Oracle Linux security errata before layering runtime dependencies.
24+
RUN microdnf -y update --setopt=install_weak_deps=0 --nodocs \
25+
&& microdnf -y module enable ruby:3.3 \
2526
# Install ruby and ruby-libs, disabling week dependencies
2627
&& microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \
2728
# Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
@@ -63,8 +64,9 @@ ENV GEM_HOME /fluentd/vendor/bundle/ruby/3.3
6364
# skip runtime bundler installation
6465
ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
6566

66-
# Install ruby, ruby-libs along with rubygems and bundler.
67-
RUN microdnf -y module enable ruby:3.3 \
67+
# Apply current Oracle Linux security errata before installing runtime packages.
68+
RUN microdnf -y update --setopt=install_weak_deps=0 --nodocs \
69+
&& microdnf -y module enable ruby:3.3 \
6870
# Install ruby and ruby-libs, disabling week dependencies
6971
&& microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \
7072
# Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies

logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ gem "oci-logging-analytics-kubernetes-discovery", "1.3.0"
1515
gem "fluent-plugin-record-modifier", "2.2.0"
1616
gem "fluent-plugin-cloudwatch-logs", "0.14.3"
1717
gem "fluent-plugin-s3", "1.7.2"
18-
gem "rexml", "3.4.0"
18+
gem "rexml", "3.4.4"

logan/docker-images/v1.0/oraclelinux/8-slim/Gemfile.lock

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.7)
5-
public_suffix (>= 2.0.2, < 7.0)
4+
addressable (2.9.0)
5+
public_suffix (>= 2.0.2, < 8.0)
66
aws-eventstream (1.3.0)
7-
aws-partitions (1.958.0)
7+
aws-partitions (1.1239.0)
88
aws-sdk-cloudwatchlogs (1.87.0)
99
aws-sdk-core (~> 3, >= 3.201.0)
1010
aws-sigv4 (~> 1.5)
11-
aws-sdk-core (3.201.3)
11+
aws-sdk-core (3.244.0)
1212
aws-eventstream (~> 1, >= 1.3.0)
13-
aws-partitions (~> 1, >= 1.651.0)
14-
aws-sigv4 (~> 1.8)
13+
aws-partitions (~> 1, >= 1.992.0)
14+
aws-sigv4 (~> 1.9)
15+
base64
16+
bigdecimal
1517
jmespath (~> 1, >= 1.6.1)
18+
logger
1619
aws-sdk-kms (1.88.0)
1720
aws-sdk-core (~> 3, >= 3.201.0)
1821
aws-sigv4 (~> 1.5)
19-
aws-sdk-s3 (1.156.0)
20-
aws-sdk-core (~> 3, >= 3.201.0)
22+
aws-sdk-s3 (1.219.0)
23+
aws-sdk-core (~> 3, >= 3.244.0)
2124
aws-sdk-kms (~> 1)
2225
aws-sigv4 (~> 1.5)
2326
aws-sdk-sqs (1.80.0)
@@ -107,7 +110,7 @@ GEM
107110
llhttp-ffi (0.5.0)
108111
ffi-compiler (~> 1.0)
109112
rake (~> 13.0)
110-
logger (1.6.1)
113+
logger (1.7.0)
111114
lru_redux (1.1.0)
112115
mime-types (3.5.2)
113116
mime-types-data (~> 3.2015)
@@ -141,7 +144,7 @@ GEM
141144
http-cookie (>= 1.0.2, < 2.0)
142145
mime-types (>= 1.16, < 4.0)
143146
netrc (~> 0.8)
144-
rexml (3.4.0)
147+
rexml (3.4.4)
145148
rubyzip (2.3.2)
146149
serverengine (2.3.2)
147150
sigdump (~> 0.2.2)
@@ -171,7 +174,7 @@ DEPENDENCIES
171174
json (= 2.7.2)
172175
oci-logging-analytics-kubernetes-discovery (= 1.0.2)
173176
oj (= 3.16.4)
174-
rexml (= 3.4.0)
177+
rexml (= 3.4.4)
175178

176179
BUNDLED WITH
177180
2.5.16

0 commit comments

Comments
 (0)