瀏覽代碼

configuration changes: duplicati prometheus temp mon

lc 1 月之前
父節點
當前提交
d64397cd0e

+ 1 - 1
duplicati/.env

@@ -1,6 +1,6 @@
 CONTAINER_NAME=duplicati
 ENCRYPTION_KEY=123456ba
 #DUPLICATI_CONFIG=./config
-DUPLICATI_BACKUPS=/media/yazoo/luks-5955839a-aa5e-40ef-bb39-2721cf531b48/backups
+DUPLICATI_BACKUPS=/media/yaye/luks-5955839a-aa5e-40ef-bb39-2721cf531b48/backups
 DUPLICATI_SOURCE=/
 # password = AuFFg5bMB

+ 1 - 2
jellyfin-b/.env

@@ -1,6 +1,5 @@
 CONTAINER_NAME=jellyfin-b
-MEDIA_PATH=/media/yazoo/luks-67672a15-a412-4a17-bb01-c76509e21243/crm
-AUDIO_PATH=/media/yazoo/luks-01cf1174-2f42-45d2-b206-c146c4f42f49/Music/Library
+MEDIA_PATH=/media/yaye/qnap_vol1/crm
 #CONFIG_PATH=./config
 #CACHE_PATH=./cache
 #TRANSCODE_PATH=/path/to/your/transcode

+ 0 - 1
jellyfin-b/docker-compose.yml

@@ -20,7 +20,6 @@ services:
       - jellyfin_b_config:/config
       - jellyfin_b_cache:/cache
       - ${MEDIA_PATH}:/media
-      - ${AUDIO_PATH}:/audio
     ports:
       - "${JELLYFIN_PORT}:8096"
     restart: "no"

+ 5 - 8
nextcloud/backup_volumes.sh

@@ -39,7 +39,7 @@
 #
 #           BACKUP_DIR - verify the location is accessible. The mount point is named by the login user so it may look different 
 #           VOLUMES    - are all the volumes to backup include in the list? 
-#                        <volume>_nc8_files: stores the core admin account and binaries, config of next cloud
+#                        <volume>_nc9_files: stores the core admin account and binaries, config of next cloud
 #                        <volume>_oo_data: document server
 #                        <volume>_es_index: elastic search index files 
 #                        <volume>_db: mariadb - nextcloud db 
@@ -47,19 +47,16 @@
 #
 #
 # Variables
-# 2025-12-7
+# 2026-2-14
 #
 # comment out the below line - original location  
-BACKUP_DIR="/media/yazoo/qnap_vol3/backups/nextcloud/"  # Change this to your desired backup directory
+BACKUP_DIR="/media/yaye/qnap_vol3/backups/nextcloud/"  # Change this to your desired backup directory
 #BACKUP_DIR="/media/yazoo/Crucial-1T/restore_test_duplicati/backup_nc7"  # backup nextcloud core files here for transfer to ryzen/rx7900 afterwards 
-#
-#
-#BACKUP_DIR="/media/yazoo/nextcloud_files/backup/nc2/docker_volumes"  # Change this to your desired backup directory
 TIMESTAMP=$(date +"%Y%m%d_%H%M%S")
 
 # List of volumes to backup
-VOLUMES=("nc8_files" "nc8_oo_data" "nc8_es_index" "nc8_db" "nc8_clamav")  # Replace with your volume names
-#VOLUMES=("nc8_redis" "nc8_oo_data" "nc8_es_index"  "nc8_clamav")  # Replace with your volume names
+VOLUMES=("nc9_files" "nc9_oo_data" "nc9_es_index" "nc9_db" "nc9_clamav")  # Replace with your volume names
+#VOLUMES=("nc9_redis" "nc9_oo_data" "nc9_es_index"  "nc9_clamav")  # Replace with your volume names
 
 # Ensure backup directory exists
 mkdir -p "$BACKUP_DIR"

+ 9 - 2
nextcloud_duplicati/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 volumes:
   nextcloud_duplicati_config:
-    name: ${NEXTCLOUD_CONTAINER_NAME}_duplicati_config
+    name: nextcloud_duplicati_config
     driver: local
 
   
@@ -38,7 +38,7 @@ volumes:
 
 services:
   duplicati:
-    image: lscr.io/linuxserver/duplicati:latest
+    image: lscr.io/linuxserver/duplicati:2.2.0
     container_name: ${CONTAINER_NAME} 
     environment:
 #      - PUID=1000
