ci(lm-logs): change user-agent (#143)

* ci(lm-logs): change user-agent change user-agent to lm-logs-fluentd-k8s. Upgrade base image to 1.2.0. Add custom k8s-cluster name if present in values file. Add clusterName to values compute logsource user-agent value int helper.tpl * ci(lm-logs): change user-agent change user-agent to lm-logs-fluentd-k8s. Upgrade base image to 1.2.0. Add custom k8s-cluster name if present in values file. Add clusterName to values compute logsource user-agent value int helper.tpl
logicmonitor · May 7, 2024 · a73683c · a73683c
1 parent 2b09cd6
commit a73683c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/charts/lm-logs/Chart.yaml b/charts/lm-logs/Chart.yaml
@@ -1,10 +1,10 @@
 apiVersion: v2
 description: A Helm chart for sending k8s logs to Logic Monitor
 name: lm-logs
-version: 0.5.1
+version: 0.6.0
 maintainers:
   - email: [email protected]
     name: LogicMonitor
 icon: https://logicmonitor.github.io/helm-charts/lm_logo.png
-appVersion: 1.1.0
+appVersion: 1.2.0
 home: https://logicmonitor.github.io/helm-charts
diff --git a/charts/lm-logs/templates/_helpers.tpl b/charts/lm-logs/templates/_helpers.tpl
@@ -42,6 +42,19 @@ kubernetes.cluster_name {{ $cluster }}
 {{- end }}
 {{- end }}
 
+{{/*
+User-agent for log-ingest requests */}}
+{{- define "logsource.userAgent" -}}
+{{- $cluster := "" -}}
+{{- if .Values.kubernetes.cluster_name -}}
+{{- $cluster = .Values.kubernetes.cluster_name -}}
+{{- else if .Values.global.clusterName -}}
+{{- $cluster = .Values.global.clusterName -}}
+{{- end -}}
+log_source lm-logs-fluentd (K8S; {{ $cluster }})
+{{- end -}}
+
+
 {{/*
 Create chart name and version as used by the chart label.
 */}}

diff --git a/charts/lm-logs/templates/configmap.yaml b/charts/lm-logs/templates/configmap.yaml
@@ -57,6 +57,7 @@ data:
         {{- end}}
         debug false
         compression gzip
+        {{ include "logsource.userAgent" . | nindent 8 }}
         include_metadata {{ hasKey .Values.fluent "include_metadata" | ternary .Values.fluent.include_metadata true }}
         device_less_logs {{ .Values.fluent.device_less_logs | default false }}
         <buffer>

diff --git a/charts/lm-logs/values.yaml b/charts/lm-logs/values.yaml
@@ -1,7 +1,7 @@
 image:
   repository: logicmonitor/lm-logs-k8s-fluentd
   pullPolicy: Always
-  tag: "1.1.0"
+  tag: "1.2.0"
 
 lm_access_id: ""
 lm_access_key: ""
@@ -12,6 +12,7 @@ global:
   accessID: ""
   accessKey: ""
   account: ""
+  clusterName: ""
 
 imagePullSecrets: []
 nameOverride: ""
@@ -39,6 +40,7 @@ fluent:
 
 kubernetes:
   multiline_start_regexp: /^\[(\d{4}-)?\d{2}-\d{2} \d{2}:\d{2}:\d{2}.\d{3}.*\]/
+  cluster_name: ""
   multiline_concat_key: log
 
 nodeSelector: {}