Skip to content

Commit

Permalink
feat: remove apm from docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
helllllllder committed Jul 26, 2023
1 parent e3bca66 commit 0fec371
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 57 deletions.
5 changes: 0 additions & 5 deletions chats/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@

ASGI_APPLICATION = "chats.asgi.application"

# Database
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases

DATABASES = dict(default=env.db(var="DATABASE_URL"))

REDIS_URL = env.str("CHANNEL_LAYERS_REDIS", default="redis://localhost:6379/1")

# channels
Expand Down
52 changes: 1 addition & 51 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,60 +55,10 @@ services:
- postgres
- redis

apm-server:
image: docker.elastic.co/apm/apm-server:7.14.1
depends_on:
- elasticsearch
- kibana
cap_add: [ "CHOWN", "DAC_OVERRIDE", "SETGID", "SETUID" ]
cap_drop: [ "ALL" ]
ports:
- 8200:8200
networks:
- elastic
command: >
apm-server -e
-E apm-server.rum.enabled=true
-E setup.kibana.host=kibana:5601
-E setup.template.settings.index.number_of_replicas=0
-E apm-server.kibana.enabled=true
-E apm-server.kibana.host=kibana:5601
-E output.elasticsearch.hosts=["elasticsearch:9200"]
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.14.1
environment:
- discovery.type=single-node
- bootstrap.memory_lock=true
- "ES_JAVA_OPTS=-Xms128m -Xmx2g"
ulimits:
memlock:
hard: -1
soft: -1
ports:
- 9200:9200
networks:
- elastic

kibana:
image: docker.elastic.co/kibana/kibana:7.14.1
depends_on:
- elasticsearch
environment:
ELASTICSEARCH_URL: http://elasticsearch:9200
ELASTICSEARCH_HOSTS: http://elasticsearch:9200
ports:
- 5601:5601
networks:
- elastic

volumes:
postgres:
esdata:
driver: local


networks:
chats:
external: true
elastic:
driver: bridge
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ lint:
## Docker

dev_up:
@docker-compose -f docker/docker-compose.yml up -d postgres redis elasticsearch kibana apm-server
@docker-compose -f docker/docker-compose.yml up -d postgres redis

dev_down:
@docker-compose -f docker/docker-compose.yml down
Expand Down

0 comments on commit 0fec371

Please sign in to comment.