diff --git a/WordPress-Docker/.DS_Store b/WordPress-Docker/.DS_Store new file mode 100644 index 0000000..323f638 Binary files /dev/null and b/WordPress-Docker/.DS_Store differ diff --git a/WordPress-Docker/apache/.Dockerfile.swp b/WordPress-Docker/apache/.Dockerfile.swp new file mode 100644 index 0000000..009e075 Binary files /dev/null and b/WordPress-Docker/apache/.Dockerfile.swp differ diff --git a/WordPress-Docker/docker-compose.yml b/WordPress-Docker/docker-compose.yml index 1722148..9002819 100644 --- a/WordPress-Docker/docker-compose.yml +++ b/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 diff --git a/WordPress-Docker/grafana_login_info.txt b/WordPress-Docker/grafana_login_info.txt new file mode 100644 index 0000000..1f351fd --- /dev/null +++ b/WordPress-Docker/grafana_login_info.txt @@ -0,0 +1,2 @@ +Username: admin +Password: wp_graf_pass diff --git a/WordPress-Docker/monitoring/docker-compose.yml b/WordPress-Docker/monitoring/docker-compose.yml new file mode 100644 index 0000000..7f03098 --- /dev/null +++ b/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 +