Merge branch 'main' into otl-3816-otlp-log-ingest

Author: akhileshsingh85

helm-charts/splunk-otel-collector/templates/_helpers.tpl

@@ -36,7 +36,7 @@ Create chart name and version as used by the chart label.
 Whether to send data to Splunk Platform endpoint
 */}}
 {{- define "splunk-otel-collector.splunkPlatformEnabled" -}}
-{{- or (not (eq .Values.splunkPlatform.endpoint "")) .Values.splunkPlatform.otlpIngest.enabled }}
+{{- not (eq .Values.splunkPlatform.endpoint "") }}
 {{- end -}}
 
 {{/*
@@ -113,7 +113,7 @@ Whether traces enabled for any destination.
 Whether logs enabled for any destination.
 */}}
 {{- define "splunk-otel-collector.logsEnabled" -}}
-{{- include "splunk-otel-collector.platformLogsEnabled" . }}
+{{- or (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") (eq (include "splunk-otel-collector.platformLogsViaOtlpEnabled" .) "true") }}
 {{- end -}}
 
 {{/*

helm-charts/splunk-otel-collector/templates/config/_otel-k8s-cluster-receiver-config.tpl

@@ -305,7 +305,9 @@ exporters:
   {{- include "splunk-otel-collector.splunkPlatformMetricsExporter" . | nindent 2 }}
   {{- end }}
 
-  {{- if and (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") (eq (include "splunk-otel-collector.objectsOrEventsEnabled" .) "true") }}
+  {{- if and (eq (include "splunk-otel-collector.platformLogsViaOtlpEnabled" .) "true") (eq (include "splunk-otel-collector.objectsOrEventsEnabled" .) "true") }}
+  {{- include "splunk-otel-collector.otlpPlatformLogsExporter" . | nindent 2 }}
+  {{- else if and (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") (eq (include "splunk-otel-collector.objectsOrEventsEnabled" .) "true") }}
   {{- include "splunk-otel-collector.splunkPlatformLogsExporter" . | nindent 2 }}
   {{- if .Values.clusterReceiver.eventsEnabled }}
     sourcetype: kube:events
@@ -439,7 +441,9 @@ service:
         {{- end }}
         - transform/k8sevents
       exporters:
-        {{- if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") }}
+        {{- if (eq (include "splunk-otel-collector.platformLogsViaOtlpEnabled" .) "true") }}
+        - {{ if eq .Values.splunkPlatform.otlpIngest.protocol "http" }}otlp_http{{- else }}otlp{{- end }}/platform_logs
+        {{- else if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") }}
         - splunk_hec/platform_logs
         {{- end }}
         {{- if eq (include "splunk-otel-collector.splunkO11yEventsEndpointEnabled" .) "true" }}
@@ -464,7 +468,9 @@ service:
         - resource/add_environment
         {{- end }}
       exporters:
-      {{- if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") }}
+      {{- if (eq (include "splunk-otel-collector.platformLogsViaOtlpEnabled" .) "true") }}
+        - {{ if eq .Values.splunkPlatform.otlpIngest.protocol "http" }}otlp_http{{- else }}otlp{{- end }}/platform_logs
+      {{- else if (eq (include "splunk-otel-collector.platformLogsEnabled" .) "true") }}
         - splunk_hec/platform_logs
       {{- end }}
       {{- if (eq (include "splunk-otel-collector.splunkO11yEventsEndpointEnabled" .) "true") }}

helm-charts/splunk-otel-collector/values.schema.json

@@ -1574,6 +1574,29 @@
               }
             }
           }
+        },
+        {
+          "properties": {
+            "splunkPlatform": {
+              "type": "object",
+              "required": [
+                "otlpIngest"
+              ],
+              "properties": {
+                "otlpIngest": {
+                  "type": "object",
+                  "required": [
+                    "enabled"
+                  ],
+                  "properties": {
+                    "enabled": {
+                      "const": true
+                    }
+                  }
+                }
+              }
+            }
+          }
         }
       ]
     },
@@ -1669,6 +1692,50 @@
         }
       }
     },
+    {
+      "if": {
+        "$comment": "if OTLP ingest for platform logs is enabled, require OTLP endpoint",
+        "properties": {
+          "splunkPlatform": {
+            "type": "object",
+            "required": [
+              "otlpIngest"
+            ],
+            "properties": {
+              "logsEnabled": {
+                "const": true
+              },
+              "otlpIngest": {
+                "type": "object",
+                "required": [
+                  "enabled"
+                ],
+                "properties": {
+                  "enabled": {
+                    "const": true
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "then": {
+        "properties": {
+          "splunkPlatform": {
+            "properties": {
+              "otlpIngest": {
+                "properties": {
+                  "endpoint": {
+                    "minLength": 1
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     {
       "if": {
         "$comment": "if splunkPlatform.metricsEnabled is true and splunkPlatform.endpoint is provided",