From 265e77bbf861a2748d7470f7eedde2b0d8e89945 Mon Sep 17 00:00:00 2001 From: Debojyoti Mandal Date: Wed, 8 Apr 2026 19:21:56 +0530 Subject: [PATCH 1/3] feat: add Glances system monitoring template --- blueprints/glances/docker-compose.yml | 18 ++++++++++++++++++ blueprints/glances/glances.svg | 8 ++++++++ blueprints/glances/template.toml | 11 +++++++++++ meta.json | 15 +++++++++++++++ 4 files changed, 52 insertions(+) create mode 100644 blueprints/glances/docker-compose.yml create mode 100644 blueprints/glances/glances.svg create mode 100644 blueprints/glances/template.toml diff --git a/blueprints/glances/docker-compose.yml b/blueprints/glances/docker-compose.yml new file mode 100644 index 00000000..84d88cdd --- /dev/null +++ b/blueprints/glances/docker-compose.yml @@ -0,0 +1,18 @@ +version: "3.8" + +services: + glances: + image: nicolargo/glances:4.3.0.8-full + restart: unless-stopped + # pid:host is required so Glances can see host-level processes + pid: host + volumes: + - /var/run/docker.sock:/var/run/docker.sock:ro + - glances-data:/glances/exports + environment: + GLANCES_OPT: "-w --password" + GLANCES_USERNAME: "${GLANCES_USERNAME:-admin}" + GLANCES_PASSWORD: "${GLANCES_PASSWORD}" + +volumes: + glances-data: diff --git a/blueprints/glances/glances.svg b/blueprints/glances/glances.svg new file mode 100644 index 00000000..1d848045 --- /dev/null +++ b/blueprints/glances/glances.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/blueprints/glances/template.toml b/blueprints/glances/template.toml new file mode 100644 index 00000000..65862bfb --- /dev/null +++ b/blueprints/glances/template.toml @@ -0,0 +1,11 @@ +[variables] +main_domain = "${domain}" + +[config] +env = { GLANCES_PASSWORD = "" } +mounts = [] + +[[config.domains]] +serviceName = "glances" +port = 61208 +host = "${main_domain}" diff --git a/meta.json b/meta.json index 3ae0cb5e..110460a9 100644 --- a/meta.json +++ b/meta.json @@ -2760,6 +2760,21 @@ "rss" ] }, + { + "id": "glances", + "name": "Glances", + "version": "4.3.0.8", + "description": "Glances is a cross-platform system monitoring tool written in Python.", + "logo": "glances.svg", + "links": { + "github": "https://github.com/nicolargo/glances", + "website": "https://nicolargo.github.io/glances/", + "docs": "https://glances.readthedocs.io/" + }, + "tags": [ + "monitoring" + ] + }, { "id": "glitchtip", "name": "Glitchtip", From b81de7fda7194cfde3aac6e7fc3a729682ef0960 Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Wed, 8 Jul 2026 01:13:53 -0600 Subject: [PATCH 2/3] fix: resolve conflict markers accidentally committed during meta migration Co-Authored-By: Claude Fable 5 --- blueprints/imgproxy/docker-compose.yml | 3 --- blueprints/mediafetch/docker-compose.yml | 9 --------- blueprints/mediafetch/template.toml | 12 ------------ blueprints/nextcloud-aio/docker-compose.yml | 5 +---- 4 files changed, 1 insertion(+), 28 deletions(-) diff --git a/blueprints/imgproxy/docker-compose.yml b/blueprints/imgproxy/docker-compose.yml index fc48f52d..b71ccf49 100644 --- a/blueprints/imgproxy/docker-compose.yml +++ b/blueprints/imgproxy/docker-compose.yml @@ -3,11 +3,8 @@ services: imgproxy: image: darthsim/imgproxy:v3.30.1 restart: unless-stopped -<<<<<<< HEAD -======= expose: - 8080 ->>>>>>> origin/canary environment: IMGPROXY_KEY: ${IMGPROXY_KEY} IMGPROXY_SALT: ${IMGPROXY_SALT} diff --git a/blueprints/mediafetch/docker-compose.yml b/blueprints/mediafetch/docker-compose.yml index f273f3b8..17ba6176 100644 --- a/blueprints/mediafetch/docker-compose.yml +++ b/blueprints/mediafetch/docker-compose.yml @@ -1,11 +1,7 @@ version: "3.8" services: mediafetch: -<<<<<<< HEAD - image: lukedunsmoto/mediafetch:latest -======= image: lukedunsmoto/mediafetch:1.3.5 ->>>>>>> origin/canary restart: unless-stopped expose: - "3002" @@ -15,16 +11,11 @@ services: - PORT=3002 - BASIC_AUTH_USER=${BASIC_AUTH_USER} - BASIC_AUTH_PASS=${BASIC_AUTH_PASS} -<<<<<<< HEAD - - PUBLIC_BASE_URL=https://${DOMAIN} - - OUTPUT_DIR=/data/downloads -======= - PUBLIC_BASE_URL=${PUBLIC_BASE_URL} - OUTPUT_DIR=${OUTPUT_DIR} - MAX_CONCURRENT_JOBS=${MAX_CONCURRENT_JOBS} - JOB_TIMEOUT_MS=${JOB_TIMEOUT_MS} - VERSION_CHECK_TTL_MS=${VERSION_CHECK_TTL_MS} ->>>>>>> origin/canary volumes: mediafetch_data: \ No newline at end of file diff --git a/blueprints/mediafetch/template.toml b/blueprints/mediafetch/template.toml index 86eaaa3c..791bd07f 100644 --- a/blueprints/mediafetch/template.toml +++ b/blueprints/mediafetch/template.toml @@ -1,15 +1,4 @@ [variables] -<<<<<<< HEAD -BASIC_AUTH_USER = "admin" -BASIC_AUTH_PASS = "${password:12}" - -[config] -[[config.domains]] -name = "Domain" -variable = "DOMAIN" -serviceName = "mediafetch" -port = 3002 -======= main_domain = "${domain}" PORT="3002" PUBLIC_BASE_URL="https://${main_domain}" @@ -27,7 +16,6 @@ name = "Domain" serviceName = "mediafetch" port = "3002" host = "${main_domain}" ->>>>>>> origin/canary [[config.mounts]] name = "Downloads" diff --git a/blueprints/nextcloud-aio/docker-compose.yml b/blueprints/nextcloud-aio/docker-compose.yml index 111faabf..7550c252 100644 --- a/blueprints/nextcloud-aio/docker-compose.yml +++ b/blueprints/nextcloud-aio/docker-compose.yml @@ -13,8 +13,6 @@ services: depends_on: - nextcloud_db - nextcloud_redis -<<<<<<< HEAD -======= nextcloud_cron: image: nextcloud:stable @@ -30,7 +28,6 @@ services: depends_on: - nextcloud_db - nextcloud_redis ->>>>>>> origin/canary nextcloud_db: image: mariadb:10.11 @@ -49,4 +46,4 @@ services: volumes: nextcloud_data: - nextcloud_db_data: \ No newline at end of file + nextcloud_db_data: From c5033dc6109e72d4a87f15b9165f5fbe5c58ed78 Mon Sep 17 00:00:00 2001 From: Mauricio Siu Date: Wed, 8 Jul 2026 02:20:36 -0600 Subject: [PATCH 3/3] fix: remove interactive --password flag so Glances web server can start The --password flag makes Glances prompt for a password interactively via getpass, which fails in a non-TTY container. The container kept crash-looping, so Traefik returned 404 for the domain. Glances also does not read GLANCES_USERNAME/GLANCES_PASSWORD env vars, so the auth setup was ineffective. Run the web server with GLANCES_OPT=-w and drop the unused password env vars from the compose file and template.toml. Co-Authored-By: Claude Fable 5 --- blueprints/glances/docker-compose.yml | 4 +--- blueprints/glances/template.toml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/blueprints/glances/docker-compose.yml b/blueprints/glances/docker-compose.yml index 84d88cdd..9d6e2a73 100644 --- a/blueprints/glances/docker-compose.yml +++ b/blueprints/glances/docker-compose.yml @@ -10,9 +10,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - glances-data:/glances/exports environment: - GLANCES_OPT: "-w --password" - GLANCES_USERNAME: "${GLANCES_USERNAME:-admin}" - GLANCES_PASSWORD: "${GLANCES_PASSWORD}" + GLANCES_OPT: "-w" volumes: glances-data: diff --git a/blueprints/glances/template.toml b/blueprints/glances/template.toml index 65862bfb..5635aaed 100644 --- a/blueprints/glances/template.toml +++ b/blueprints/glances/template.toml @@ -2,7 +2,7 @@ main_domain = "${domain}" [config] -env = { GLANCES_PASSWORD = "" } +env = {} mounts = [] [[config.domains]]