Merge pull request axoflow#307 from MrAnno/axosyslog-otlp

otel: fix axosyslog-otlp() source/destination
bshifter · Sep 25, 2024 · 288c432 · 288c432
2 parents f517dfe + ab78efa
commit 288c432
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 17 deletions.
diff --git a/charts/axosyslog/Chart.yaml b/charts/axosyslog/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: axosyslog
 description: AxoSyslog for Kubernetes
 type: application
-version: 0.10.1
+version: 0.11.0
 appVersion: "4.8.1"
diff --git a/charts/axosyslog/templates/collector-config.yaml b/charts/axosyslog/templates/collector-config.yaml
@@ -30,7 +30,7 @@ data:
   {{- if .keyDelimiter }}
         key-delimiter({{ .keyDelimiter | quote }})
   {{- end }}
-      ); 
+      );
     };
 {{- end }}
 {{- end }}
@@ -106,10 +106,10 @@ data:
       };
     {{- end }}
 {{- end }}
-{{- with .Values.collector.config.destinations.syslogNgOtlp }}
+{{- with .Values.collector.config.destinations.axosyslogOtlp }}
   {{- if .enabled }}
       destination {
-        syslog-ng-otlp (
+        axosyslog-otlp (
           url({{ tpl .url $ | quote }})
     {{- if .extraOptionsRaw }}
           {{ .extraOptionsRaw }}

diff --git a/charts/axosyslog/templates/service.yaml b/charts/axosyslog/templates/service.yaml
@@ -35,10 +35,10 @@ spec:
       port: 601
       targetPort: rfc5424-tcp
 {{- end }}
-{{- if .syslogNgOtlp.enabled }}
+{{- if .axosyslogOtlp.enabled }}
     - name: otlp
       protocol: TCP
-      nodePort: {{ .syslogNgOtlp.port | default 30317 }}
+      nodePort: {{ .axosyslogOtlp.port | default 30317 }}
       port: 4317
       targetPort: otlp
 {{- end }}

diff --git a/charts/axosyslog/templates/syslog-config.yaml b/charts/axosyslog/templates/syslog-config.yaml
@@ -56,10 +56,10 @@ data:
   {{- end }}
 {{- end }}
 
-{{- with .Values.syslog.config.sources.syslogNgOtlp }}
+{{- with .Values.syslog.config.sources.axosyslogOtlp }}
   {{- if .enabled }}
     source s_syslogng_otlp {
-      syslog-ng-otlp();
+      axosyslog-otlp();
     };
   {{- end }}
 {{- end }}
@@ -68,7 +68,7 @@ data:
 {{- if .Values.syslog.config.sources.syslog.enabled }}
       source (s_syslog);
 {{- end }}
-{{- if .Values.syslog.config.sources.syslogNgOtlp.enabled }}
+{{- if .Values.syslog.config.sources.axosyslogOtlp.enabled }}
       source (s_syslogng_otlp);
 {{- end }}
 
@@ -133,10 +133,10 @@ data:
       };
     {{- end }}
 {{- end }}
-{{- with .Values.syslog.config.destinations.syslogNgOtlp }}
+{{- with .Values.syslog.config.destinations.axosyslogOtlp }}
   {{- if .enabled }}
       destination {
-        syslog-ng-otlp (
+        axosyslog-otlp (
           url({{ tpl .url $ | quote }})
     {{- if .extraOptionsRaw }}
           {{ .extraOptionsRaw }}

diff --git a/charts/axosyslog/values.yaml b/charts/axosyslog/values.yaml
@@ -46,7 +46,7 @@ collector:
           peerVerify: false
         template: "$(format-json .*)"
         extraOptionsRaw: "time-reopen(10)"
-      syslogNgOtlp:
+      axosyslogOtlp:
         enabled: false
         url: "192.168.77.133:4317"
         extraOptionsRaw: "time-reopen(1) batch-timeout(1000) batch-lines(1000)"
@@ -74,7 +74,7 @@ syslog:
     enabled: false
     storageClass: standard
     size: 10Gi
-  config: 
+  config:
     raw: ""  # Use this to manually set the contents of the syslog-ng.conf file.
     stats:
       level: 2
@@ -94,12 +94,12 @@ syslog:
         #  Cert: "/path/to/Cert.pem"
         #  Key: "/path/to/Key.pem"
         #  peerVerify: false
-      syslogNgOtlp:
+      axosyslogOtlp:
         enabled: true
         # nodePort
         port: 30317
         extraOptionsRaw: ""
-        
+
     rewrites:
       set: {}
       #  foo: "${foovalue}"
@@ -134,11 +134,11 @@ syslog:
         #  peerVerify: false
         #template: "$(format-json --scope rfc5424 --exclude DATE --key ISODATE @timestamp=${ISODATE})"
         extraOptionsRaw: "time-reopen(10)"
-      syslogNgOtlp:
+      axosyslogOtlp:
         enabled: false
         url: "192.168.77.133:4317"
         extraOptionsRaw: "time-reopen(1) batch-timeout(1000) batch-lines(1000)"
-    
+
 metricsExporter:
   enabled: false  # deploy the axosyslog Deamonset with the axosyslog-metrics-exporter sidecar
   image:

diff --git a/modules/grpc/otel/otel-plugin.c b/modules/grpc/otel/otel-plugin.c
@@ -58,6 +58,16 @@ static Plugin otel_plugins[] =
     .name = "syslog_ng_otlp",
     .parser = &otel_parser,
   },
+  {
+    .type = LL_CONTEXT_DESTINATION,
+    .name = "axosyslog_otlp",
+    .parser = &otel_parser,
+  },
+  {
+    .type = LL_CONTEXT_SOURCE,
+    .name = "axosyslog_otlp",
+    .parser = &otel_parser,
+  },
   {
     .type = LL_CONTEXT_FILTERX_ENUM,
     .name = "otel",