Merge pull request #92 from JaD1ng/feat/issue78

feat(service_manager):将发布系统接入服务管理模块

Author: Erickw87

docs/deploy/schema.sql

@@ -0,0 +1,55 @@
+-- Deploy模块数据库架构
+-- 部署相关的主机、实例和版本历史表
+
+-- 创建hosts表：主机信息
+CREATE TABLE hosts (
+    id SERIAL PRIMARY KEY,
+    name VARCHAR(255) UNIQUE,
+    ip_address VARCHAR(45) UNIQUE,
+    is_stopped BOOLEAN
+);
+
+-- 创建instances表：服务实例信息
+CREATE TABLE instances (
+    id VARCHAR(255) NOT NULL PRIMARY KEY,  -- VARCHAR类型主键，非自增，不为空
+    service_name VARCHAR(255),
+    service_version VARCHAR(255),
+    host_id VARCHAR(255),
+    host_ip_address VARCHAR(45),
+    ip_address VARCHAR(45),
+    port INT,
+    status VARCHAR(50),
+    is_stopped BOOLEAN,
+    -- 保留ip_address和port的组合唯一约束
+    CONSTRAINT unique_ip_port UNIQUE (ip_address, port)
+);
+
+-- 1. 创建service_name和service_version的联合索引
+CREATE INDEX idx_instances_service_name_version
+ON instances (service_name, service_version);
+
+-- 2. 创建service_name和ip_address的联合索引
+CREATE INDEX idx_instances_service_name_ip
+ON instances (service_name, ip_address);
+
+-- 3. 创建version_histories表：版本历史记录
+CREATE TABLE version_histories (
+    id SERIAL PRIMARY KEY,
+    instance_id VARCHAR(255),
+    service_name VARCHAR(255),
+    service_version VARCHAR(255),
+    status VARCHAR(50)
+);
+
+-- 初始化主机数据
+-- 插入 jfcs1021 主机数据
+INSERT INTO hosts (name, ip_address, is_stopped)
+VALUES ('jfcs1021', '10.210.10.33', false);
+
+-- 插入 jfcs1022 主机数据
+INSERT INTO hosts (name, ip_address, is_stopped)
+VALUES ('jfcs1022', '10.210.10.30', false);
+
+-- 插入 jfcs1023 主机数据
+INSERT INTO hosts (name, ip_address, is_stopped)
+VALUES ('jfcs1023', '10.210.10.31', false);

docs/service_manager/model/schema.sql

