Merge pull request #6 from oracle-quickstart/wl_objects_p2

Collection support for StatefulSet, Job and CronJob objects.

Author: santhoshkvuda

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 2022-07-13
+### Added
+- Collection support for StatefulSet, Job and CronJob objects.
+
 ## 2022-05-18
 ### Added
 - Metrics support from OCI Logging Analytics Fluentd Output Plugin.

logan/helm-chart/Chart.yaml

@@ -15,7 +15,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: 1.0.2
+version: 1.0.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

logan/helm-chart/templates/clusterrole-objects.yaml

@@ -15,9 +15,10 @@ rules:
       - watch
   - apiGroups:
       - apps
+      - batch
     resources:
       - '*'
     verbs:
       - get
       - list
-      - watch
+      - watch

logan/helm-chart/values.yaml

@@ -821,6 +821,39 @@ fluentd:
              resource_name deployments
              interval {{ .Values.objectsPollingFrequency }}
            </pull>
+           <pull>
+             resource_name stateful_sets
+             interval {{ .Values.objectsPollingFrequency }}
+           </pull>
+         </source>
+
+         <source>
+           @type kubernetes_objects
+           tag k8s.*
+           api_version v1
+           api_endpoint apis/batch
+                               
+           <pull>
+             resource_name jobs
+             interval {{ .Values.objectsPollingFrequency }}
+           </pull>
+           <pull>
+             resource_name cron_jobs
+             interval {{ .Values.objectsPollingFrequency }}
+           </pull>
+         </source>
+         
+         # To support cronJob Object collection for Kubernetes versions <= 1.19 where cronJob is available under v1beta1 api version
+         <source>
+           @type kubernetes_objects
+           tag k8s.*
+           api_version v1beta1
+           api_endpoint apis/batch
+                               
+           <pull>
+             resource_name cron_jobs
+             interval {{ .Values.objectsPollingFrequency }}
+           </pull>
          </source>  	 		 
 
          <filter k8s.**>

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

@@ -593,7 +593,6 @@ data:
        oci_la_log_source_name ${record.dig("kubernetes", "annotations", "oracle.com/oci_la_log_source_name") ? record.dig("kubernetes", "annotations", "oracle.com/oci_la_log_source_name") : "Kubernetes Container Generic Logs"}
        oci_la_entity_id ${record.dig("kubernetes", "annotations", "oracle.com/oci_la_entity_id") ? record.dig("kubernetes", "annotations", "oracle.com/oci_la_entity_id") : ""}
        oci_la_log_set ${record.dig("kubernetes", "annotations", "oracle.com/oci_la_log_set") ? record.dig("kubernetes", "annotations", "oracle.com/oci_la_log_set") : ""}
-       message "${record['log']}"
        tag ${tag}
        </record>
     </filter>

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

@@ -87,6 +87,43 @@ data:
         resource_name deployments
         interval 5m
       </pull>
+      <pull>
+        resource_name stateful_sets
+        interval 5m
+      </pull>
+
+    </source>
+
+    <source>
+
+      @type kubernetes_objects
+      tag k8s.*
+      api_version v1
+      api_endpoint apis/batch
+
+      <pull>
+        resource_name jobs
+        interval 5m
+      </pull>
+      <pull>
+        resource_name cron_jobs
+        interval 5m
+      </pull>
+
+    </source>
+    
+    # To support cronJob Object collection for Kubernetes versions <= 1.19 where cronJob is available under v1beta1 api version.
+    <source>
+
+      @type kubernetes_objects
+      tag k8s.*
+      api_version v1beta1
+      api_endpoint apis/batch
+
+      <pull>
+        resource_name cron_jobs
+        interval 5m
+      </pull>
 
     </source>
 

logan/kubernetes-resources/objects-collection/fluentd-deployment.yaml

@@ -22,6 +22,7 @@ rules:
       - watch
   - apiGroups:
       - apps
+      - batch
     resources:
       - '*'
     verbs: