diff --git a/ansible/host_vars/intersect.yml b/ansible/host_vars/intersect.yml index acaf580..b0d60c8 100644 --- a/ansible/host_vars/intersect.yml +++ b/ansible/host_vars/intersect.yml @@ -1,5 +1,3 @@ expose_ssh: true -traefik_influx_db_dir: /mnt/tank/dbs/influx/traefik - docker_zfs_override: true diff --git a/ansible/roles/forrest/files/prometheus.yml b/ansible/roles/forrest/files/prometheus.yml index 4747772..4e5b791 100644 --- a/ansible/roles/forrest/files/prometheus.yml +++ b/ansible/roles/forrest/files/prometheus.yml @@ -3,3 +3,8 @@ scrape_configs: static_configs: - targets: - telegraf:9273 + - job_name: traefik + static_configs: + - targets: + - 10.23.2.3:8080 # grimes + - 192.168.2.47:8080 # pve-docker diff --git a/ansible/roles/traefik/defaults/main.yml b/ansible/roles/traefik/defaults/main.yml index 355d11a..b13e5c2 100644 --- a/ansible/roles/traefik/defaults/main.yml +++ b/ansible/roles/traefik/defaults/main.yml @@ -1,5 +1,3 @@ -traefik_influx_db_dir: ./influxdb - traefik_provider_jellyfin: false traefik_provider_homeassistant: false traefik_provider_grafana: false diff --git a/ansible/roles/traefik/files/docker-compose.yml b/ansible/roles/traefik/files/docker-compose.yml index c9b6b67..631eb34 100644 --- a/ansible/roles/traefik/files/docker-compose.yml +++ b/ansible/roles/traefik/files/docker-compose.yml @@ -10,19 +10,3 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - ./traefik:/etc/traefik restart: unless-stopped - depends_on: - - influxdb - - influxdb: - image: influxdb:1.8-alpine - restart: unless-stopped - volumes: - - "{{ traefik_influx_db_dir }}:/var/lib/influxdb" - ports: - - "{{ private_ip }}:38089:8089/udp" - - "{{ private_ip }}:38086:8086" - environment: - - INFLUXDB_DB=traefik - - INFLUXDB_HTTP_AUTH_ENABLED= - - INFLUXDB_UDP_ENABLED=true - - INFLUXDB_UDP_DATABASE=traefik diff --git a/ansible/roles/traefik/files/traefik.yml b/ansible/roles/traefik/files/traefik.yml index aacf536..88357b8 100644 --- a/ansible/roles/traefik/files/traefik.yml +++ b/ansible/roles/traefik/files/traefik.yml @@ -58,10 +58,8 @@ serversTransport: insecureSkipVerify: true metrics: - influxDB: - address: "{{ private_ip }}:38089" - database: traefik - pushInterval: 30s + prometheus: + entryPoint: traefik tls: options: