WordPress-Docker/docker-compose.yml

@@ -1,46 +1,49 @@
 version: '3.8'
 
 services:
-  # loki:
-  #   image: grafana/loki:3.0.0
-  #   container_name: loki
-  #   ports:
-  #     - "3100:3100"
-  #   command: -config.file=/etc/loki/local-config.yaml
-  #   restart: unless-stopped
+   loki:
+     image: grafana/loki:3.0.0
+     container_name: loki
+     ports:
+       - "3100:3100"
+     command: -config.file=/etc/loki/local-config.yaml
+     restart: unless-stopped
 
-  # grafana:
-  #   image: grafana/grafana:10.4.0
-  #   container_name: grafana
-  #   ports:
-  #     - "3000:3000"
-  #   environment:
-  #     - GF_SECURITY_ADMIN_USER=admin
-  #     - GF_SECURITY_ADMIN_PASSWORD=ocfsecure
-  #   depends_on:
-  #     - loki
-  #   restart: unless-stopped
+   grafana:
+     image: grafana/grafana:10.4.0
+     container_name: grafana
+     ports:
+       - "3000:3000"
+     environment:
+       - GF_SECURITY_ADMIN_USER=admin
+       - GF_SECURITY_ADMIN_PASSWORD=ocfsecure
+     depends_on:
+       - loki
+     restart: unless-stopped
 
-  # alloy:
-  #   image: grafana/alloy:latest
-  #   container_name: alloy
-  #   volumes:
-  #     - ./alloy-config.yml:/etc/alloy/config.alloy
-  #     - ./logs:/var/log/scanner
-  #   ports:
-  #     - "12345:12345"   # optional web UI/debug
-  #   command: run /etc/alloy/config.alloy
-  #   environment:
-  #     - ALLOY_ENABLE_WEB=true
-  #   depends_on:
-  #     - loki
-  #   restart: unless-stopped
+   alloy:
+     image: grafana/alloy:latest
+     container_name: alloy
+     volumes:
+       - ./alloy-config.yml:/etc/alloy/config.alloy
+       - ./logs:/var/log/scanner
+     ports:
+       - "12345:12345"   # optional web UI/debug
+     command: run /etc/alloy/config.alloy
+     environment:
+       - ALLOY_ENABLE_WEB=true
+     depends_on:
+       - loki
+     restart: unless-stopped
 
   apache:
     build:
       context: ./apache
     ports:
       - "8080:80"
+    networks:
+      - shared_net
+      - default
     volumes:
       - userdata:/home
     depends_on:
@@ -87,3 +90,7 @@ volumes:
   userdata:
   db_data:
   wp_data:
+
+networks:
+  shared_net:
+    external: true

WordPress-Docker/grafana_login_info.txt

@@ -0,0 +1,2 @@
+Username: admin
+Password: wp_graf_pass

WordPress-Docker/monitoring/docker-compose.yml

@@ -0,0 +1,29 @@
+version: "3.8"
+
+networks:
+  shared_net:
+    external: true
+
+services:
+  loki:
+    image: grafana/loki:3.0.0
+    container_name: loki
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
+    networks:
+      - shared_net
+
+  grafana:
+    image: grafana/grafana:10.4.0
+    container_name: grafana
+    ports:
+      - "3000:3000"
+    environment:
+      - GF_SECURITY_ADMIN_USER=admin
+      - GF_SECURITY_ADMIN_PASSWORD=admin
+    depends_on:
+      - loki
+    networks:
+      - shared_net
+