Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revive the logstash container for testing #15654

Merged
merged 2 commits into from
Nov 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 2 additions & 8 deletions tools/docker-compose/docs/logstash.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions tools/docker-compose/logstash-override.yaml
Original file line number Diff line number Diff line change
@@ -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
Loading