From b2ef9538666fadc91d549f3212c59ff29cdb12c5 Mon Sep 17 00:00:00 2001 From: Joey Hafner Date: Thu, 19 Oct 2023 10:15:32 -0700 Subject: [PATCH] #104 Find and remove standard loki logging block --- fighter/config/autopirate/docker-compose.yml | 64 ------------------- fighter/config/calibre-web/docker-compose.yml | 24 ------- fighter/config/ddns/docker-compose.yml | 8 --- fighter/config/gitlab/docker-compose.yml | 24 ------- fighter/config/keycloak/docker-compose.yml | 24 ------- fighter/config/minecraft/docker-compose.yml | 24 ------- fighter/config/monitoring/docker-compose.yml | 48 -------------- fighter/config/nextcloud/docker-compose.yml | 8 --- fighter/config/plex/docker-compose.yml | 24 ------- fighter/config/portainer/docker-compose.yml | 8 --- fighter/config/qbittorrent/docker-compose.yml | 16 ----- fighter/config/send/docker-compose.yml | 8 --- fighter/config/stashapp/docker-compose.yml | 8 --- fighter/config/traefik/docker-compose.yml | 8 --- .../unifi_controller/docker-compose.yml | 8 --- fighter/config/wireguard/docker-compose.yml | 8 --- 16 files changed, 312 deletions(-) diff --git a/fighter/config/autopirate/docker-compose.yml b/fighter/config/autopirate/docker-compose.yml index 4b85886..020999a 100644 --- a/fighter/config/autopirate/docker-compose.yml +++ b/fighter/config/autopirate/docker-compose.yml @@ -3,14 +3,6 @@ services: radarr: image: linuxserver/radarr container_name: autopirate_radarr - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - web env_file: @@ -28,14 +20,6 @@ services: sonarr: image: linuxserver/sonarr container_name: autopirate_sonarr - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - web env_file: @@ -78,14 +62,6 @@ services: nzbhydra2: image: linuxserver/nzbhydra2 container_name: autopirate_nzbhydra2 - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - web env_file: @@ -102,14 +78,6 @@ services: sabnzbd: image: linuxserver/sabnzbd container_name: autopirate_sabnzbd - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - web - monitoring @@ -133,14 +101,6 @@ services: tdarr: image: haveagitgat/tdarr:latest container_name: autopirate_tdarr - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: web: tdarr: @@ -168,14 +128,6 @@ services: tdarr-node: image: haveagitgat/tdarr_node:latest container_name: autopirate_tdarr-node - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" deploy: resources: reservations: @@ -201,14 +153,6 @@ services: jackett: image: linuxserver/jackett container_name: autopirate_jackett - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - web env_file: @@ -226,14 +170,6 @@ services: exporter-sabnzbd: image: msroest/sabnzbd_exporter # https://github.com/msroest/sabnzbd_exporter container_name: autopirate_sabnzbd-exporter - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - monitoring diff --git a/fighter/config/calibre-web/docker-compose.yml b/fighter/config/calibre-web/docker-compose.yml index 0f70677..eb1d7dc 100644 --- a/fighter/config/calibre-web/docker-compose.yml +++ b/fighter/config/calibre-web/docker-compose.yml @@ -3,14 +3,6 @@ services: calibre-web-rpg: image: linuxserver/calibre-web container_name: calibre-web_rpg - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" env_file: - calibre-web.env volumes: @@ -25,14 +17,6 @@ services: calibre-web-sff: image: linuxserver/calibre-web container_name: calibre-web_sff - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" env_file: - calibre-web.env volumes: @@ -47,14 +31,6 @@ services: calibre-web-ace: image: linuxserver/calibre-web container_name: calibre-web_ace - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" env_file: - calibre-web.env volumes: diff --git a/fighter/config/ddns/docker-compose.yml b/fighter/config/ddns/docker-compose.yml index 25149ef..d24be41 100644 --- a/fighter/config/ddns/docker-compose.yml +++ b/fighter/config/ddns/docker-compose.yml @@ -3,14 +3,6 @@ services: ddclient: image: linuxserver/ddclient container_name: ddns_ddclient - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - ddns diff --git a/fighter/config/gitlab/docker-compose.yml b/fighter/config/gitlab/docker-compose.yml index 510aed5..5ee88f8 100644 --- a/fighter/config/gitlab/docker-compose.yml +++ b/fighter/config/gitlab/docker-compose.yml @@ -3,14 +3,6 @@ services: gitlab: image: 'gitlab/gitlab-ee:latest' container_name: gitlab_gitlab - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" deploy: resources: limits: @@ -101,14 +93,6 @@ services: gitlab-runner-0: image: 'gitlab/gitlab-runner:latest' container_name: gitlab_runner_0 - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - gitlab @@ -123,14 +107,6 @@ services: gitlab-runner-1: image: 'gitlab/gitlab-runner:latest' container_name: gitlab_runner_1 - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - gitlab diff --git a/fighter/config/keycloak/docker-compose.yml b/fighter/config/keycloak/docker-compose.yml index 2038fb6..05886bc 100644 --- a/fighter/config/keycloak/docker-compose.yml +++ b/fighter/config/keycloak/docker-compose.yml @@ -4,14 +4,6 @@ services: keycloak: image: quay.io/keycloak/keycloak:19.0 container_name: keycloak_keycloak - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" volumes: - $KEYCLOAK_DATA:/opt/keycloak/data networks: @@ -32,14 +24,6 @@ services: forwardauth: image: mesosphere/traefik-forward-auth:3.1.0 container_name: keycloak_forwardauth - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: web: aliases: @@ -59,14 +43,6 @@ services: image: mesosphere/traefik-forward-auth:3.1.0 container_name: keycloak_forwardauth-privileged command: "./traefik-forward-auth --whitelist=jafner425@gmail.com" - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: web: aliases: diff --git a/fighter/config/minecraft/docker-compose.yml b/fighter/config/minecraft/docker-compose.yml index 76eca2d..fbee31d 100644 --- a/fighter/config/minecraft/docker-compose.yml +++ b/fighter/config/minecraft/docker-compose.yml @@ -3,14 +3,6 @@ services: router: image: itzg/mc-router container_name: minecraft_router - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - minecraft @@ -21,14 +13,6 @@ services: e8: image: itzg/minecraft-server:latest container_name: minecraft_e8 - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" env_file: - minecraft.env - minecraft_secrets.env @@ -42,14 +26,6 @@ services: exporter-minecraft: image: itzg/mc-monitor # https://github.com/itzg/mc-monitor container_name: minecraft_exporter - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" command: export-for-prometheus restart: "no" networks: diff --git a/fighter/config/monitoring/docker-compose.yml b/fighter/config/monitoring/docker-compose.yml index 8fbcf72..0730377 100644 --- a/fighter/config/monitoring/docker-compose.yml +++ b/fighter/config/monitoring/docker-compose.yml @@ -3,14 +3,6 @@ services: grafana: image: grafana/grafana-oss:latest container_name: monitoring_grafana - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - monitoring @@ -29,14 +21,6 @@ services: image: prom/prometheus:latest container_name: monitoring_prometheus user: 1000:1000 - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - monitoring - web @@ -57,14 +41,6 @@ services: image: grafana/loki:2.5.0 container_name: monitoring_loki user: 1000:1000 - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - monitoring - web @@ -82,14 +58,6 @@ services: promtail: image: grafana/promtail container_name: monitoring_promtail - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" networks: - monitoring volumes: @@ -100,14 +68,6 @@ services: exporter-ping: image: czerwonk/ping_exporter container_name: monitoring_exporter-ping - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - monitoring @@ -117,14 +77,6 @@ services: exporter-docker: image: prometheusnet/docker_exporter container_name: monitoring_exporter-docker - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - monitoring diff --git a/fighter/config/nextcloud/docker-compose.yml b/fighter/config/nextcloud/docker-compose.yml index a07f729..6471663 100644 --- a/fighter/config/nextcloud/docker-compose.yml +++ b/fighter/config/nextcloud/docker-compose.yml @@ -3,14 +3,6 @@ services: nextcloud: image: lscr.io/linuxserver/nextcloud:latest container_name: nextcloud_nextcloud - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" env_file: - nextcloud.env depends_on: diff --git a/fighter/config/plex/docker-compose.yml b/fighter/config/plex/docker-compose.yml index b20aa2c..38ca77b 100644 --- a/fighter/config/plex/docker-compose.yml +++ b/fighter/config/plex/docker-compose.yml @@ -3,14 +3,6 @@ services: plex: image: linuxserver/plex container_name: plex_plex - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" deploy: resources: @@ -48,14 +40,6 @@ services: ombi: image: ghcr.io/linuxserver/ombi container_name: plex_ombi - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - web @@ -72,14 +56,6 @@ services: exporter-plex: image: granra/plex_exporter container_name: plex_exporter - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - monitoring diff --git a/fighter/config/portainer/docker-compose.yml b/fighter/config/portainer/docker-compose.yml index f984097..1e463b9 100644 --- a/fighter/config/portainer/docker-compose.yml +++ b/fighter/config/portainer/docker-compose.yml @@ -3,14 +3,6 @@ services: portainer: image: portainer/portainer-ce container_name: portainer_portainer - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" command: -H unix:///var/run/docker.sock networks: diff --git a/fighter/config/qbittorrent/docker-compose.yml b/fighter/config/qbittorrent/docker-compose.yml index e0d55d0..f54bc34 100644 --- a/fighter/config/qbittorrent/docker-compose.yml +++ b/fighter/config/qbittorrent/docker-compose.yml @@ -3,14 +3,6 @@ services: qbittorrent: image: linuxserver/qbittorrent container_name: qbittorrent_qbittorrent - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" deploy: resources: limits: @@ -39,14 +31,6 @@ services: container_name: qbittorrent_exporter env_file: - exporter.env - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - monitoring diff --git a/fighter/config/send/docker-compose.yml b/fighter/config/send/docker-compose.yml index b3f3f58..bdce850 100644 --- a/fighter/config/send/docker-compose.yml +++ b/fighter/config/send/docker-compose.yml @@ -3,14 +3,6 @@ services: send: image: registry.gitlab.com/timvisee/send:latest container_name: send_send - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - send diff --git a/fighter/config/stashapp/docker-compose.yml b/fighter/config/stashapp/docker-compose.yml index 92971c2..1e884f7 100644 --- a/fighter/config/stashapp/docker-compose.yml +++ b/fighter/config/stashapp/docker-compose.yml @@ -3,14 +3,6 @@ services: stash: container_name: stash image: stashapp/stash:latest - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" volumes: - /etc/localtime:/etc/localtime:ro diff --git a/fighter/config/traefik/docker-compose.yml b/fighter/config/traefik/docker-compose.yml index 6e15605..8546e23 100644 --- a/fighter/config/traefik/docker-compose.yml +++ b/fighter/config/traefik/docker-compose.yml @@ -4,14 +4,6 @@ services: traefik: image: traefik:latest container_name: traefik_traefik - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: web: diff --git a/fighter/config/unifi_controller/docker-compose.yml b/fighter/config/unifi_controller/docker-compose.yml index b970d6f..cd11120 100644 --- a/fighter/config/unifi_controller/docker-compose.yml +++ b/fighter/config/unifi_controller/docker-compose.yml @@ -3,14 +3,6 @@ services: unifi-controller: image: lscr.io/linuxserver/unifi-controller container_name: unifi_controller - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" restart: "no" networks: - web diff --git a/fighter/config/wireguard/docker-compose.yml b/fighter/config/wireguard/docker-compose.yml index 894391d..6c8dab8 100644 --- a/fighter/config/wireguard/docker-compose.yml +++ b/fighter/config/wireguard/docker-compose.yml @@ -4,14 +4,6 @@ services: image: weejewel/wg-easy container_name: wireguard_wg-easy restart: "no" - logging: - driver: loki - options: - loki-url: http://localhost:3100/loki/api/v1/push - loki-batch-size: "50" - loki-retries: "1" - loki-timeout: "2s" - keep-file: "true" env_file: - wireguard.env - wireguard_secrets.env