Skip to content

Commit abe08d5

Browse files
promote o11y-charts (#321)
1 parent 52ea13a commit abe08d5

File tree

2 files changed

+32
-1
lines changed

2 files changed

+32
-1
lines changed

charts/jaeger/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ appVersion: 1.66.0
99
description: A Jaeger Helm chart for Kubernetes
1010
name: jaeger
1111
type: application
12-
version: 0.72.39
12+
version: 0.72.40
1313
# CronJobs require v1.21
1414
kubeVersion: '>= 1.21-0'
1515
keywords:

charts/o11y-service/templates/configmap.yaml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ data:
6464
{{- $esEndpoint := "https://elasticsearch-master:9200" }}
6565
{{- $appLogExpESOpt := false }}
6666
{{- $svcLogExpESOpt := false }}
67+
{{- $auditsafeExpESOpt := false }}
6768
##logsserver:userapp exporter
6869
{{- if .Values.global.cp.resources.o11yv3.logsServer.config.exporter.userApps.enabled }}
6970
{{- if eq .Values.global.cp.resources.o11yv3.logsServer.config.exporter.userApps.kind "elasticSearch" }}
@@ -171,6 +172,29 @@ data:
171172
{{- end }}
172173
{{- end }}
173174
{{- end }}
175+
##logsserver:auditSafe exporter
176+
{{- if .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.enabled }}
177+
{{- if eq .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.kind "elasticSearch" }}
178+
LOGS_EXPORTER_AUDITSAFE_ES_INDEX_NAME: {{ .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.elasticSearch.logIndex }}
179+
LOGS_EXPORTER_AUDITSAFE_ES_ENDPOINT: {{ .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.elasticSearch.endpoint }}
180+
LOGS_EXPORTER_AUDITSAFE_ES_USERNAME: {{ .Values.global.cp.resources.o11yv3.logsServer.config.exporter.auditSafe.elasticSearch.username }}
181+
{{- $auditsafeExpESOpt = true -}}
182+
{{- $auditsafeExp = "'[elasticsearch/auditsafe]'" -}}
183+
{{- end }}
184+
{{- if .Values.global.cp.enableClusterScopedPerm }}
185+
{{- $auditsafeProc = "'[k8sattributes/general, transform/logs, transform/auditsafe, memory_limiter, batch]'" -}}
186+
{{- else }}
187+
{{- $auditsafeProc = "'[k8sattributes/general-ns, transform/logs, transform/auditsafe, memory_limiter, batch]'" -}}
188+
{{- end }}
189+
{{- end }}
190+
##logsserver:auditSafe proxy
191+
{{- if .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.enabled }}
192+
{{- if eq .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.kind "elasticSearch" }}
193+
logserver-proxy-auditsafe-index: {{ .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.elasticSearch.logIndex }}
194+
logserver-proxy-auditsafe-endpoint: {{ .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.elasticSearch.endpoint }}
195+
logserver-proxy-auditsafe-userName: {{ .Values.global.cp.resources.o11yv3.logsServer.config.proxy.auditSafe.elasticSearch.username }}
196+
{{- end }}
197+
{{- end }}
174198
##metricsserver:exporter
175199
{{- if .Values.global.cp.resources.o11yv3.metricsServer.config.exporter.enabled }}
176200
{{- if eq .Values.global.cp.resources.o11yv3.metricsServer.config.exporter.kind "prometheus" }}
@@ -291,6 +315,9 @@ data:
291315
{{- end }}
292316
{{- if not $svcLogExpESOpt }}
293317
LOGS_EXPORTER_SVC_ES_ENDPOINT: {{ $esEndpoint }}
318+
{{- end }}
319+
{{- if not $auditsafeExpESOpt }}
320+
LOGS_EXPORTER_AUDITSAFE_ES_ENDPOINT: {{ $esEndpoint }}
294321
{{- end }}
295322
LOGS_EXPORTER_APP_OTLP_URL: {{ $appLogOtlpUrl }}
296323
LOGS_EXPORTER_SVC_OTLP_URL: {{ $svcLogOtlpUrl }}
@@ -304,6 +331,10 @@ data:
304331
svc_logs_receiver: {{ $svcLogRec }}
305332
svc_logs_processor: {{ $svcLogProc }}
306333
svc_logs_exporter: {{ $svcLogExp }}
334+
##pipeline:auditsafe
335+
auditsafe_receiver: {{ $auditsafeRec }}
336+
auditsafe_processor: {{ $auditsafeProc }}
337+
auditsafe_exporter: {{ $auditsafeExp }}
307338
##pipeline:metrics
308339
metrics_appengines_rec: {{ $appMetricsRec }}
309340
metrics_appengines_proc: {{ $appMetricsProc }}

0 commit comments

Comments
 (0)