diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml index dd2adc06..76e25aa8 100644 --- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml +++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/central-storage-config.yaml @@ -15,4 +15,8 @@ data: AZURE_STORAGE_DOCUMENT_API_KEY: {{ .Values.centralStorage.configs.azureStorageDocumentApiKey | b64enc | quote }} AZURE_STORAGE_DOCUMENT_API_ENDPOINT: {{ .Values.centralStorage.configs.azureStorageDocumentApiEndpoint | b64enc | quote }} METRICS_ENABLED: {{ .Values.centralStorage.configs.metricsEnabled | default false | toString | b64enc }} - PROBES_ENABLED: {{ .Values.centralStorage.configs.probesEnabled | default false | toString | b64enc }} \ No newline at end of file + PROBES_ENABLED: {{ .Values.centralStorage.configs.probesEnabled | default false | toString | b64enc }} + DEBUG_MODE: {{ .Values.centralStorage.configs.debugMode | default false | toString | b64enc }} + LOG_BASE_PATH: {{ .Values.logIngest.logPath | b64enc | quote }} + BACKEND_LOG_FILE_NAME: {{ .Values.centralStorage.configs.appName | b64enc | quote }} + APPLICATION_ACTIVITY_LOG: {{ .Values.centralStorage.configs.appName | printf "%s-activity" | b64enc | quote }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml index 4c7b5d4a..ba1bcf9b 100644 --- a/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml +++ b/freeleaps/helm-pkg/centralStorage/templates/central-storage/opentelemetry.yaml @@ -47,8 +47,8 @@ spec: include: - {{ .Values.logIngest.logPathPattern }} start_at: end - include_file_path: true - include_file_name: true + include_file_path: false + include_file_name: false operators: - type: json_parser parse_from: body diff --git a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml index 4201f228..e11457a1 100644 --- a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml +++ b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml @@ -87,6 +87,7 @@ centralStorage: azureStorageDocumentApiEndpoint: https://freeleaps1document.blob.core.windows.net/ metricsEnabled: 'false' probesEnabled: 'true' + debugMode: 'false' vpa: minAllowed: enabled: false diff --git a/freeleaps/helm-pkg/devops/values.alpha.yaml b/freeleaps/helm-pkg/devops/values.alpha.yaml index fdbc4d88..01077a9d 100644 --- a/freeleaps/helm-pkg/devops/values.alpha.yaml +++ b/freeleaps/helm-pkg/devops/values.alpha.yaml @@ -52,7 +52,7 @@ devops: baseGiteaUrl: https://gitea.freeleaps.mathmast.com baseReconcileUrl: https://reconcile.freeleaps.mathmast.com baseLokiUrl: http://loki-gateway.freeleaps-logging-system - logBasePath: /app/log + logBasePath: /app/log/devops logRetention: 30 days logRotation: 00:00 logBackupFiles: '5' diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml index 08d76b22..7e69c6df 100644 --- a/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml +++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/devsvc-config.yaml @@ -19,3 +19,4 @@ data: CODE_DEPOT_DOMAIN_NAME: {{ .Values.devsvc.configs.codeDepotDomainName | b64enc | quote }} METRICS_ENABLED: {{ .Values.devsvc.configs.metricsEnabled | default false | toString | b64enc }} PROBES_ENABLED: {{ .Values.devsvc.configs.probesEnabled | default false | toString | b64enc }} + LOG_BASE_PATH: {{ .Values.devsvc.configs.logBasePath | default "/app/log/devsvc" | b64enc | quote }} diff --git a/freeleaps/helm-pkg/devsvc/values.alpha.yaml b/freeleaps/helm-pkg/devsvc/values.alpha.yaml index c97a34dc..86fe6234 100644 --- a/freeleaps/helm-pkg/devsvc/values.alpha.yaml +++ b/freeleaps/helm-pkg/devsvc/values.alpha.yaml @@ -90,6 +90,7 @@ devsvc: codeDepotDomainName: alpha.gitea.freeleaps.mathmast.com metricsEnabled: 'false' probesEnabled: 'true' + logBasePath: /app/log/devsvc vpa: minAllowed: enabled: false