Support for OKE Infra and Service Log Collection

charts/logan/templates/discovery-cronjob.yaml

@@ -12,15 +12,20 @@ metadata:
 spec:
   schedule: {{ .Values.k8sDiscovery.objects.cronSchedule | quote }}
   startingDeadlineSeconds: 120
-  concurrencyPolicy: Replace
+  concurrencyPolicy: Forbid
   successfulJobsHistoryLimit: {{ .Values.k8sDiscovery.objects.successfulJobsHistoryLimit }}
   failedJobsHistoryLimit: {{ .Values.k8sDiscovery.objects.failedJobsHistoryLimit }}
   jobTemplate:
     spec:
-      backoffLimit: {{ .Values.k8sDiscovery.objects.backoffLimit }}
+      backoffLimit: 0 #{{ .Values.k8sDiscovery.objects.backoffLimit }} #TODO: should we hardcode to 0 now; current default is 2
+      # Specifies the number of retries before marking this job failed. Defaults to 6
+      activeDeadlineSeconds: 590 # TODO: Max time to finish a job: ~10 minutes; 10 seconds buffer for K8s to kill the job before next one is ready to start
+      # Specifies the duration in seconds relative to the startTime that the job may be continuously active before the system tries to terminate it; value must be positive integer. 
+      # If a Job is suspended (at creation or through an update), this timer will effectively be stopped and reset when the Job is resumed again.
+      ttlSecondsAfterFinished: 3600 # TODO: Check if this helps in avoiding deletion of timed out pods
       template:
         spec:
-          restartPolicy: {{ .Values.k8sDiscovery.objects.restartPolicy }}
+          restartPolicy: "Never" #{{ .Values.k8sDiscovery.objects.restartPolicy }} #TODO: Should hardcode to never
           serviceAccountName: {{ $serviceAccount }}
           {{- if .Values.image.imagePullSecrets }}
           imagePullSecrets:
@@ -83,10 +88,6 @@ spec:
               - --oci_domain
               - {{ .Values.ociDomain }}
             {{- end }}
-            {{- if .Values.k8sDiscovery.objects.discoveryMode }}
-              - --discovery
-              - {{ .Values.k8sDiscovery.objects.discoveryMode }}
-            {{- end }}
             {{- if .Values.k8sDiscovery.objects.log_format }}
               - --log_format
               - {{ .Values.k8sDiscovery.objects.log_format }}
@@ -107,6 +108,31 @@ spec:
             {{- if .Values.k8sDiscovery.objects.collect_warning_events_only }}
               - --collect_warning_events_only
             {{- end }}
+            {{- /* Infra Discovery */}}
+          {{- if eq .Values.k8sDiscovery.infra.enable_service_log true }}
+              - --enable_service_log
+            {{- if eq .Values.k8sDiscovery.infra.probe_all_compartments true }}
+              {{- if .Values.k8sDiscovery.infra.tenancy_ocid }}
+              - --probe_all_compartments
+              - --tenancy_ocid
+              - {{ .Values.k8sDiscovery.infra.tenancy_ocid | quote }}
+              {{- else -}}
+                {{- required "tenancy ocid must be set when probe_all_compartments is set as true" .Values.k8sDiscovery.infra.tenancy_ocid }}
+              {{- end }}
+            {{- end }}
+            {{- if .Values.k8sDiscovery.infra.oci_tags_base64 }}
+              - --oci_tags_base64
+              - {{ .Values.k8sDiscovery.infra.oci_tags_base64 }}
+            {{- end }}
+            {{- if  .Values.k8sDiscovery.infra.rms_template_base64_encoded }}
+              - --rms_template_base64_encoded
+              - {{ .Values.k8sDiscovery.infra.rms_template_base64_encoded }}
+            {{- end }}
+            {{- if  .Values.k8sDiscovery.infra.stack_operation_timeout }}
+              - --stack_operation_timeout
+              - {{ .Values.k8sDiscovery.infra.stack_operation_timeout | quote }}
+            {{- end }}
+          {{- end }}
             {{- /* optional kubernetes cluster configuration */}}
             {{- if .Values.k8sDiscovery.kubeClientOptions.kubernetes_url }}
               - --kubernetes_url

charts/logan/values.yaml

@@ -647,6 +647,7 @@ fluentd:
       # In case of container log (/var/log/containers/*.log), exclude the corresponding log path in "genericContainerLogs" section.
    customFluentdConf: |
 
+   # TODO: Should I get rid of following config section: kubernetesObjects
    # -- Configuration for collecting Kubernetes Object information.
    # Supported objects are Node, Pod, Namespace, Event, DaemonSet, ReplicaSet, Deployment, StatefulSet, Job, CronJob
    kubernetesObjects:
@@ -695,7 +696,7 @@ k8sDiscovery:
       # restartPolicy: "Never" or "OnFailure"
       # Failed containers will be removed by job in case restartPolicy is not set as Never
       # Ref - https://github.com/kubernetes/kubernetes/issues/74848
