forked from deviantony/docker-elk
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'deviantony:main' into master
- Loading branch information
Showing
18 changed files
with
416 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| ELK_VERSION=7.10.0 | ||
| ELK_VERSION=7.13.4 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| blank_issues_enabled: false | ||
| contact_links: | ||
| - name: Discuss the Elastic Stack | ||
| url: https://discuss.elastic.co | ||
| about: Please ask questions related to the usage of Elastic products in those forums. | ||
| - name: Docker Community Forums | ||
| url: https://forums.docker.com | ||
| about: Please ask questions related to the usage of Docker products in those forums. | ||
| - name: docker-elk Gitter chat room | ||
| url: https://gitter.im/deviantony/docker-elk | ||
| about: General questions regarding this project can also be asked in the chat. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| --- | ||
| name: Issue report | ||
| about: Report a problem with the docker-elk integration or its documentation. | ||
| --- | ||
|
|
||
| <!-- | ||
| Thanks for your issue report! | ||
| In order for us to be able to reproduce the problem and identify the root cause | ||
| quickly, we kindly ask you to include *all* the information requested below in | ||
| your issue report. It saves us a lot of effort and allows us to provide you | ||
| with a solution with as little delay as possible. | ||
| Issues submitted without the requested information will be closed. | ||
| Thank you for your understanding. | ||
| --> | ||
|
|
||
|
|
||
| ### Problem description | ||
|
|
||
| <!-- | ||
| Please be as descriptive as possible regarding the encountered issue versus the | ||
| expected outcome. | ||
| --> | ||
|
|
||
| ### Extra information | ||
|
|
||
| #### Stack configuration | ||
|
|
||
| <!-- | ||
| Please mention all changes performed to the default configuration, including to Dockerfiles. | ||
| If possible, provide the output of the `git diff` command. | ||
| --> | ||
|
|
||
| #### Docker setup | ||
|
|
||
| <!-- | ||
| Please paste the full output of the `docker version` command below. | ||
| Example: | ||
| Client: Docker Engine - Community | ||
| Version: 20.10.2 | ||
| API version: 1.41 | ||
| ... | ||
| --> | ||
|
|
||
| ```console | ||
| $ docker version | ||
|
|
||
| [OUTPUT HERE] | ||
| ``` | ||
|
|
||
| <!-- | ||
| Please paste the full output of the `docker-compose version` command below. | ||
| Example: | ||
| docker-compose version 1.27.4, build 40524192 | ||
| docker-py version: 4.3.1 | ||
| ... | ||
| --> | ||
|
|
||
| ```console | ||
| $ docker-compose version | ||
|
|
||
| [OUTPUT HERE] | ||
| ``` | ||
|
|
||
| #### Container logs | ||
|
|
||
| <!-- | ||
| Please paste the full output of the `docker-compose logs` command below. | ||
| Example: | ||
| elasticsearch_1 | Created elasticsearch keystore in /usr/share/elasticsearch/config/elasticsearch.keystore | ||
| elasticsearch_1 | {"@timestamp":"2021-01-16T21:53:38.331Z", "log.level": "INFO", "message":"version... | ||
| kibana_1 | {"type":"log","@timestamp":"2021-01-16T21:54:10+00:00","tags":["info","plugins-system"],... | ||
| ... | ||
| --> | ||
|
|
||
| ```console | ||
| $ docker-compose logs | ||
|
|
||
| [OUTPUT HERE] | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| set -eu | ||
| set -o pipefail | ||
|
|
||
|
|
||
| source "$(dirname ${BASH_SOURCE[0]})/lib/testing.sh" | ||
|
|
||
|
|
||
| cid_es="$(container_id elasticsearch)" | ||
| cid_ls="$(container_id logspout)" | ||
|
|
||
| ip_es="$(service_ip elasticsearch)" | ||
| ip_ls="$(service_ip logspout)" | ||
|
|
||
| log 'Waiting for readiness of Elasticsearch' | ||
| poll_ready "$cid_es" "http://${ip_es}:9200/" -u 'elastic:testpasswd' | ||
|
|
||
| log 'Waiting for readiness of Logspout' | ||
| poll_ready "$cid_ls" "http://${ip_ls}/health" | ||
|
|
||
| # When Logspout starts, it prints the following log line: | ||
| # 2021/01/07 16:14:52 # logspout v3.2.13-custom by gliderlabs | ||
| # | ||
| # which we expect to find by querying: | ||
| # docker.image:"docker-elk_logspout" AND message:"logspout gliderlabs"~3 | ||
| # | ||
| log 'Searching a log entry forwarded by Logspout' | ||
|
|
||
| declare response | ||
| declare -i count | ||
|
|
||
| # retry for max 60s (30*2s) | ||
| for _ in $(seq 1 30); do | ||
| response="$(curl "http://${ip_es}:9200/_count?q=docker.image:%22docker-elk_logspout%22%20AND%20message:%22logspout%20gliderlabs%22~3&pretty" -s -u elastic:testpasswd)" | ||
| count="$(jq -rn --argjson data "${response}" '$data.count')" | ||
| if [[ $count -gt 0 ]]; then | ||
| break | ||
| fi | ||
|
|
||
| echo -n 'x' >&2 | ||
| sleep 2 | ||
| done | ||
| echo -e '\n' >&2 | ||
|
|
||
| echo "$response" | ||
| # Logspout may restart if Logstash isn't ready yet, so we tolerate multiple | ||
| # results | ||
| if [[ $count -lt 1 ]]; then | ||
| echo "Expected at least 1 document, got ${count}" | ||
| exit 1 | ||
| fi |
Oops, something went wrong.