Compare commits

..

1 Commits

2 changed files with 71 additions and 72 deletions
+1 -1
View File
@@ -47,5 +47,5 @@ api:
prometheus: prometheus:
enabled: true enabled: true
level: full level: full
listen_addr: "100.64.0.3" listen_addr: "[::]"
listen_port: 6060 listen_port: 6060
+70 -71
View File
@@ -37,74 +37,73 @@ services:
- "traefik.http.routers.traefik.entrypoints=https" - "traefik.http.routers.traefik.entrypoints=https"
- "traefik.http.routers.traefik.tls=true" - "traefik.http.routers.traefik.tls=true"
<<<<<<< HEAD traefik-agent:
# traefik-agent: extends:
# extends: file: ${TEMPLATES_PATH}
# file: ${TEMPLATES_PATH} service: default
# service: default image: hhftechnology/traefik-log-dashboard-agent:3.1.0
# image: hhftechnology/traefik-log-dashboard-agent:2.4.1 container_name: traefik-log-dashboard-agent
# container_name: traefik-agent networks:
# networks: - ip4net
# - ip4net ports:
# ports: - "8078:5000"
# - "8078:5000" volumes:
# volumes: - "/var/log/traefik/:/logs:ro"
# - "/var/log/traefik/:/logs:ro" - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data"
# - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data" environment:
# environment: TRAEFIK_LOG_DASHBOARD_ACCESS_PATH: /logs/access.log
# TRAEFIK_LOG_DASHBOARD_ACCESS_PATH: /logs/access.log TRAEFIK_LOG_DASHBOARD_AUTH_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
# TRAEFIK_LOG_DASHBOARD_AUTH_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN} TRAEFIK_LOG_DASHBOARD_SYSTEM_MONITORING: true
# TRAEFIK_LOG_DASHBOARD_SYSTEM_MONITORING: true TRAEFIK_LOG_DASHBOARD_LOG_FORMAT: json
# TRAEFIK_LOG_DASHBOARD_LOG_FORMAT: json deploy:
# deploy: resources:
# resources: limits:
# limits: cpus: "0.10"
# cpus: "0.15" memory: 50M
# memory: 50M healthcheck:
# healthcheck: test:
# test: [
# [ "CMD",
# "CMD", "wget",
# "wget", "--no-verbose",
# "--no-verbose", "--tries=1",
# "--tries=1", "--spider",
# "--spider", "http://localhost:5000/api/logs/status",
# "http://localhost:5000/api/logs/status", ]
# ] interval: 2m
# interval: 2m timeout: 10s
# timeout: 10s retries: 3
# retries: 3 start_period: 30s
# start_period: 30s
# traefik-dashboard:
# traefik-dashboard: extends:
# extends: file: ${TEMPLATES_PATH}
# file: ${TEMPLATES_PATH} service: default
# service: default image: hhftechnology/traefik-log-dashboard:3.1.0
# image: hhftechnology/traefik-log-dashboard:2.4.1 container_name: traefik-log-dashboard
# container_name: traefik-dashboard networks:
# networks: - ip4net
# - ip4net ports:
# ports: - "8077:3000"
# - "8077:3000" volumes:
# volumes: - "${SERVICE_PATH}/traefik/log-dashboard/dashboard:/app/data"
# - "${SERVICE_PATH}/traefik/log-dashboard/dashboard:/app/data" - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data"
# - "${SERVICE_PATH}/traefik/log-dashboard/positions:/data" environment:
# environment: AGENT_API_URL: http://traefik-agent:5000
# AGENT_API_URL: http://traefik-agent:5000 AGENT_API_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN}
# AGENT_API_TOKEN: ${TRAEFIK_DASHBOARD_TOKEN} # Display Configuration
# # Display Configuration NEXT_PUBLIC_SHOW_DEMO_PAGE: false
# NEXT_PUBLIC_SHOW_DEMO_PAGE: false depends_on:
# depends_on: traefik-agent:
# traefik-agent: condition: service_healthy
# condition: service_healthy deploy:
# deploy: resources:
# resources: limits:
# limits: cpus: "0.1"
# cpus: "0.1" memory: 50M
# memory: 120M labels:
# labels: # traefik
# # traefik - "traefik.enable=true"
# - "traefik.enable=true" - "traefik.http.routers.traefik-log-dashboard.rule=Host(`traefik-dashboard.${LOCAL_VPS_DOMAIN}`)"
# - "traefik.http.routers.traefik-log-dashboard.rule=Host(`traefik-dashboard.${LOCAL_VPS_DOMAIN}`)" - "traefik.http.routers.traefik-log-dashboard.entrypoints=https"
# - "traefik.http.routers.traefik-log-dashboard.entrypoints=https" - "traefik.http.routers.traefik-log-dashboard.tls=true"
# - "traefik.http.routers.traefik-log-dashboard.tls=true"