Revive the logstash container for testing (#15654)

* Revive the logstash container for testing

* yamllint

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

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
+COMPOSE_OPTS="-f tools/docker-compose/logstash-override.yaml" COMPOSE_TAG=devel make docker-compose
-...
-
-#logstash:
-#  build:
-#    context: ./docker-compose
-#    dockerfile: Dockerfile-logstash
 ```
 
 POST the following content to `/api/v2/settings/logging/` (this uses

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