@@ -65,3 +65,10 @@ services:
     ports:
       - 8330:8200
     restart: no 
+    # Set memory limits (e.g., 2GB limit)
+#    deploy:
+#      resources:
+#        limits:
+#          memory: 4G
+#        reservations:
+#          memory: 1G # Optional: guaranteed minimum memory

+ 8 - 8
nextcloud_duplicati/shutdown_nextcloud.sh

@@ -4,14 +4,14 @@
 
 # Array of container IDs or names (modify this array as needed)
 CONTAINERS=(
-    "nc8"
-    "nc8_govod"
-    "nc8_cron"
-    "nc8_db"
-    "nc8_es"
-    "nc8_clamav"
-    "nc8_onlyoffice"
-    "nc8_redis"
+    "nc9"
+    "nc9_govod"
+    "nc9_cron"
+    "nc9_db"
+    "nc9_es"
+    "nc9_clamav"
+    "nc9_onlyoffice"
+    "nc9_redis"
 )
 
 # Function to check if a command was successful

+ 6 - 0
prometheus/docker-compose.yml

@@ -51,6 +51,12 @@ services:
     volumes:
     - ./download_exporter/config.yml:/config/config.yml
 
+  sensors-exporter:
+    image: anthonymolinari/sensors-exporter:latest
+    container_name: sensors-exporter
+    ports:
+      - 9282:8282
+
 
   grafana:
     #image: grafana/grafana:7.3.5

+ 8 - 0
prometheus/prometheus.yml

@@ -36,3 +36,11 @@ scrape_configs:
   static_configs:
   - targets:
     - wg.algometic.com
+
+# NEW: Hardware sensors
+- job_name: sensors-exporter
+  scrape_interval: 30s
+  static_configs:
+  - targets:
+    - sensors-exporter:8282
+

+ 5 - 2
scripts/dockers_init.sh

@@ -2,14 +2,17 @@
 echo "Mount encrypted filesystems before running this script."
 echo "Unlock scripts is located at nextcloud directory."
 
-CONTAINER_ROOT="/home/yazoo/dockers/Dockers_real"
+#
+# change this line to match the required path
+#
+CONTAINER_ROOT="/home/yaye/dockers/Dockers_real"
 #
 #
 #### 2026-01-12
 ###CONTAINERS_UP=(duplicati nextcloud nextcloud_duplicati calibre calibre-cronx gogs sslwp ftp ampache prometheus mediawiki jellyfin docker-registry wol-app transmission transmission-sbt transmission-gm jellyfin-b wg-easy ip-notifier samba2)
 CONTAINERS_UP=(duplicati nextcloud nextcloud_duplicati calibre calibre-cronx gogs sslwp ftp prometheus mediawiki jellyfin docker-registry wol-app transmission transmission-sbt transmission-gm jellyfin-b wg-easy ip-notifier samba2)
 
-CONTAINERS_DOWN=(duplicati nextcloud_duplicati transmission transmission-sbt calibre calibre-web transmission-gm jellyfin nc9_govod nc9_cron nc9 nc9_onlyoffice nc9_redis nc9_es nc9_clamav nc9_db wol-app ftpd calibre-cronx monitoring_grafana prometheus cadvisor redis node-exporter gogs mwiki mwiki_mysql mwiki_parsoid mwiki_es  downloader-exporter-bt wg_easy docker-registry docker-registry-ui jellyfin-b samba) 
+CONTAINERS_DOWN=(duplicati nextcloud_duplicati transmission transmission-sbt calibre calibre-web transmission-gm jellyfin nc9_govod nc9_cron nc9 nc9_onlyoffice nc9_redis nc9_es nc9_clamav nc9_db nc9_duplicati wol-app ftpd calibre-cronx monitoring_grafana prometheus cadvisor redis node-exporter gogs mwiki mwiki_mysql mwiki_parsoid mwiki_es  downloader-exporter-bt wg_easy docker-registry docker-registry-ui jellyfin-b samba) 
 
 
 if [[ $1 == "up" ]]

+ 1 - 0
sslwp/docker-compose.yml

@@ -99,6 +99,7 @@ services:
                 1984.algometic.com->http://192.168.1.119:1234 #production,
                 1985.algometic.com->http://192.168.1.119:9980 #production,
                 chat.algometic.com->http://192.168.1.118:3000 #production,
+                bellabee.ai->http://192.168.1.119:4321 #production,
                 '