Skip to content

Commit

Permalink
Update logstash container image and remove ELK stack (#15744)
Browse files Browse the repository at this point in the history
* Migrate to new image for logstash container

* Remove ELK stack tooling I will not maintain
  • Loading branch information
AlanCoding authored Jan 15, 2025
1 parent f89be5e commit c45eb43
Show file tree
Hide file tree
Showing 12 changed files with 1 addition and 331 deletions.
15 changes: 0 additions & 15 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -589,24 +589,9 @@ docker-clean-volumes: docker-compose-clean docker-compose-container-group-clean

docker-refresh: docker-clean docker-compose

## Docker Development Environment with Elastic Stack Connected
docker-compose-elk: awx/projects docker-compose-sources
$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate

docker-compose-cluster-elk: awx/projects docker-compose-sources
$(DOCKER_COMPOSE) -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate

docker-compose-container-group:
MINIKUBE_CONTAINER_GROUP=true $(MAKE) docker-compose

clean-elk:
docker stop tools_kibana_1
docker stop tools_logstash_1
docker stop tools_elasticsearch_1
docker rm tools_logstash_1
docker rm tools_elasticsearch_1
docker rm tools_kibana_1

VERSION:
@echo "awx: $(VERSION)"

Expand Down
2 changes: 1 addition & 1 deletion tools/docker-compose/Dockerfile-logstash
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM logstash:5-alpine
FROM mirror.gcr.io/library/logstash:5-alpine
COPY logstash.conf /
RUN touch /logstash.log
RUN chown logstash:logstash /logstash.log
Expand Down
121 changes: 0 additions & 121 deletions tools/elastic/README.md

This file was deleted.

49 changes: 0 additions & 49 deletions tools/elastic/docker-compose.elastic-override.yml

This file was deleted.

13 changes: 0 additions & 13 deletions tools/elastic/docker-compose.logstash-link-cluster.yml

This file was deleted.

7 changes: 0 additions & 7 deletions tools/elastic/docker-compose.logstash-link.yml

This file was deleted.

5 changes: 0 additions & 5 deletions tools/elastic/elasticsearch/Dockerfile

This file was deleted.

1 change: 0 additions & 1 deletion tools/elastic/elasticsearch/config/.placeholder

This file was deleted.

1 change: 0 additions & 1 deletion tools/elastic/kibana/Dockerfile

This file was deleted.

93 changes: 0 additions & 93 deletions tools/elastic/kibana/config/kibana.yml

This file was deleted.

4 changes: 0 additions & 4 deletions tools/elastic/logstash/Dockerfile

This file was deleted.

21 changes: 0 additions & 21 deletions tools/elastic/logstash/config/logstash.conf

This file was deleted.

0 comments on commit c45eb43

Please sign in to comment.