Logging fixes for NOT using nameoverride
This commit is contained in:
parent
0c829d64e0
commit
0939405c7a
@ -70,6 +70,7 @@ fluentd:
|
|||||||
namespace: monitoring
|
namespace: monitoring
|
||||||
|
|
||||||
output:
|
output:
|
||||||
|
# Default should be "logging-kubezero-logging-es-http" if fullnameOverride is NOT used
|
||||||
host: logging-es-http
|
host: logging-es-http
|
||||||
|
|
||||||
shared_key: "cloudbender"
|
shared_key: "cloudbender"
|
||||||
@ -78,6 +79,7 @@ fluentd:
|
|||||||
OUTPUT_USER: elastic
|
OUTPUT_USER: elastic
|
||||||
OUTPUT_SSL_VERIFY: "false"
|
OUTPUT_SSL_VERIFY: "false"
|
||||||
|
|
||||||
|
# Same here the secret names change if fullnameOverride is not used !!
|
||||||
extraEnvVars:
|
extraEnvVars:
|
||||||
- name: OUTPUT_PASSWORD
|
- name: OUTPUT_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
@ -168,6 +168,14 @@ kubezero:
|
|||||||
metrics:
|
metrics:
|
||||||
enabled: {{ and .Values.metrics.enabled .Values.metrics.ready }}
|
enabled: {{ and .Values.metrics.enabled .Values.metrics.ready }}
|
||||||
url: {{ .Values.logging.fluentd.url }}
|
url: {{ .Values.logging.fluentd.url }}
|
||||||
|
{{- if .Values.logging.fluentd.output }}
|
||||||
|
output:
|
||||||
|
host: {{ .Values.logging.fluentd.output.host }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.logging.fluentd.extraEnvVars }}
|
||||||
|
extraEnvVars:
|
||||||
|
{{- toYaml .Values.logging.fluentd.extraEnvVars | nindent 10 }}
|
||||||
|
{{- end }}
|
||||||
{{- if and .Values.logging.fluentd.istio .Values.istio.enabled .Values.istio.ready }}
|
{{- if and .Values.logging.fluentd.istio .Values.istio.enabled .Values.istio.ready }}
|
||||||
istio:
|
istio:
|
||||||
{{- with .Values.logging.fluentd.istio }}
|
{{- with .Values.logging.fluentd.istio }}
|
||||||
|
Loading…
Reference in New Issue
Block a user