From aa758af5ce65b424d737487438b29877e4fee923 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Mon, 14 Oct 2024 16:15:52 +0000 Subject: [PATCH 01/11] test recreate kasm --- terraform/kasm.tf | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/terraform/kasm.tf b/terraform/kasm.tf index f48bc29..38a9290 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" } @@ -59,4 +59,18 @@ resource "proxmox_virtual_environment_vm" "Kasm" { initialization[0].user_data_file_id ] } + + provisioner "remote-exec" { + inline = [ + "cd /home/mafyuh/iac/docker/kasm", + "git pull", + "docker compose up -d" + ] + connection { + type = "ssh" + user = "mafyuh" + private_key = file("/home/mafyuh/.ssh/id_rsa") + host = var.kasm_ssh_ip + } +} } \ No newline at end of file From 63c9149efb46d64b48d306cf607432a1b0db1bf9 Mon Sep 17 00:00:00 2001 From: mafyuh Date: Mon, 14 Oct 2024 16:16:56 +0000 Subject: [PATCH 02/11] fix kasm --- terraform/kasm.tf | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/terraform/kasm.tf b/terraform/kasm.tf index 38a9290..1e1c555 100644 --- a/terraform/kasm.tf +++ b/terraform/kasm.tf @@ -59,18 +59,4 @@ resource "proxmox_virtual_environment_vm" "Kasm" { initialization[0].user_data_file_id ] } - - provisioner "remote-exec" { - inline = [ - "cd /home/mafyuh/iac/docker/kasm", - "git pull", - "docker compose up -d" - ] - connection { - type = "ssh" - user = "mafyuh" - private_key = file("/home/mafyuh/.ssh/id_rsa") - host = var.kasm_ssh_ip - } -} } \ No newline at end of file From fd97ab2010936d70deec60c7663a4e7c72d10019 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 14 Oct 2024 22:11:29 -0400 Subject: [PATCH 03/11] add loki + promtail --- docker/grafana/docker-compose.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index e83798f..92d4ca2 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -22,6 +22,25 @@ services: volumes: - /docker/appdata/grafana:/etc/grafana/provisioning/datasources + loki: + image: grafana/loki:2.4.0 + container_name: loki + volumes: + - /docker/appdata/loki:/etc/loki + ports: + - "3100:3100" + restart: unless-stopped + command: -config.file=/etc/loki/loki-config.yml + + promtail: + image: grafana/promtail:2.4.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 + snmp-exporter: image: prom/snmp-exporter:v0.26.0 volumes: From 4c53a29ee55887bd596a7c7ab8ac9c4c0f0dd6fe Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 14 Oct 2024 22:21:35 -0400 Subject: [PATCH 04/11] add network to stack --- docker/grafana/docker-compose.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index 92d4ca2..1a3e34a 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 @@ -21,6 +24,8 @@ services: - GF_SECURITY_ADMIN_PASSWORD=$GF_SECURITY_ADMIN_PASSWORD volumes: - /docker/appdata/grafana:/etc/grafana/provisioning/datasources + networks: + - grafana loki: image: grafana/loki:2.4.0 @@ -31,6 +36,8 @@ services: - "3100:3100" restart: unless-stopped command: -config.file=/etc/loki/loki-config.yml + networks: + - grafana promtail: image: grafana/promtail:2.4.0 @@ -40,12 +47,16 @@ services: - /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 @@ -55,6 +66,8 @@ services: restart: unless-stopped volumes: - /:/host:ro,rslave + networks: + - grafana cadvisor: image: gcr.io/cadvisor/cadvisor:v0.50.0 @@ -69,6 +82,8 @@ services: - /dev/kmsg privileged: true restart: unless-stopped + networks: + - grafana sonarr-exporter: image: ghcr.io/onedr0p/exportarr:v2.0 @@ -127,5 +142,8 @@ services: - "9712:9712" restart: unless-stopped +networks: + grafana: + volumes: prom_data: \ No newline at end of file From c4ba3a78f0d7ad2ee7a36cbeb2c4219429d9bee6 Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 14 Oct 2024 22:24:05 -0400 Subject: [PATCH 05/11] fix grafana --- docker/grafana/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index 1a3e34a..1eec1fc 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -23,7 +23,7 @@ services: - GF_SECURITY_ADMIN_USER=mafyuh - GF_SECURITY_ADMIN_PASSWORD=$GF_SECURITY_ADMIN_PASSWORD volumes: - - /docker/appdata/grafana:/etc/grafana/provisioning/datasources + - /docker/appdata/grafana:/var/lib/grafana networks: - grafana From a4fe2da5581a74ac8042c971226ffbf583de009e Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 14 Oct 2024 22:26:22 -0400 Subject: [PATCH 06/11] add user to grafana --- docker/grafana/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index 1eec1fc..700efca 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -22,6 +22,7 @@ services: environment: - GF_SECURITY_ADMIN_USER=mafyuh - GF_SECURITY_ADMIN_PASSWORD=$GF_SECURITY_ADMIN_PASSWORD + user: "1000" volumes: - /docker/appdata/grafana:/var/lib/grafana networks: From e7fc84e9e6b64606aecdbb8f66af1b08a2af38de Mon Sep 17 00:00:00 2001 From: Matt Reeves Date: Mon, 14 Oct 2024 22:44:37 -0400 Subject: [PATCH 07/11] update loki + promtail --- docker/grafana/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index 700efca..f28ad67 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -29,7 +29,7 @@ services: - grafana loki: - image: grafana/loki:2.4.0 + image: grafana/loki:3.0.0 container_name: loki volumes: - /docker/appdata/loki:/etc/loki @@ -41,7 +41,7 @@ services: - grafana promtail: - image: grafana/promtail:2.4.0 + image: grafana/promtail:3.0.0 container_name: promtail volumes: - /var/log:/var/log From fe868d100f177a575d90d426003451ba05974fea Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 15 Oct 2024 04:27:17 +0000 Subject: [PATCH 08/11] :arrow_up: Update grafana/promtail Docker tag to v3.2.0 --- docker/grafana/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index f28ad67..d55f977 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -41,7 +41,7 @@ services: - grafana promtail: - image: grafana/promtail:3.0.0 + image: grafana/promtail:3.2.0 container_name: promtail volumes: - /var/log:/var/log From 37debe6c2caa457111cea187ec41ec114c681ae0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 15 Oct 2024 04:27:12 +0000 Subject: [PATCH 09/11] :arrow_up: Update grafana/loki Docker tag to v3.2.0 --- docker/grafana/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/grafana/docker-compose.yml b/docker/grafana/docker-compose.yml index d55f977..d2120e4 100644 --- a/docker/grafana/docker-compose.yml +++ b/docker/grafana/docker-compose.yml @@ -29,7 +29,7 @@ services: - grafana loki: - image: grafana/loki:3.0.0 + image: grafana/loki:3.2.0 container_name: loki volumes: - /docker/appdata/loki:/etc/loki From 73223faafa1966955f3c5edb4c4cea73346e5b15 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 15 Oct 2024 15:01:23 +0000 Subject: [PATCH 10/11] :arrow_up: Update ghcr.io/linuxserver/jellyfin Docker digest to 62dfddc --- docker/jellyfin/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 332416c29a89e9ea329b7ae057e8be2ee50f3cce Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 15 Oct 2024 16:01:23 +0000 Subject: [PATCH 11/11] :arrow_up: Update ghcr.io/n8n-io/n8n Docker tag to v1.63.4 --- docker/arm/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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