diff --git a/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml b/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml index 42d898b8..0d52e712 100644 --- a/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml +++ b/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml @@ -28,4 +28,7 @@ data: CERT_PATH: {{ .Values.chat.configs.certPath | b64enc | quote }} REDIS_IS_CLUSTER: {{ .Values.chat.configs.redisIsCluster | b64enc | quote }} METRICS_ENABLED: {{ .Values.chat.configs.metricsEnabled | default false | toString | b64enc }} - PROBES_ENABLED: {{ .Values.chat.configs.probesEnabled | default false | toString | b64enc }} \ No newline at end of file + PROBES_ENABLED: {{ .Values.chat.configs.probesEnabled | default false | toString | b64enc }} + LOG_BASE_PATH: {{ .Values.logIngest.logPath | b64enc | quote }} + BACKEND_LOG_FILE_NAME: {{ .Values.chat.configs.appName | b64enc | quote }} + APPLICATION_ACTIVITY_LOG: {{ .Values.chat.configs.appName | printf "%s-activity" | b64enc | quote }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml b/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml index f2bebfee..cbb97aec 100644 --- a/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml +++ b/freeleaps/helm-pkg/chat/templates/chat/opentelemetry.yaml @@ -80,7 +80,6 @@ spec: - context: log statements: - set(resource.attributes["application"], "chat") - - set(resource.attributes["service_name"], "chat") - set(resource.attributes["environment"], "{{ .Values.global.environment | default .Release.Namespace }}") - set(resource.attributes["body_json"], ParseJSON(log.body)) - set(resource.attributes["body_json"]["kubernetes"]["pod"], resource.attributes["k8s.pod.name"]) @@ -89,6 +88,7 @@ spec: - set(resource.attributes["body_json"]["kubernetes"]["pod_uid"], resource.attributes["k8s.pod.uid"]) - set(resource.attributes["body_json"]["kubernetes"]["deployment"], resource.attributes["k8s.deployment.name"]) - set(resource.attributes["body_json"]["kubernetes"]["node"], resource.attributes["k8s.node.name"]) + - set(resource.attributes["body_json"]["kubernetes"]["namespace"], resource.attributes["k8s.namespace.name"]) - set(log.body, resource.attributes["body_json"]) - delete_key(resource.attributes, "body_json") batch: