diff options
| author | Alan Rominger <arominge@redhat.com> | 2024-11-21 21:11:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-21 21:11:16 +0100 |
| commit | ce7911e578203e015f904e15c040f3c26c33a05a (patch) | |
| tree | ba64c90c22adebe72ec53816c42176d1895ad063 /tools | |
| parent | Make rrule fast forwarding stable (#15601) (diff) | |
| download | awx-ce7911e578203e015f904e15c040f3c26c33a05a.tar.xz awx-ce7911e578203e015f904e15c040f3c26c33a05a.zip | |
Revive the logstash container for testing (#15654)
* Revive the logstash container for testing
* yamllint
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 | 6 | ||||
| -rw-r--r-- | tools/docker-compose/docs/logstash.md | 10 | ||||
| -rw-r--r-- | tools/docker-compose/logstash-override.yaml | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index d202707ebf..58bdc6b80d 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -170,12 +170,6 @@ services: depends_on: - prometheus {% endif %} - # A useful container that simply passes through log messages to the console - # helpful for testing awx/tower logging - # logstash: - # build: - # context: ../../docker-compose - # dockerfile: Dockerfile-logstash postgres: image: quay.io/sclorg/postgresql-15-c9s container_name: tools_postgres_1 diff --git a/tools/docker-compose/docs/logstash.md b/tools/docker-compose/docs/logstash.md index 2e75186b92..f7f280875a 100644 --- a/tools/docker-compose/docs/logstash.md +++ b/tools/docker-compose/docs/logstash.md @@ -2,16 +2,10 @@ #### Modify the docker-compose.yml -Uncomment the following lines in the `docker-compose.yml` +You can run the logstash container by adding another compose file to the docker-compose target. ``` -#- logstash -... - -#logstash: -# build: -# context: ./docker-compose -# dockerfile: Dockerfile-logstash +COMPOSE_OPTS="-f tools/docker-compose/logstash-override.yaml" COMPOSE_TAG=devel make docker-compose ``` POST the following content to `/api/v2/settings/logging/` (this uses diff --git a/tools/docker-compose/logstash-override.yaml b/tools/docker-compose/logstash-override.yaml new file mode 100644 index 0000000000..73688e498a --- /dev/null +++ b/tools/docker-compose/logstash-override.yaml @@ -0,0 +1,12 @@ +--- +services: + # A useful container that simply passes through log messages to the console + # helpful for testing awx/tower logging + logstash: + build: + context: ../ + dockerfile: Dockerfile-logstash + container_name: tools_logstash_1 + hostname: logstash + networks: + - awx |