From 4c26f9bfb1581c84395145120f3e33c2164aed53 Mon Sep 17 00:00:00 2001
From: cnphpbb <moqiruyi@gmail.com>
Date: Wed, 10 Dec 2025 17:09:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(db):=20=E6=B7=BB=E5=8A=A0Loki=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=9B=B4=E6=96=B0n9e?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加Loki服务的环境配置和stack文件，同时为n9e服务新增20090端口映射
注释掉categraf服务配置以便后续调整
---
 dbSer/loki/env.cfg                    |  2 ++
 dbSer/loki/stack.yml                  |  7 ++++
 n9e/compose-pgsql/docker-compose.yaml | 49 ++++++++++++++-------------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/dbSer/loki/env.cfg b/dbSer/loki/env.cfg
index e69de29..11ccb5b 100644
--- a/dbSer/loki/env.cfg
+++ b/dbSer/loki/env.cfg
@@ -0,0 +1,2 @@
+IMAGE_TAG=3.6.2
+IMAGE_NAME=grafana/loki
diff --git a/dbSer/loki/stack.yml b/dbSer/loki/stack.yml
index e69de29..5e8ef95 100644
--- a/dbSer/loki/stack.yml
+++ b/dbSer/loki/stack.yml
@@ -0,0 +1,7 @@
+
+services:
+  loki:
+    image: ${IMAGE_NAME}:${IMAGE_TAG}
+    ports:
+      - "3100:3100"
+    command: -config.file=/etc/loki/local-config.yaml
\ No newline at end of file
diff --git a/n9e/compose-pgsql/docker-compose.yaml b/n9e/compose-pgsql/docker-compose.yaml
index bd228cd..9bd95d1 100644
--- a/n9e/compose-pgsql/docker-compose.yaml
+++ b/n9e/compose-pgsql/docker-compose.yaml
@@ -63,6 +63,7 @@ services:
       - ./n9eetc_pg:/app/etc
     ports:
       - "17000:17000"
+      - "20090:20090"
     networks:
       - nightingale
     depends_on:
@@ -76,27 +77,27 @@ services:
     command: >
       sh -c "/app/n9e"
 
-  categraf:
-    image: "flashcatcloud/categraf:latest"
-    container_name: "categraf"
-    hostname: "categraf01"
-    restart: always
-    environment:
-      TZ: Asia/Shanghai
-      HOST_PROC: /hostfs/proc
-      HOST_SYS: /hostfs/sys
-      HOST_MOUNT_PREFIX: /hostfs
-      WAIT_HOSTS: nightingale:17000, nightingale:20090
-    volumes:
-      - ./categraf/conf:/etc/categraf/conf
-      - /:/hostfs
-      - /var/run/docker.sock:/var/run/docker.sock
-      - ./prometc_vm:/etc/prometheus
-    # ports:
-    #   - "9100:9100/tcp"
-    networks:
-      - nightingale
-    depends_on:
-      - nightingale
-    links:
-      - nightingale:nightingale
\ No newline at end of file
+  # categraf:
+  #   image: "flashcatcloud/categraf:latest"
+  #   container_name: "categraf"
+  #   hostname: "categraf01"
+  #   restart: always
+  #   environment:
+  #     TZ: Asia/Shanghai
+  #     HOST_PROC: /hostfs/proc
+  #     HOST_SYS: /hostfs/sys
+  #     HOST_MOUNT_PREFIX: /hostfs
+  #     WAIT_HOSTS: nightingale:17000, nightingale:20090
+  #   volumes:
+  #     - ./categraf/conf:/etc/categraf/conf
+  #     - /:/hostfs
+  #     - /var/run/docker.sock:/var/run/docker.sock
+  #     - ./prometc_vm:/etc/prometheus
+  #   # ports:
+  #   #   - "9100:9100/tcp"
+  #   networks:
+  #     - nightingale
+  #   depends_on:
+  #     - nightingale
+  #   links:
+  #     - nightingale:nightingale
\ No newline at end of file