Skip to content

promote o11y-charts #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nashtapu-tibco merged 1 commit into from
Sep 26, 2025
Merged

promote o11y-charts #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/jaeger/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ appVersion: 1.66.0
description: A Jaeger Helm chart for Kubernetes
name: jaeger
type: application
version: 0.72.39
version: 0.72.40
# CronJobs require v1.21
kubeVersion: '>= 1.21-0'
keywords:
Expand Down
31 changes: 31 additions & 0 deletions charts/o11y-service/templates/configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ data:
{{- $esEndpoint := "https://elasticsearch-master:9200" }}
{{- $appLogExpESOpt := false }}
{{- $svcLogExpESOpt := false }}
{{- $auditsafeExpESOpt := false }}
##logsserver:userapp exporter
{{- if .Values.global.cp.resources.o11yv3.logsServer.config.exporter.userApps.enabled }}
{{- if eq .Values.global.cp.resources.o11yv3.logsServer.config.exporter.userApps.kind "elasticSearch" }}
Expand Down Expand Up @@ -171,6 +172,29 @@ data:
{{- end }}
{{- end }}
{{- end }}
##logsserver:auditSafe exporter
{{- if .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.enabled }}
{{- if eq .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.kind "elasticSearch" }}
LOGS_EXPORTER_AUDITSAFE_ES_INDEX_NAME: {{ .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.elasticSearch.logIndex }}
LOGS_EXPORTER_AUDITSAFE_ES_ENDPOINT: {{ .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.elasticSearch.endpoint }}
LOGS_EXPORTER_AUDITSAFE_ES_USERNAME: {{ .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.elasticSearch.username }}
{{- $auditsafeExpESOpt = true -}}
{{- $auditsafeExp = "'[elasticsearch/auditsafe]'" -}}
{{- end }}
{{- if .Values.global.cp.enableClusterScopedPerm }}
{{- $auditsafeProc = "'[k8sattributes/general, transform/logs, transform/auditsafe, memory_limiter, batch]'" -}}
{{- else }}
{{- $auditsafeProc = "'[k8sattributes/general-ns, transform/logs, transform/auditsafe, memory_limiter, batch]'" -}}
{{- end }}
{{- end }}
##logsserver:auditSafe proxy
{{- if .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.enabled }}
{{- if eq .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.kind "elasticSearch" }}
logserver-proxy-auditsafe-index: {{ .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.elasticSearch.logIndex }}
logserver-proxy-auditsafe-endpoint: {{ .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.elasticSearch.endpoint }}
logserver-proxy-auditsafe-userName: {{ .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.elasticSearch.username }}
{{- end }}
{{- end }}
##metricsserver:exporter
{{- if .Values.global.cp.resources.o11yv3.metricsServer.config.exporter.enabled }}
{{- if eq .Values.global.cp.resources.o11yv3.metricsServer.config.exporter.kind "prometheus" }}
Expand Down Expand Up @@ -291,6 +315,9 @@ data:
{{- end }}
{{- if not $svcLogExpESOpt }}
LOGS_EXPORTER_SVC_ES_ENDPOINT: {{ $esEndpoint }}
{{- end }}
{{- if not $auditsafeExpESOpt }}
LOGS_EXPORTER_AUDITSAFE_ES_ENDPOINT: {{ $esEndpoint }}
{{- end }}
LOGS_EXPORTER_APP_OTLP_URL: {{ $appLogOtlpUrl }}
LOGS_EXPORTER_SVC_OTLP_URL: {{ $svcLogOtlpUrl }}
Expand All @@ -304,6 +331,10 @@ data:
svc_logs_receiver: {{ $svcLogRec }}
svc_logs_processor: {{ $svcLogProc }}
svc_logs_exporter: {{ $svcLogExp }}
##pipeline:auditsafe
auditsafe_receiver: {{ $auditsafeRec }}
auditsafe_processor: {{ $auditsafeProc }}
auditsafe_exporter: {{ $auditsafeExp }}
##pipeline:metrics
metrics_appengines_rec: {{ $appMetricsRec }}
metrics_appengines_proc: {{ $appMetricsProc }}
Expand Down
Loading