diff --git a/docker/arm/docker-compose.yml b/docker/arm/docker-compose.yml index 94b2f4e..1d6e96c 100644 --- a/docker/arm/docker-compose.yml +++ b/docker/arm/docker-compose.yml @@ -133,7 +133,7 @@ services: networks: - gitea_main n8n: - image: ghcr.io/n8n-io/n8n:1.63.2 + image: ghcr.io/n8n-io/n8n:1.63.4 container_name: n8n ports: - 5678:5678 diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index e83798f..d2120e4 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -10,6 +10,9 @@ services: volumes: - /docker/appdata/prometheus:/etc/prometheus - prom_data:/prometheus + networks: + - grafana + grafana: image: grafana/grafana:11.2.2 container_name: grafana @@ -19,14 +22,42 @@ services: environment: - GF_SECURITY_ADMIN_USER=mafyuh - GF_SECURITY_ADMIN_PASSWORD=$GF_SECURITY_ADMIN_PASSWORD + user: "1000" volumes: - - /docker/appdata/grafana:/etc/grafana/provisioning/datasources + - /docker/appdata/grafana:/var/lib/grafana + networks: + - grafana + + loki: + image: grafana/loki:3.2.0 + container_name: loki + volumes: + - /docker/appdata/loki:/etc/loki + ports: + - "3100:3100" + restart: unless-stopped + command: -config.file=/etc/loki/loki-config.yml + networks: + - grafana + + promtail: + image: grafana/promtail:3.2.0 + container_name: promtail + volumes: + - /var/log:/var/log + - /docker/appdata/promtail:/etc/promtail + restart: unless-stopped + command: -config.file=/etc/promtail/promtail-config.yml + networks: + - grafana snmp-exporter: image: prom/snmp-exporter:v0.26.0 volumes: - /docker/appdata/snmp:/etc/snmp_exporter command: --config.file=/etc/snmp-exporter/snmp.yml + networks: + - grafana node_exporter: image: quay.io/prometheus/node-exporter:v1.8.2 @@ -36,6 +67,8 @@ services: restart: unless-stopped volumes: - /:/host:ro,rslave + networks: + - grafana cadvisor: image: gcr.io/cadvisor/cadvisor:v0.50.0 @@ -50,6 +83,8 @@ services: - /dev/kmsg privileged: true restart: unless-stopped + networks: + - grafana sonarr-exporter: image: ghcr.io/onedr0p/exportarr:v2.0 @@ -108,5 +143,8 @@ services: - "9712:9712" restart: unless-stopped +networks: + grafana: + volumes: prom_data: \ No newline at end of file diff --git a/docker/jellyfin/docker-compose.yml b/docker/jellyfin/docker-compose.yml index d95fe01..285cb79 100644 --- a/docker/jellyfin/docker-compose.yml +++ b/docker/jellyfin/docker-compose.yml @@ -1,7 +1,7 @@ --- services: jellyfin: - image: ghcr.io/linuxserver/jellyfin@sha256:a074e43e90e97cb6a59ca0345bc6908fa3262b459618ae608b9da7e8ac4ae1f2 + image: ghcr.io/linuxserver/jellyfin@sha256:62dfddc0c9073a262cc29a14e71cf8b7460799f3f31eb5389ae2478d1313beba container_name: jellyfin devices: - /dev/dri/renderD129:/dev/dri/renderD129 diff --git a/terraform/kasm.tf b/terraform/kasm.tf index f48bc29..1e1c555 100644 --- a/terraform/kasm.tf +++ b/terraform/kasm.tf @@ -36,7 +36,7 @@ resource "proxmox_virtual_environment_vm" "Kasm" { # VM Disk Settings disk { datastore_id = "local-lvm" - size = 151 + size = 149 interface = "scsi0" }