diff --git a/Cargo.lock b/Cargo.lock index 2d7769aa..fc13fccc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -611,9 +611,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.14" +version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ba6d68e24814cb8de6bb986db8222d3a027d15872cabc0d18817bc3c0e4471" +checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" dependencies = [ "crossbeam-utils", ] @@ -2034,9 +2034,9 @@ checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" [[package]] name = "openssl" -version = "0.10.71" +version = "0.10.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" +checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da" dependencies = [ "bitflags", "cfg-if", @@ -2066,9 +2066,9 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" [[package]] name = "openssl-sys" -version = "0.9.106" +version = "0.9.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" +checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" dependencies = [ "cc", "libc", @@ -3432,9 +3432,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.43.0" +version = "1.44.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" +checksum = "e6b88822cbe49de4185e3a4cbf8321dd487cf5fe0c5c65695fef6346371e9c48" dependencies = [ "backtrace", "bytes", diff --git a/deploy/helm/secret-operator/templates/_telemetry.tpl b/deploy/helm/secret-operator/templates/_telemetry.tpl new file mode 100644 index 00000000..ec49f788 --- /dev/null +++ b/deploy/helm/secret-operator/templates/_telemetry.tpl @@ -0,0 +1,59 @@ +{{/* +Create a list of telemetry related env vars. +*/}} +{{- define "telemetry.envVars" -}} +{{- with .Values.telemetry }} +{{- if not .consoleLog.enabled }} +- name: CONSOLE_LOG_DISABLED + value: "true" +{{- end }} +{{- if .consoleLog.level }} +- name: CONSOLE_LOG_LEVEL + value: {{ .consoleLog.level }} +{{ end }} +{{- if .consoleLog.format }} +- name: CONSOLE_LOG_FORMAT + value: {{ .consoleLog.format }} +{{ end }} +{{- if .fileLog.enabled }} +- name: FILE_LOG_DIRECTORY + value: /stackable/logs/{{ include "operator.appname" $ }} +{{- end }} +{{- if .fileLog.level }} +- name: FILE_LOG_LEVEL + value: {{ .fileLog.level }} +{{- end }} +{{- if .fileLog.rotationPeriod }} +- name: FILE_LOG_ROTATION_PERIOD + value: {{ .fileLog.rotationPeriod }} +{{- end }} +{{- if .fileLog.maxFiles }} +- name: FILE_LOG_MAX_FILES + value: {{ .fileLog.maxFiles }} +{{- end }} +{{- if .otelLogExporter.enabled }} +- name: OTEL_LOG_EXPORTER_ENABLED + value: "true" +{{- end }} +{{- if .otelLogExporter.level }} +- name: OTEL_LOG_EXPORTER_LEVEL + value: {{ .otelLogExporter.level }} +{{- end }} +{{- if .otelLogExporter.endpoint }} +- name: OTEL_EXPORTER_OTLP_LOGS_ENDPOINT + value: {{ .otelLogExporter.endpoint }} +{{- end }} +{{- if .otelTraceExporter.enabled }} +- name: OTEL_TRACE_EXPORTER_ENABLED + value: "true" +{{- end }} +{{- if .otelTraceExporter.level }} +- name: OTEL_TRACE_EXPORTER_LEVEL + value: {{ .otelTraceExporter.level }} +{{- end }} +{{- if .otelTraceExporter.endpoint }} +- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT + value: {{ .otelTraceExporter.endpoint }} +{{- end }} +{{- end }} +{{- end }} diff --git a/deploy/helm/secret-operator/templates/daemonset.yaml b/deploy/helm/secret-operator/templates/daemonset.yaml index c21281aa..d4732431 100644 --- a/deploy/helm/secret-operator/templates/daemonset.yaml +++ b/deploy/helm/secret-operator/templates/daemonset.yaml @@ -47,6 +47,7 @@ spec: - name: KUBERNETES_CLUSTER_DOMAIN value: {{ .Values.kubernetesClusterDomain | quote }} {{- end }} + {{- include "telemetry.envVars" . | nindent 12 }} volumeMounts: - name: csi mountPath: /csi diff --git a/deploy/helm/secret-operator/values.yaml b/deploy/helm/secret-operator/values.yaml index fdb81ea3..5318679a 100644 --- a/deploy/helm/secret-operator/values.yaml +++ b/deploy/helm/secret-operator/values.yaml @@ -94,3 +94,17 @@ secretClasses: # The namespace that the TLS Certificate Authority is installed into. # Defaults to the namespace where secret-op is installed. caSecretNamespace: null + +# See all available options and detailed explanations about the concept here: +# https://docs.stackable.tech/home/stable/concepts/telemetry/ +telemetry: + consoleLog: + enabled: true + fileLog: + enabled: false + rotationPeriod: hourly + maxFiles: 6 + otelLogExporter: + enabled: false + otelTraceExporter: + enabled: false diff --git a/nix/README.md b/nix/README.md index d3245031..a74e2402 100644 --- a/nix/README.md +++ b/nix/README.md @@ -13,7 +13,7 @@ DO NOT MANUALLY EDIT THIS FILE ```shell niv update crate2nix niv update nixpkgs -niv update beky.py -b X.Y.Z # Using the release tag +niv update beku.py -b X.Y.Z # Using the release tag ``` ### Test