diff --git a/monitoring/docker-compose.yaml b/monitoring/docker-compose.yaml index b382697..2bdb920 100644 --- a/monitoring/docker-compose.yaml +++ b/monitoring/docker-compose.yaml @@ -52,7 +52,6 @@ services: - "docker.group=monitoring" - # influxdb to store time based data. Adress is drax.fzirker.lan:8086 influxdb: # image: arm32v7/influxdb image: influxdb:1.8 diff --git a/monitoring/telegraf/telegraf.conf b/monitoring/telegraf/telegraf.conf index 1afa29f..4e8ab25 100644 --- a/monitoring/telegraf/telegraf.conf +++ b/monitoring/telegraf/telegraf.conf @@ -80,7 +80,7 @@ # urls = ["unix:///var/run/influxdb.sock"] # urls = ["udp://127.0.0.1:8089"] # urls = ["http://127.0.0.1:8086"] - urls = ["http://drax.fzirker.lan:8086"] # required + urls = ["http://192.168.16.5:8086"] # required ############################################################################### @@ -254,11 +254,11 @@ "https://www.feuerwehr-kapsweyer.de", "https://ping.feuerwehr-kapsweyer.de", "http://ping.feuerwehr-kapsweyer.de", - "http://portainer.fzirker.lan", - "http://gpxviewer.fzirker.lan", - "http://traefik.fzirker.lan/dashboard/", - "http://heimdall.fzirker.lan", - "http://monitoring.fzirker.lan/login", + "http://portainer.lan", + "http://gpxviewer.lan", + "http://traefik.lan/dashboard/", + "http://heimdall.lan", + "http://monitoring.lan/login", #"http://solarmaxpi.zirker.lan" ] interval = "60s" @@ -341,13 +341,14 @@ interfaces = ["enx001e0636be71"] [[inputs.ping]] ## List of urls to ping urls = [ - "fritz-box.fzirker.lan", - "wlan-ap.fzirker.lan", - "drax.fzirker.lan", + "fritz-box.lan", + "wlan-ap.lan", + "drax.lan", "florianzirker.de", "t-online.de", "8.8.8.8", "4.2.2.2", + "9.9.9.9", "example.com" ] diff --git a/portainer/docker-compose.yaml b/portainer/docker-compose.yaml index a69083a..a5f0725 100644 --- a/portainer/docker-compose.yaml +++ b/portainer/docker-compose.yaml @@ -8,8 +8,8 @@ services: - ${VOLUMES_PATH}/portainer:/data - /var/run/docker.sock:/var/run/docker.sock - /var/lib/docker/volumes:/var/lib/docker/volumes - expose: - - "9000" + ports: + - "9000:9000" # to get portainer without proxy too networks: - web labels: diff --git a/proxy/docker-compose.yaml b/proxy/docker-compose.yaml index be717d7..66ff6df 100644 --- a/proxy/docker-compose.yaml +++ b/proxy/docker-compose.yaml @@ -5,12 +5,6 @@ services: traefik: image: traefik:v2.4 restart: always - command: - - "--api.insecure=true" - #- "--accesslog=true" - - "--providers.docker=true" - - "--providers.docker.exposedbydefault=false" - - "--entrypoints.web.address=:80" ports: - "80:80" - "443:443" @@ -18,6 +12,8 @@ services: - web volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" + - "$PWD/traefik.yml:/etc/traefik/traefik.yml" + - "$PWD/extraProviders/:/extraProviders:ro" labels: - "traefik.enable=true" - "traefik.http.routers.traefik.rule=Host(`traefik.${DOMAIN}`)" diff --git a/proxy/extraProviders/pihole.yaml b/proxy/extraProviders/pihole.yaml new file mode 100644 index 0000000..1528ca0 --- /dev/null +++ b/proxy/extraProviders/pihole.yaml @@ -0,0 +1,10 @@ +http: + routers: + pihole: + rule: "Host(`pihole.lan`) || Host(`pi.hole`)" + service: pihole + services: + pihole: + loadbalancer: + servers: + - url: "http://192.168.16.5:8080/admin/" diff --git a/proxy/traefik.yml b/proxy/traefik.yml new file mode 100644 index 0000000..3c1ff30 --- /dev/null +++ b/proxy/traefik.yml @@ -0,0 +1,23 @@ +debug: true +checkNewVersion: true +logLevel: INFO +#defaultEntryPoints: ["https","http"] +defaultEntryPoints: [http] + +api: + insecure: true + +providers: + docker: + exposedbydefault: false + endpoint: "unix:///var/run/docker.sock" + + file: + directory: /extraProviders + + +entryPoints: + web: + address: ':80' + +