refactor(opentelemetry): enhance RBAC and logging configuration for OpenTelemetry integration

freeleaps/helm-pkg/devops/templates/devops/opentelemetry-rbac.yaml

@@ -1,40 +1,40 @@
+{{- if .Values.logIngest.enabled }}
+---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: {{ .Release.Name }}-otel-collector
   namespace: {{ .Release.Namespace }}
-  labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: "{{ .Release.Name }}-otel-collector"
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   name: {{ .Release.Name }}-otel-collector
-  labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: "{{ .Release.Name }}-otel-collector"
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 rules:
   - apiGroups: [""]
-    resources: ["pods", "nodes", "namespaces"]
+    resources:
-    verbs: ["get", "list", "watch"]
+      - pods
+      - namespaces
+      - nodes
+    verbs:
+      - get
+      - watch
+      - list
   - apiGroups: ["apps"]
-    resources: ["deployments", "replicasets"]
+    resources:
-    verbs: ["get", "list", "watch"]
+      - replicasets
+      - deployments
+      - statefulsets
+      - daemonsets
+    verbs:
+      - get
+      - watch
+      - list
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: {{ .Release.Name }}-otel-collector
-  labels:
-    app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
-    app.kubernetes.io/name: "{{ .Release.Name }}-otel-collector"
-    app.kubernetes.io/managed-by: {{ .Release.Service }}
-    app.kubernetes.io/instance: {{ .Release.Name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
@@ -43,3 +43,4 @@ subjects:
   - kind: ServiceAccount
     name: {{ .Release.Name }}-otel-collector
     namespace: {{ .Release.Namespace }}
+{{- end }}

freeleaps/helm-pkg/devops/templates/devops/opentelemetry.yaml

@@ -8,19 +8,51 @@ spec:
   mode: sidecar
   image: ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:latest
   serviceAccount: "{{ .Release.Name }}-otel-collector"
-  config: |
+  volumeMounts:
+    - name: app-logs
+      mountPath: {{ .Values.logIngest.logPath }}
+  securityContext:
+    allowPrivilegeEscalation: true
+    privileged: true
+    runAsUser: 0
+    runAsGroup: 0
+  env:
+    - name: KUBE_META_POD_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.name
+    - name: KUBE_META_NAMESPACE
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.namespace
+    - name: KUBE_META_NODE_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: spec.nodeName
+    - name: KUBE_META_POD_IP
+      valueFrom:
+        fieldRef:
+          fieldPath: status.podIP
+    - name: KUBE_META_POD_UID
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.uid
+    - name: KUBE_META_OBJECT_NAME
+      valueFrom:
+        fieldRef:
+          fieldPath: metadata.labels['app.kubernetes.io/instance']
   config:
     receivers:
       filelog:
         include:
           - {{ .Values.logIngest.logPathPattern }}
-          start_at: beginning
+        start_at: end
         include_file_path: false
         include_file_name: false
-          operators: []
+        operators:
-        k8s_cluster:
+          - type: json_parser
-          auth_type: serviceAccount
+            parse_from: body
-          namespaces: [{{ .Release.Namespace }}]
+            parse_to: attributes
     processors:
       resource:
         attributes:
@@ -46,8 +78,13 @@ spec:
         log_statements:
           - context: log
             statements:
-                - set(resource.attributes["application"], "devops")
+              - set(resource.attributes["application"], log.attributes["context"]["app"])
-                - set(resource.attributes["environment"], "{{ .Values.global.environment | default .Release.Namespace }}")
+              - set(resource.attributes["environment"], log.attributes["context"]["env"])
+              - set(resource.attributes["kubernetes_node_name"], resource.attributes["k8s.node.name"])
+              - set(resource.attributes["kubernetes_pod_name"], resource.attributes["k8s.pod.name"])
+              - set(resource.attributes["kubernetes_pod_ip"], resource.attributes["k8s.pod.ip"])
+              - set(resource.attributes["kubernetes_deployment_name"], resource.attributes["k8s.deployment.name"])
+              - set(resource.attributes["kubernetes_namespace"], resource.attributes["k8s.namespace.name"])
               - set(resource.attributes["body_json"], ParseJSON(log.body))
               - set(resource.attributes["body_json"]["kubernetes"]["pod"], resource.attributes["k8s.pod.name"])
               - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"])
@@ -59,22 +96,20 @@ spec:
               - set(log.body, resource.attributes["body_json"])
               - delete_key(resource.attributes, "body_json")
       batch:
-          send_batch_size: 1
+        send_batch_size: 5
-          timeout: 1s
+        timeout: 10s  
     exporters:
       otlphttp/logs:
         endpoint: {{ .Values.logIngest.lokiEndpoint }}/otlp
         tls:
           insecure: true
-          headers:
-            X-Scope-OrgID: "devops"
     service:
       telemetry:
         logs:
           level: info
       pipelines:
         logs:
-            receivers: [filelog, k8s_cluster]
+          receivers: [filelog]
           processors: [resource, transform, batch]
           exporters: [otlphttp/logs]
 {{- end }}