diff --git a/system/modules/server/files/docker/projects/backup.docker-compose.yaml b/system/modules/server/files/docker/projects/backup.docker-compose.yaml index e83e807d..aa9a298e 100644 --- a/system/modules/server/files/docker/projects/backup.docker-compose.yaml +++ b/system/modules/server/files/docker/projects/backup.docker-compose.yaml @@ -36,6 +36,7 @@ services: - kavita-data:/volumes/kavita-data:ro - filebrowser-data:/volumes/filebrowser-data:ro - qbittorrent-data:/volumes/qbittorrent-data:ro + - qbittorrent-unsafe-data:/volumes/qbittorrent-unsafe-data:ro - syncthing-data:/volumes/syncthing-data:ro - jellyfin-config:/volumes/jellyfin-data:ro - photoprism-database:/volumes/photoprism-database:ro @@ -44,6 +45,7 @@ services: - mail-data:/volumes/mail-data:ro - roundcube-db:/volumes/roundcube-db:ro - immich-db-data:/volumes/immich-db-data:ro + - switcheroo-db:/volumes/switcheroo-db:ro secrets: - SSH_KEY diff --git a/system/modules/server/files/root/var/lib/docker-services/volumes/vector/vector.toml b/system/modules/server/files/root/var/lib/docker-services/volumes/vector/vector.toml deleted file mode 100644 index 0aeb8efd..00000000 --- a/system/modules/server/files/root/var/lib/docker-services/volumes/vector/vector.toml +++ /dev/null @@ -1,29 +0,0 @@ -timezone = "Europe/Riga" - -[sources.sftp-logs] -type = "docker_logs" -include_images = ["atmoz/sftp"] - -[transforms.sftp-parsed] -type = "remap" -inputs = ["sftp-logs"] -source = '.message, err = format_timestamp(.timestamp, "%b %d %H:%M:%S", "Europe/Riga") + " files sshd: " + .message' - -[sinks.sftp-file] -type = "file" -inputs = ["sftp-parsed"] -path = "/out/sftp.log" -encoding.codec = "text" - -[sources.docker-logs] -type = "docker_logs" -exclude_containers = ["loki", "grafana"] - -[sinks.loki] -type = "loki" -inputs = ["docker-logs"] -endpoint = "http://loki:3100" -labels.datasource = "docker" -labels.container_name = "{{ .container_name }}" -out_of_order_action = "rewrite_timestamp" -encoding.codec = "json" diff --git a/system/modules/server/files/root/var/lib/docker-services/volumes/vector/vector.yaml b/system/modules/server/files/root/var/lib/docker-services/volumes/vector/vector.yaml new file mode 100644 index 00000000..5dc5e902 --- /dev/null +++ b/system/modules/server/files/root/var/lib/docker-services/volumes/vector/vector.yaml @@ -0,0 +1,33 @@ +timezone: Europe/Riga + +sources: + sftp-logs: + type: docker_logs + include_images: ["atmoz/sftp"] + docker-logs: + type: docker_logs + exclude_containers: ["loki", "grafana"] + +transforms: + sftp-parsed: + type: remap + inputs: ["sftp-logs"] + source: '.message, err = format_timestamp(.timestamp, "%b %d %H:%M:%S", "Europe/Riga") + " files sshd: " + .message' + +sinks: + sftp-file: + type: file + inputs: ["sftp-parsed"] + path: /out/sftp.log + encoding: + codec: text + loki: + type: loki + inputs: ["docker-logs"] + endpoint: http://loki:3100/ + labels: + datasource: docker + container_name: "{{ .container_name }}" + out_of_order_action: rewrite_timestamp + encoding: + codec: json