@@ -44,17 +44,21 @@ CREATE TABLE IF NOT EXISTS service_states (
 
 -- 部署任务表 (deploy_tasks)
 CREATE TABLE IF NOT EXISTS deploy_tasks (
-    id VARCHAR(32) PRIMARY KEY,
+    service VARCHAR(255),
+    version VARCHAR(255),
     start_time TIMESTAMP,
     end_time TIMESTAMP,
     target_ratio DOUBLE PRECISION,
     instances JSONB DEFAULT '[]'::jsonb,
-    deploy_state VARCHAR(50)
+    deploy_state VARCHAR(50),
+    PRIMARY KEY (service, version),
+    FOREIGN KEY (service) REFERENCES services(name) ON DELETE CASCADE
 );
 
 -- 创建索引以提高查询性能
 CREATE INDEX IF NOT EXISTS idx_service_states_service ON service_states(service);
 CREATE INDEX IF NOT EXISTS idx_service_states_report_at ON service_states(service, report_at DESC);
+CREATE INDEX IF NOT EXISTS idx_deploy_tasks_service ON deploy_tasks(service);
 CREATE INDEX IF NOT EXISTS idx_deploy_tasks_state ON deploy_tasks(deploy_state);
 CREATE INDEX IF NOT EXISTS idx_service_instances_service ON service_instances(service);
 

internal/deploy/config.yaml

@@ -0,0 +1,24 @@
+database:
+  host: "localhost"
+  port: 5432
+  user: "admin"
+  password: "password"
+  dbname: "zeroops"
+  sslmode: "disable"
+
+privateKey: |
+  -----BEGIN RSA PRIVATE KEY-----
+  MIICXQIBAAKBgQDZsfv1qscqYdy4vY+P4e3cAtmvppXQcRvrF1cB4drkv0haU24Y
+  7m5qYtT52Kr539RdbKKdLAM6s20lWy7+5C0DgacdwYWd/7PeCELyEipZJL07Vro7
+  Ate8Bfjya+wltGK9+XNUIHiumUKULW4KDx21+1NLAUeJ6PeW+DAkmJWF6QIDAQAB
+  AoGBAJlNxenTQj6OfCl9FMR2jlMJjtMrtQT9InQEE7m3m7bLHeC+MCJOhmNVBjaM
+  ZpthDORdxIZ6oCuOf6Z2+Dl35lntGFh5J7S34UP2BWzF1IyyQfySCNexGNHKT1G1
+  XKQtHmtc2gWWthEg+S6ciIyw2IGrrP2Rke81vYHExPrexf0hAkEA9Izb0MiYsMCB
+  /jemLJB0Lb3Y/B8xjGjQFFBQT7bmwBVjvZWZVpnMnXi9sWGdgUpxsCuAIROXjZ40
+  IRZ2C9EouwJBAOPjPvV8Sgw4vaseOqlJvSq/C/pIFx6RVznDGlc8bRg7SgTPpjHG
+  4G+M3mVgpCX1a/EU1mB+fhiJ2LAZ/pTtY6sCQGaW9NwIWu3DRIVGCSMm0mYh/3X9
+  DAcwLSJoctiODQ1Fq9rreDE5QfpJnaJdJfsIJNtX1F+L3YceeBXtW0Ynz2MCQBI8
+  9KP274Is5FkWkUFNKnuKUK4WKOuEXEO+LpR+vIhs7k6WQ8nGDd4/mujoJBr5mkrw
+  DPwqA3N5TMNDQVGv8gMCQQCaKGJgWYgvo3/milFfImbp+m7/Y3vCptarldXrYQWO
+  AQjxwc71ZGBFDITYvdgJM1MTqc8xQek1FXn1vfpy2c6O
+  -----END RSA PRIVATE KEY-----

internal/deploy/config/config.go

@@ -0,0 +1,44 @@
+package config
+
+import (
+	"fmt"
+	"os"
+
+	"gopkg.in/yaml.v3"
+)
+
+// Config Deploy服务配置
+type Config struct {
+	Database DatabaseConfig `yaml:"database"`
+}
+
+// DatabaseConfig 数据库配置
+type DatabaseConfig struct {
+	Host     string `yaml:"host"`
+	Port     int    `yaml:"port"`
+	User     string `yaml:"user"`
+	Password string `yaml:"password"`
+	DBName   string `yaml:"dbname"`
+	SSLMode  string `yaml:"sslmode"`
+}
+
+// GetDSN 获取PostgreSQL数据库连接字符串
+func (d *DatabaseConfig) GetDSN() string {
+	return fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s",
+		d.Host, d.Port, d.User, d.Password, d.DBName, d.SSLMode)
+}
+
+// LoadConfig 加载配置文件
+func LoadConfig(configPath string) (*Config, error) {
+	data, err := os.ReadFile(configPath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read config file: %w", err)
+	}
+
+	var config Config
+	if err := yaml.Unmarshal(data, &config); err != nil {
+		return nil, fmt.Errorf("failed to parse config file: %w", err)
+	}
+
+	return &config, nil
+}

internal/deploy/packages/storage-v1.0.0.tar.gz

@@ -10,7 +10,7 @@ prometheus:
 # 告警 Webhook 服务配置
 alert_webhook:
   # 监控告警模块地址
-  url: "http://alert-module:8080/v1/integrations/alertmanager/webhook"
+  url: "http://10.210.10.33:8080/v1/integrations/alertmanager/webhook"
   # 轮询间隔
   polling_interval: "10s"
 
@@ -24,4 +24,4 @@ alert_rules:
 # 服务器配置
 server:
   # 服务监听地址
-  bind_addr: "0.0.0.0:9999"
+  bind_addr: "0.0.0.0:9999"

internal/prometheus_adapter/config/prometheus_adapter.yml

@@ -520,9 +520,16 @@ func (s *AlertService) buildExpression(rule *model.AlertRule, meta *model.AlertR
 		}
 	}
 
-	// 添加比较操作符和阈值
+	// 添加比较操作符和阈值（检查是否已经包含）
 	if meta.Threshold != 0 {
-		expr = fmt.Sprintf("%s %s %g", expr, rule.Op, meta.Threshold)
+		// 检查表达式是否已经包含比较操作符
+		hasComparison := strings.Contains(expr, " > ") || strings.Contains(expr, " < ") ||
+			strings.Contains(expr, " = ") || strings.Contains(expr, " != ") ||
+			strings.Contains(expr, " >= ") || strings.Contains(expr, " <= ")
+
+		if !hasComparison {
+			expr = fmt.Sprintf("%s %s %g", expr, rule.Op, meta.Threshold)
+		}
 	}
 
 	return expr