Merge pull request #5 from oracle-quickstart/plugin_version_upgrades

Version upgrades for few dependencies and fluentd config change for o…

Author: santhoshkvuda

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 2022-05-18
+### Added
+- Metrics support from OCI Logging Analytics Fluentd Output Plugin.
+### Security
+- fluent-plugin-kubernetes_metadata_filter version upgrade to 2.9.5 & fluent-plugin-kubernetes-objects version upgrade to 1.1.12, for kubeclient gem upgrade to ~4.9.3 containing security fixes.
+### Breaking Changes
+- fluent-plugin-kubernetes-objects upgrade has breaking changes w.r.t Fluentd configuration for Kubernetes Object Collection.
+
 ## 2022-04-20
 ### Added
 - Pod Annotations based customiation of configuration paremeters (oci_la_log_source_name, oci_la_log_group_id, oci_la_entity_id) for logs collected through "Kubernetes Container Generic Logs".

logan/docker-images/v1.0/debian/Gemfile

@@ -1,9 +1,9 @@
 source "https://rubygems.org"
 
 gem "fluentd", "1.14.3"
-gem "fluent-plugin-oci-logging-analytics", "2.0.2"
+gem "fluent-plugin-oci-logging-analytics", "2.0.3"
 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", "2.9.1"
-gem "fluent-plugin-kubernetes-objects", "~> 1.1.7"
+gem "fluent-plugin-kubernetes_metadata_filter", "2.9.5"
+gem "fluent-plugin-kubernetes-objects", "1.1.12"

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

@@ -4,9 +4,9 @@ gem "oj", "3.10.18"
 gem "json", "2.4.1"
 gem "ext_monitor", "0.1.2"
 gem "fluentd", "1.14.3"
-gem "fluent-plugin-oci-logging-analytics", "2.0.2"
+gem "fluent-plugin-oci-logging-analytics", "2.0.3"
 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", "2.9.1"
-gem "fluent-plugin-kubernetes-objects", "~> 1.1.7"
+gem "fluent-plugin-kubernetes_metadata_filter", "2.9.5"
+gem "fluent-plugin-kubernetes-objects", "1.1.12"

logan/helm-chart/Chart.yaml

@@ -15,11 +15,11 @@ 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: 1.0.1
+version: 1.0.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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
 # appVersion here reflects OCI Logging Analytics Fluentd Output Plugin version
-appVersion: "2.0.2"
+appVersion: "2.0.3"

logan/helm-chart/values.yaml

@@ -806,7 +806,8 @@ fluentd:
          <source>
            @type kubernetes_objects
            tag k8s.*
-           api_version apps/v1
+           api_version v1
+           api_endpoint apis/apps
 
            <pull>
              resource_name daemon_sets

logan/kubernetes-resources/logs-collection/configmap-cri.yaml

@@ -569,7 +569,7 @@ data:
     # Filter to add kubernetes metadata
     <filter oci.oke.containerlogs.**>
       @type kubernetes_metadata
-      @id filter_kube_metadata
+      @id filter_kube_metadata_containerlogs
       kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}"
       verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}"
       ca_file "#{ENV['KUBERNETES_CA_FILE']}"

logan/kubernetes-resources/logs-collection/configmap-docker.yaml

@@ -576,7 +576,7 @@ data:
     # Filter to add kubernetes metadata
     <filter oci.oke.containerlogs.**>
       @type kubernetes_metadata
-      @id filter_kube_metadata
+      @id filter_kube_metadata_containerlogs
       kubernetes_url "#{ENV['FLUENT_FILTER_KUBERNETES_URL'] || 'https://' + ENV.fetch('KUBERNETES_SERVICE_HOST') + ':' + ENV.fetch('KUBERNETES_SERVICE_PORT') + '/api'}"
       verify_ssl "#{ENV['KUBERNETES_VERIFY_SSL'] || true}"
       ca_file "#{ENV['KUBERNETES_CA_FILE']}"

logan/kubernetes-resources/objects-collection/configmap-objects.yaml

@@ -71,8 +71,9 @@ data:
     <source>
 
       @type kubernetes_objects
-      tag k8s.*
-      api_version apps/v1
+      tag k8s.*      
+      api_version v1
+      api_endpoint apis/apps
 
       <pull>
         resource_name daemon_sets
@@ -100,4 +101,4 @@ data:
         message ${record}
         tag ${tag}
       </record>
-    </filter>
+    </filter>