More logging fixes
This commit is contained in:
parent
4d5a6b72d1
commit
58658bbc01
@ -11,4 +11,4 @@ metadata:
|
||||
{{ include "kubezero-lib.labels" . | indent 4 }}
|
||||
data:
|
||||
username: {{ "elastic" | b64enc | quote }}
|
||||
elastic: {{ .Values.es.elastic_password | b64enc | quote }}
|
||||
elastic: {{ .Values.elastic_password | b64enc | quote }}
|
||||
|
@ -8,6 +8,8 @@ fullnameOverride: logging
|
||||
# Version for ElasticSearch and Kibana have to match so we define it at top-level
|
||||
version: 7.6.0
|
||||
|
||||
elastic_password: "dsfsfs" # super_secret_elastic_password
|
||||
|
||||
es:
|
||||
nodeSets:
|
||||
- name: default-zone-0
|
||||
@ -19,7 +21,6 @@ es:
|
||||
s3Snapshot:
|
||||
enabled: true
|
||||
iamrole: "dfsf" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots
|
||||
elastic_password: "dsfsfs" # super_secret_elastic_password
|
||||
|
||||
prometheus: true
|
||||
|
||||
|
@ -4,6 +4,8 @@
|
||||
# Version for ElasticSearch and Kibana have to match so we define it at top-level
|
||||
version: 7.8.1
|
||||
|
||||
elastic_password: "" # super_secret_elastic_password
|
||||
|
||||
es:
|
||||
nodeSets: []
|
||||
#- count: 2
|
||||
@ -14,7 +16,6 @@ es:
|
||||
s3Snapshot:
|
||||
enabled: false
|
||||
iamrole: "" # INSERT_CLOUDFORMATION_OUTPUT_ElasticSearchSnapshots
|
||||
elastic_password: "" # super_secret_elastic_password
|
||||
|
||||
prometheus: false
|
||||
|
||||
|
@ -129,8 +129,28 @@ kubezero:
|
||||
logging:
|
||||
enabled: {{ .Values.logging.enabled }}
|
||||
values:
|
||||
{{- with .Values.logging }}
|
||||
{{- toYaml . | nindent 6 }}
|
||||
elastic_password: {{ .Values.logging.elastic_password }}
|
||||
|
||||
{{- if .Values.logging.version }}
|
||||
version: {{ .Values.logging.version }}
|
||||
|
||||
{{- if .Values.logging.fullnameOverride }}
|
||||
{{- end }}
|
||||
fullnameOverride: {{ .Values.logging.fullnameOverride }}
|
||||
{{- end }}
|
||||
es:
|
||||
{{- if .Values.logging.es.nodeSets }}
|
||||
nodeSets:
|
||||
{{- with .Values.logging.es.nodeSets }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
prometheus: {{ .Values.metrics.enabled }}
|
||||
{{- if .Values.logging.kibana }}
|
||||
kibana:
|
||||
{{- with .Values.logging.kibana }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
||||
argo-cd:
|
||||
|
Loading…
Reference in New Issue
Block a user