Merge branch 'main' of https://github.com/oracle-quickstart/oci-kubernetes-monitoring into disable-jre-prop

Author: prasebha

CHANGELOG.md

@@ -1,8 +1,23 @@
 # Change Log
 
-## 2024-04-22
+## 2024-06-18
+### Changed
+- Fluentd collector container image uptake to 1.4.3 having OS and other dependency updates.
+- Dockerfile (supporting custom container image builds) changes to remove patch version dependency on ruby 3.1 and related packages.
+
+## 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
+### Changed
+- Fluentd collector container image uptake to 1.4.1 having changes to uptake new OL8, ruby-default-gems versions. It also has changes to remove fluent-plugin-kubernetes-objects plugin dependency.
+  - Similar updates to build files (Dockerfile, Gemfile) that helps building custom container image.
+- Minor fixes to Documentation. 
+- Minor fix to help `Kubelet logs` to use `Kubernetes Kubelet Logs` Log Source instead of `Linux System Logs` for Kubernetes versions above 1.25.   
 
 ## 2024-03-08
 ### Added

README.md

@@ -160,7 +160,7 @@ Dashboards needs to be imported manually. Below is an example for importing Dash
 
 Use the following `helm uninstall` command to uninstall the chart. Provide the release name used when creating the chart.
 ```
-helm upgrade <release-name> --values <path-to-override-values.yaml> <path-to-helm-chart>
+helm uninstall <release-name>
 ```
 Refer [this](https://helm.sh/docs/helm/helm_uninstall/) for further details on `helm uninstall`.
   

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.0
+version: 3.4.3
 appVersion: "3.0.0"
 
 dependencies:

charts/logan/templates/logs-configmap.yaml

@@ -256,12 +256,12 @@ data:
        hostname_command {{ (($.Values.fluentd).rewriteTagPlugin).hostname_command | default "cat /etc/hostname" }}
        <rule>
        key message
-       pattern /kubelet:/
+       pattern /kubelet/
        tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.syslog.kubelet.*
        </rule>
        <rule>
        key message
-       pattern  /^((?!kubelet:).)*$/
+       pattern  /^((?!kubelet).)*$/
        tag oci{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }}.oke.syslog.syslog.*
        </rule>
     </match>

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.0
+   url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
    # -- 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.3
 
 # 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.0"
+  version: "3.4.3"
   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.0
+    url: container-registry.oracle.com/oci_observability_management/oci-la-fluentd-collector:1.4.3
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID

docs/custom-logs.md

@@ -36,13 +36,14 @@ oci-onm-logan:
   ...
   ...
   fluentd:
-      ...
-      ...
+    ...
+    ...
+    customLogs:
       custom-log1:
-         path: /var/log/containers/custom-1.log
-         ociLALogSourceName: "Custom1 Logs"
-         multilineStartRegExp: <Multi-line start expression for multi-line logs>
-         isContainerLog: true
+        path: /var/log/containers/custom-1.log
+        ociLALogSourceName: "Custom1 Logs"
+        multilineStartRegExp: <Multi-line start expression for multi-line logs>
+        isContainerLog: true
 ```
 
 The following example demonstrates a non container customLogs configuration
@@ -54,13 +55,14 @@ oci-onm-logan:
   ...
   ...
   fluentd:
-      ...
-      ...
+    ...
+    ...
+    customLogs:
       custom-log2:
-         path: /var/log/custom/custom-2.log
-         ociLALogSourceName: "Custom2 Logs"
-         multilineStartRegExp: <Multi-line start expression for multi-line logs>
-         isContainerLog: false
+        path: /var/log/custom/custom-2.log
+        ociLALogSourceName: "Custom2 Logs"
+        multilineStartRegExp: <Multi-line start expression for multi-line logs>
+        isContainerLog: false
 ```
 
 #### Use Fluentd conf

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

@@ -22,12 +22,12 @@ COPY Gemfile* /fluentd/
 # Install ruby, ruby-libs along with rubygems and bundler.
 RUN microdnf -y module enable ruby:3.1 \
 # Install ruby and ruby-libs, disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby-3.1.2 ruby-libs-3.1.2 \
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.3.7 \
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \
  && 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 \
@@ -59,9 +59,9 @@ ENV FLUENTD_DISABLE_BUNDLER_INJECTION 1
 # Install ruby, ruby-libs along with rubygems and bundler.
 RUN microdnf -y module enable ruby:3.1 \
 # Install ruby and ruby-libs, disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby-3.1.2 ruby-libs-3.1.2 \ 
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs ruby ruby-libs \ 
 # Install rubygems (it's dependencies rubygem-openssl rubygem-psych), disabling week dependencies
- && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems-3.3.7 \ 
+ && microdnf -y install --setopt=install_weak_deps=0 --nodocs rubygems \ 
  && gem install bundler -v 2.3.25 \
  && bundle config --local path /fluentd/vendor/bundle \
 # clear caches

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

@@ -4,14 +4,15 @@
 source "https://rubygems.org"
 
 gem "oj", "3.16.1"
-gem "json", "2.6.3"
+gem "json", "2.7.1"
 gem "fluentd", "1.16.2"
-gem "fluent-plugin-oci-logging-analytics", "2.0.5"
+gem "fluent-plugin-oci-logging-analytics", "2.0.6"
 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 "fluent-plugin-kubernetes-objects", "1.2.3"
+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"
+gem "rexml", "3.2.6"