Merge pull request #78 from oracle-quickstart/v3.4.2

release v3.4.2

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2024-05-13
+### Changed
+- Fluentd collector container image uptake to 1.4.2 having changes to uptake OCI 2.21.0. 
+  - Similar updates to build files (Dockerfile, Gemfile) that helps building custom container image.
+
 ## 2024-04-29
 ### Added
 - Support for Management Agent Daemonset deployment

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: 3.4.1
+version: 3.4.2
 appVersion: "3.0.0"
 
 dependencies:

charts/logan/values.yaml

@@ -48,7 +48,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.4.1
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.2
    # -- Image pull policy
    imagePullPolicy: Always
 

charts/oci-onm/Chart.yaml

@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.4.1
+version: 3.4.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -32,7 +32,7 @@ dependencies:
   repository: "file://../common"
   condition: oci-onm-common.enabled
 - name: oci-onm-logan
-  version: "3.4.1"
+  version: "3.4.2"
   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.4.1
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.2
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID

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

@@ -27,7 +27,7 @@ RUN microdnf -y module enable ruby:3.1 \
  && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.3.7 \
  && gem install bundler -v 2.3.25 \
 # Install development dependent packages for gems native installation
- && microdnf -y install --nodocs gcc make redhat-rpm-config openssl ruby-devel gcc-c++ libtool libffi-devel bzip2 git \
+ && microdnf --enablerepo ol8_codeready_builder -y install --nodocs gcc make redhat-rpm-config openssl ruby-devel gcc-c++ libtool libffi-devel bzip2 git libyaml-devel \
 # Install Fluentd, it's dependencies along with other run time dependencies for OCI Logging Analytics Solution
  && bundle config silence_root_warning true \ 
  && bundle config --local path /fluentd/vendor/bundle \

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

@@ -11,7 +11,7 @@ gem "fluent-plugin-concat", "~> 2.5.0"
 gem "fluent-plugin-rewrite-tag-filter", "~> 2.4.0"
 gem "fluent-plugin-parser-cri", "~> 0.1.1"
 gem "fluent-plugin-kubernetes_metadata_filter", "3.3.0"
-gem "oci-logging-analytics-kubernetes-discovery", "1.0.0"
+gem "oci-logging-analytics-kubernetes-discovery", "1.0.1"
 gem "fluent-plugin-record-modifier", "2.1.1"
 gem "fluent-plugin-cloudwatch-logs", "0.14.3"
 gem "fluent-plugin-s3", "1.7.2"

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

@@ -27,6 +27,7 @@ GEM
       aws-eventstream (~> 1, >= 1.0.2)
     concurrent-ruby (1.2.3)
     cool.io (1.8.0)
+    event_stream_parser (1.0.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ffi (1.15.5)
@@ -103,20 +104,21 @@ GEM
     msgpack (1.7.2)
     multi_json (1.15.0)
     netrc (0.11.0)
-    oci (2.20.0)
+    oci (2.21.0)
+      event_stream_parser (~> 1.0.0)
       inifile (~> 3.0, >= 3.0.0)
       json (>= 1.4.6, < 3.0.0)
       jwt (~> 2.1)
-      psych (>= 3.1.0, < 5.0.0)
-    oci-logging-analytics-kubernetes-discovery (1.0.0)
+      psych (>= 5.0.1, < 5.1.2)
+    oci-logging-analytics-kubernetes-discovery (1.0.1)
       concurrent-ruby (~> 1.2.2)
       kubeclient (~> 4.9.3)
-      oci (~> 2.20.0)
+      oci (~> 2.20)
       rubyzip (~> 2.3.2)
       yajl-ruby (~> 1.0)
     oj (3.16.1)
     prometheus-client (4.0.0)
-    psych (4.0.6)
+    psych (5.0.1)
       stringio
     public_suffix (5.0.3)
     rake (13.0.6)
@@ -157,7 +159,7 @@ DEPENDENCIES
   fluent-plugin-s3 (= 1.7.2)
   fluentd (= 1.16.2)
   json (= 2.7.1)
-  oci-logging-analytics-kubernetes-discovery (= 1.0.0)
+  oci-logging-analytics-kubernetes-discovery (= 1.0.1)
   oj (= 3.16.1)
   rexml (= 3.2.6)