From dae91c7d167fddc6bb8b13c52ea7e0b377aeaa64 Mon Sep 17 00:00:00 2001 From: saksham Date: Fri, 25 Jul 2025 15:59:19 +0530 Subject: [PATCH 1/8] service name change --- CHANGELOG.md | 6 +- charts/logan/Chart.yaml | 2 +- charts/logan/README.md | 10 +-- .../logan/templates/ekscp-logs-configmap.yaml | 2 +- charts/logan/templates/logs-configmap.yaml | 10 +-- charts/logan/values.yaml | 76 +++++++++---------- .../mgmtagent_kubernetes_dashboard.json | 6 +- charts/oci-onm/Chart.yaml | 2 +- charts/oci-onm/README.md | 4 +- charts/oci-onm/values.yaml | 8 +- docs/FAQ.md | 18 ++--- docs/custom-logs.md | 6 +- docs/eks-cp-logs.md | 2 +- .../v1.0/oraclelinux/8-slim/Dockerfile | 2 +- .../logs-collection/configmap-cri.yaml | 34 ++++----- .../logs-collection/configmap-docker.yaml | 34 ++++----- .../logs-collection/fluentd-daemonset.yaml | 12 +-- .../objects-collection/configmap-objects.yaml | 2 +- .../fluentd-deployment.yaml | 12 +-- .../dashboards/dashboards_json/cluster.json | 44 +++++------ .../dashboards/dashboards_json/node.json | 18 ++--- .../dashboards/dashboards_json/pod.json | 20 ++--- .../dashboards_json/service-type-lb.json | 24 +++--- .../dashboards/dashboards_json/workload.json | 32 ++++---- terraform/modules/helm/helm-inputs.tf | 8 +- terraform/modules/iam/iam.tf | 2 +- terraform/modules/logan/logan-inputs.tf | 6 +- terraform/modules/logan/logan.tf | 2 +- terraform/modules/main/main-inputs.tf | 6 +- terraform/modules/main/main.tf | 2 +- terraform/oke/schema.yaml | 26 +++---- terraform/oke/stack-inputs.tf | 10 +-- terraform/oke/terraform-sample.tfvars | 2 +- 33 files changed, 225 insertions(+), 225 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 061a64f3..a01c6a33 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -68,7 +68,7 @@ ## 2024-02-13 ### Added -- Changes to support Kubernetes Solution Pages Offering by OCI Logging Analytics. +- Changes to support Kubernetes Solution Pages Offering by OCI Log Analytics. - A new role and role binding in the monitoring namespace (which defaults to oci-onm), to manage a ConfigMap. - A new CronJob to handle the Kubernetes Objects discovery and Objects Logs collection using oci-logging-analytics-kubernetes-discovery Gem. ### Changed @@ -144,7 +144,7 @@ ### Changed - Modified /var/log to mount as readonly by default, except when /var/log is set as baseDir (to store Fluentd state, buffer etc.,). ### Breaking Changes -- Logging Analytics Fluentd Output plugin log location will be derived using baseDir instead using value of fluentd:ociLoggingAnalyticsOutputPlugin:plugin_log_location. The default value still remains unchanged and is a non breaking change except if it was modified to a different value. +- Log Analytics Fluentd Output plugin log location will be derived using baseDir instead using value of fluentd:ociLoggingAnalyticsOutputPlugin:plugin_log_location. The default value still remains unchanged and is a non breaking change except if it was modified to a different value. ## 2022-08-30 ### Added @@ -159,7 +159,7 @@ ## 2022-05-18 ### Added -- Metrics support from OCI Logging Analytics Fluentd Output Plugin. +- Metrics support from OCI Log 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 diff --git a/charts/logan/Chart.yaml b/charts/logan/Chart.yaml index 25b99023..3f6808e8 100644 --- a/charts/logan/Chart.yaml +++ b/charts/logan/Chart.yaml @@ -3,7 +3,7 @@ apiVersion: v2 name: oci-onm-logan -description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics. +description: Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Log Analytics type: application version: 3.6.0 appVersion: "3.0.0" diff --git a/charts/logan/README.md b/charts/logan/README.md index ee4fb891..b7cd91f0 100644 --- a/charts/logan/README.md +++ b/charts/logan/README.md @@ -2,7 +2,7 @@ ![Version: 3.0.0](https://img.shields.io/badge/Version-3.0.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square) -Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Logging Analytics. +Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Objects information to OCI Log Analytics. ## Requirements @@ -15,15 +15,15 @@ Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Object | Key | Type | Default | Description | |-----|------|---------|-------------| | authtype | string | `"InstancePrincipal"` | Allowed values: InstancePrincipal, config | -| extraEnv | list | `[]` | Use this to tag all the collected logs with one or more key:value pairs. Key must be a valid field in Logging Analytics metadata: "Client Host Region": "PCT" "Environment": "Production" "Third key": "Third Value" @param extra environment variables. Example name: ENV_VARIABLE_NAME value: ENV_VARIABLE_VALUE | +| extraEnv | list | `[]` | Use this to tag all the collected logs with one or more key:value pairs. Key must be a valid field in Log Analyticsadata: "Client Host Region": "PCT" "Environment": "Production" "Third key": "Third Value" @param extra environment variables. Example name: ENV_VARIABLE_NAME value: ENV_VARIABLE_VALUE | | extraVolumeMounts | list | `[]` | @param extraVolumeMounts Mount extra volume(s). Example: - name: tmpDir mountPath: /tmp | | extraVolumes | list | `[]` | @param extraVolumes Extra volumes. Example: - name: tmpDir hostPath: path: /tmp log | | fluentd.baseDir | string | `"/var/log"` | Base directory on the node (with read write permission) for storing fluentd plugins related data. | | fluentd.customFluentdConf | string | `""` | | -| fluentd.customLogs | string | `nil` | Configuration for any custom logs which are not part of the default configuration defined in this file. All the pod/container logs will be collected as per "genericContainerLogs" section. Use this section to create a custom configuration for any of the container logs. Also, you can use this section to define configuration for any other log path existing on a Kubernetes worker node custom-id1: path: /var/log/containers/custom*.log Logging Analytics log source to use for parsing and processing the logs: ociLALogSourceName: "Custom1 Logs" The regular expression pattern for the starting line in case of multi-line logs. multilineStartRegExp: Set isContainerLog to false if the log is not a container log (/var/log/containers/*.log). Default value is true. isContainerLog: true | +| fluentd.customLogs | string | `nil` | Configuration for any custom logs which are not part of the default configuration defined in this file. All the pod/container logs will be collected as per "genericContainerLogs" section. Use this section to create a custom configuration for any of the container logs. Also, you can use this section to define configuration for any other log path existing on a Kubernetes worker node custom-id1: path: /var/log/containers/custom*.log Log Analytics log source to use for parsing and processing the logs: ociLALogSourceName: "Custom1 Logs" The regular expression pattern for the starting line in case of multi-line logs. multilineStartRegExp: Set isContainerLog to false if the log is not a container log (/var/log/containers/*.log). Default value is true. isContainerLog: true | | fluentd.file | string | `"fluent.conf"` | Fluentd config file name | | fluentd.genericContainerLogs.exclude_path | list | `["\"/var/log/containers/kube-proxy-*.log\"","\"/var/log/containers/kube-flannel-*.log\"","\"/var/log/containers/kube-dns-autoscaler-*.log\"","\"/var/log/containers/coredns-*.log\"","\"/var/log/containers/csi-oci-node-*.log\"","\"/var/log/containers/proxymux-client-*.log\"","\"/var/log/containers/cluster-autoscaler-*.log\""]` | List of log paths to exclude that are already part of other specific configurations defined (like Kube Proxy, Kube Flannel) If you want to create a custom configuration for any of the container logs using the customLogs section, then exclude the corresponding log path here. | -| fluentd.genericContainerLogs.ociLALogSourceName | string | `"Kubernetes Container Generic Logs"` | Default Logging Analytics log source to use for parsing and processing the logs: Kubernetes Container Generic Logs. | +| fluentd.genericContainerLogs.ociLALogSourceName | string | `"Kubernetes Container Generic Logs"` | Default Log Analytics log source to use for parsing and processing the logs: Kubernetes Container Generic Logs. | | fluentd.genericContainerLogs.path | string | `"/var/log/containers/*.log"` | | | fluentd.kubernetesMetadataFilter.ca_file | string | `nil` | Path to CA file for Kubernetes server certificate validation | | fluentd.kubernetesMetadataFilter.kubernetes_url | string | `nil` | Kubernetes API server URL. Alternatively, environment variables KUBERNETES_SERVICE_HOST and KUBERNETES_SERVICE_PORT can be used Environment variable are given preference. | @@ -74,7 +74,7 @@ Charts for sending Kubernetes platform logs, compute logs, and Kubernetes Object | oci.configFiles.config | string | `"# Replace each of the below fields with actual values.\n[DEFAULT]\nuser=\nfingerprint=\nkey_file=\ntenancy=\nregion="` | config file [data](https://docs.oracle.com/en-us/iaas/Content/API/Concepts/sdkconfig.htm) Replace each of the below fields with actual values. [DEFAULT] user= fingerprint= key_file= tenancy= region= | | oci.file | string | `"config"` | Config file name | | oci.path | string | `"/var/opt/.oci"` | Path to the OCI API config file | -| ociLALogGroupID | string | `nil` | OCID of Logging Analytics Log Group to send logs to. Can be overridden for individual log types. e.g. ocid1.loganalyticsloggroup.oc1.phx.amaaaaasdfaskriauucc55rlwlxe4ahe2vfmtuoqa6qsgu7mb6jugxacsk6a | +| ociLALogGroupID | string | `nil` | OCID of Log Analytics Log Group to send logs to. Can be overridden for individual log types. e.g. ocid1.loganalyticsloggroup.oc1.phx.amaaaaasdfaskriauucc55rlwlxe4ahe2vfmtuoqa6qsgu7mb6jugxacsk6a | | ociLANamespace | string | `nil` | | | resourceNamePrefix | string | `"{{ .Values.global.resourceNamePrefix }}"` | Resoure Name Prefix: Wherever allowed, this prefix will be used with all resources used by this chart | | resources.limits | object | `{"memory":"500Mi"}` | Limits | diff --git a/charts/logan/templates/ekscp-logs-configmap.yaml b/charts/logan/templates/ekscp-logs-configmap.yaml index fd747567..36d95f66 100644 --- a/charts/logan/templates/ekscp-logs-configmap.yaml +++ b/charts/logan/templates/ekscp-logs-configmap.yaml @@ -278,7 +278,7 @@ data: @label @NORMAL{{- ternary (print "." $currWorker) "" $multiWorkersEnabled }} - # Match block to set info required for oci-logging-analytics fluentd output plugin + # Match block to set info required for oci-log-analytics fluentd output plugin