-      restartPolicy: "Never"
+      # restartPolicy: "Never"
       # successfulJobsHistoryLimit: specify how many completed jobs should be kept
       successfulJobsHistoryLimit: 3
       # failedJobsHistoryLimit: specify how many failed jobs should be kept
@@ -720,8 +721,25 @@ k8sDiscovery:
       # Default: All logs are collected and sent to OCI logging analytics for processing
       collect_warning_events_only: false
       # backoffLimit: Specify the number of retries before considering a Job as failed
-      backoffLimit: 2
-   # kubernetes: kubernetes cluster related inputs for kubernetes disocvery job
+      # backoffLimit: 1
+   infra:
+      # Enable Logs collection for OKE's OCI infra components - LB, OKE Cluster control plane, Subnet logs etc
+      # Not supported for Non OKE clusters
+      enable_service_log: false
+      # Discovers OKE Node Pools in all compartments of tenant
+      # when false, Node Pools present in OKE's compartment are discovered
+      probe_all_compartments: false
+      # tenancy ocid - must be provided if probe_all_compartments is set as true
+      tenancy_ocid:
+      # Base64 encoded string of OCI freeform and defined tags
+      # expected/example format: {"definedTags":{"Oracle-Recommended-Tags.ResourceOwner":"testOwner","Oracle-Recommended-Tags.ResourceUsage":"testUsage","test.key":"testOwner"},"freeformTags":{"project":"logan","test_number":"1"}}
+      oci_tags_base64:
+      # This is a helper stack which is used to enable service logs collection by creating a Service connector and Enable Logging for discovered OCI service components
+      # [Users are usually not expected to alter this]
+      rms_template_base64_encoded: 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
+      # Maximum amount of time (in seconds) the job should wait while checking the status of stack APPLY operation. Default: 300
+      stack_operation_timeout: 300
+   # kubernetes: kubernetes cluster related inputs for kubernetes discovery job
    kubeClientOptions:
       # kubernetes_url: Kubernetes API server URL.
       kubernetes_url:

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.5.2
+    url: iad.ocir.io/id3m3bqjn6oc/oci-la-fluentd-collector-dev:discovery-1.1.0.2 #DO-NOT-MERGE
   # Go to OCI Logging Analytics Administration, click Service Details, and note the namespace value.
   ociLANamespace:
   # OCI Logging Analytics Default Log Group OCID

terraform/modules/helm/helm-inputs.tf

@@ -94,35 +94,41 @@ variable "opt_deploy_metric_server" {
 }
 
 ####
-##  livelab
+##  OCI Client Config
 ####
 
-# Option to deploy mushop specific values.yaml (inputs)
-variable "deploy_mushop_config" {
-  type    = bool
-  default = false
-}
-
-# Service Account to be used when working on livelab cluster
-variable "livelab_service_account" {
+# OCI domain
+variable "oci_domain" {
   type    = string
-  default = ""
+  default = null
 }
 
 ####
-##  OCI Client Config
+##  Discovery Configuration
 ####
 
-# OCI domain
-variable "oci_domain" {
-  type    = string
-  default = null
+# Enable service logs collection for OKE infra components
+variable "enable_service_log" {
+  type    = bool
+  default = false
+}
+
+# OCI Tags
+variable "tags" {
+  type    = object({ freeformTags = map(string), definedTags = map(string) })
+  default = { "freeformTags" = {}, "definedTags" = {} }
 }
 
 ####
 ##  Others
 ####
 
+variable "LOGAN_ENDPOINT" {
+  description = "Logging Analytics Endpoint."
+  type        = string
+  default     = null
+}
+
 # Save data resources in local_file for debug purposes
 variable "debug" {
   type    = bool

terraform/modules/helm/helm-outputs.tf

@@ -14,7 +14,9 @@ locals {
     "--set oci-onm-logan.ociLANamespace=${var.oci_la_namespace}",
     "--set oci-onm-logan.ociLAClusterEntityID=${var.oci_la_cluster_entity_ocid}",
     "--set oci-onm-mgmt-agent.deployMetricServer=${var.opt_deploy_metric_server}",
-    "--set oci-onm-mgmt-agent.mgmtagent.installKeyFileContent=${var.mgmt_agent_install_key_content}"
+    "--set oci-onm-mgmt-agent.mgmtagent.installKeyFileContent=${var.mgmt_agent_install_key_content}",
+    "--set oci-onm-logan.k8sDiscovery.infra.enable_service_log=${var.enable_service_log}",
+    "--set oci-onm-logan.k8sDiscovery.infra.oci_tags_base64=${base64encode(jsonencode(var.tags))}"
   ])
 
   cmd_3_layer_1 = var.oci_domain == null ? local.cmd_3_layer_0 : "${local.cmd_3_layer_0} --set oci-onm-logan.ociDomain=${var.oci_domain}"