「🏗️」 wip: ELK workingggggggggggggggggggggggggggggggggggg

docker/ELK/compose.yml

@@ -1,4 +1,4 @@
 include:
   - ./logstash/compose.yml
-  # - ./kibana/compose.yml
-  # - ./elasticsearch/compose.yml
+  - ./kibana/compose.yml
+  - ./elasticsearch/compose.yml

docker/ELK/elasticsearch/Dockerfile

@@ -1,3 +1,4 @@
-FROM		docker.elastic.co/elasticsearch/elasticsearch-wolfi:9.0.3
+FROM		docker.elastic.co/elasticsearch/elasticsearch-wolfi:9.0.4
 
 COPY		--chown=elasticsearch:elasticsearch elasticsearch.yml /usr/share/elasticsearch/config/
+COPY		--chown=elasticsearch:elasticsearch jvm.options /usr/share/elasticsearch/config/jvm.options.d/custom.options

docker/ELK/elasticsearch/compose.yml

@@ -6,5 +6,5 @@ services:
       context: .
     environment:
       - LOG_LEVEL=info
-      - ELASTIC_PASSWORD=${ELASTIC_PASSWORD}
-    mem_limit: 1gb
+    networks:
+      - elk

docker/ELK/elasticsearch/elasticsearch.yml

@@ -0,0 +1,9 @@
+cluster.name: docker-cluster
+
+node.name: transcendence-elasticsearch
+
+discovery.type: single-node
+
+xpack.security.enabled: false
+
+network.host: 0.0.0.0

docker/ELK/elasticsearch/jvm.options

@@ -0,0 +1,2 @@
+-Xms1g
+-Xmx1g

docker/ELK/kibana/Dockerfile

@@ -1 +1,3 @@
-FROM		kibana:9.0.3
+FROM		docker.elastic.co/kibana/kibana-wolfi:9.0.4
+
+COPY		--chmod=777 kibana.yml /etc/kibana/kibana.yml

docker/ELK/kibana/compose.yml

@@ -0,0 +1,12 @@
+services:
+  kibana:
+    container_name: transcendence-kibana
+    build:
+      dockerfile: Dockerfile
+      context: .
+    ports:
+      - ${ELK_PORT}:5601
+    environment:
+      - LOG_LEVEL=info
+    networks:
+      - elk

docker/ELK/kibana/kibana.yml

@@ -0,0 +1,6 @@
+server.name: kibana
+server.host: "0.0.0.0"
+
+elasticsearch.hosts: ["https://transcendence-elasticsearch:9200"]
+
+telemetry.enabled: false

docker/ELK/logstash/Dockerfile

@@ -1,4 +1,4 @@
-FROM		docker.elastic.co/logstash/logstash-wolfi:9.0.3
+FROM		docker.elastic.co/logstash/logstash-wolfi:9.0.4
 
 RUN			rm -f /usr/share/logstash/pipeline/logstash.conf
 

docker/ELK/logstash/compose.yml

@@ -12,3 +12,4 @@ services:
       - LOG_LEVEL=info
     networks:
       - elk
+      - logstash

docker/api-base/compose.yml

@@ -14,6 +14,7 @@ services:
     environment:
       - TZ=Europe/Paris
       - API_TARGET=user
+      - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
     restart: unless-stopped
   auth-api:
@@ -31,5 +32,6 @@ services:
     environment:
       - TZ=Europe/Paris
       - API_TARGET=auth
+      - LOG_FILE_PATH=/var/log/log.log
       - JWT_SECRET=${JWT_SECRET}
     restart: unless-stopped

docker/docker-compose.yml

@@ -3,7 +3,7 @@ name: ft_transcendence
 include:
   - ./volumes.yml
   - ./networks.yml
-  - ./monitoring/compose.yml
+  # - ./monitoring/compose.yml
   - ./api-base/compose.yml
   - ./front/compose.yml
   - ./ELK/compose.yml

docker/front/Dockerfile

@@ -31,7 +31,5 @@ RUN			touch /var/log/front/err.log /var/log/front/log.log
 RUN			chmod -R 777 /var/log/front
 USER		nginx
 
-
-
 EXPOSE		80 443
 STOPSIGNAL	SIGINT

docker/front/compose.yml

@@ -9,7 +9,6 @@ services:
     volumes:
       - log-nginx:/var/log/front
     environment:
-      - SERVER_NAME=localhost
       - TZ=Europe/Paris
     depends_on:
       user-api:

docker/monitoring/prometheus/config/prometheus.yml

@@ -24,7 +24,7 @@ scrape_configs:
     static_configs:
       - targets: ['node-exporter:9100']
 
-  - job_name: 'nodejs'
-    static_configs:
-      - targets: ['transcendence-api-auth:3000']
-      - targets: ['transcendence-api-user:3000']
+  # - job_name: 'nodejs'
+  #   static_configs:
+  #     - targets: ['transcendence-api-auth:3000']
+  #     - targets: ['transcendence-api-user:3000']

docker/networks.yml

@@ -9,3 +9,5 @@ networks:
     name: transcendence-prom-exporter
   elk:
     name: transcendence-elk
+  logstash:
+    name: transcendence-logstash