lab07 6/10 still permission denied for loki

Author: t.suleymanov

app_python/Dockerfile

@@ -17,6 +17,6 @@ RUN adduser --system $ADMIN_USER
 USER $ADMIN_USER
 
 # Explicitly specify port
-EXPOSE 5000
+EXPOSE 5005
 
 CMD ["python", "moscow_app.py"]

app_python/moscow_app.py

@@ -7,6 +7,8 @@
 
 app = Flask(__name__)
 MOSCOW = timezone(timedelta(hours=3), "Moscow")
+HOST = "0.0.0.0"
+PORT = 5005
 
 @app.route("/")
 def index():
@@ -21,4 +23,4 @@ def index():
 
 
 if __name__ == "__main__":
-    app.run()
+    app.run(HOST, PORT)

monitoring/docker-compose.yml

@@ -1,36 +1,27 @@
 version: "3.3"
 
+networks:
+  loki:
+
 services:
-  moscow_time:
-    image: tjann7/moscow_time:latest
-    ports:
-      - "5000:5000"
-    logging:
-      driver: "json-file"
-    healthcheck:
-      test: [ "CMD-SHELL", "curl --fail http://localhost:5000 || exit 1" ]
-      interval: 5s
-      timeout: 5s
-      retries: 5
-  go_random:
-    image: tjann7/go_random:latest
-    ports:
-      - "5500:5500"
-    logging:
-      driver: "json-file"
   loki:
     image: grafana/loki:latest
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
+    networks:
+      - loki
 
   promtail:
     image: grafana/promtail:latest
     volumes:
       - /var/log:/var/log
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/lib/docker/containers:/var/lib/docker/containers
       - ./promtail.yml:/etc/promtail/config.yml
     command: -config.file=/etc/promtail/config.yml
+    networks:
+      - loki
 
   grafana:
     environment:
@@ -59,4 +50,16 @@ services:
         /run.sh
     image: grafana/grafana:latest
     ports:
-      - "3000:3000"
+      - "3000:3000"
+    networks:
+      - loki
+  moscow_time:
+    image: tjann7/moscow_time:latest
+    ports:
+      - "5005:5005"
+    logging:
+      driver: "json-file"
+  go_random:
+    image: tjann7/go_random:latest
+    ports:
+      - "5500:5500"

monitoring/promtail.yml

@@ -6,8 +6,7 @@ positions:
 client:
   url: http://loki:3100/api/v1/push
 scrape_configs:
-  - job_name: logging_both_dockers
-
+  - job_name: logging_both_dockersW
     static_configs:
       - targets:
           - localhost