Skip to content

D
docker-elk
Commit a85d4d8c authored by 段孔乐's avatar 段孔乐
Browse files
Options

Merge branch 'main' into 'release-1.0.1'

# Conflicts: # logstash/pipeline/logstash.conf
parents 7f8489f8 1ad25060
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
.gitignore 0 → 100644
View file @ a85d4d8c
es.log
kibana.log
logstash-restart.sh
logstash.log
kibana/config/kibana.yml
View file @ a85d4d8c
...@@ -11,3 +11,5 @@ monitoring.ui.container.elasticsearch.enabled: true ...@@ -11,3 +11,5 @@ monitoring.ui.container.elasticsearch.enabled: true
# #
elasticsearch.username: elastic elasticsearch.username: elastic
elasticsearch.password: changeme elasticsearch.password: changeme
# i18n.locale: "zh-CN"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment