Merge remote-tracking branch 'qiniu/develop'

Author: aice030

cmd/prometheus_adapter/main.go

@@ -0,0 +1,91 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"syscall"
+	"time"
+
+	"github.com/fox-gonic/fox"
+	"github.com/qiniu/zeroops/internal/config"
+	prometheusadapter "github.com/qiniu/zeroops/internal/prometheus_adapter"
+	"github.com/rs/zerolog"
+	"github.com/rs/zerolog/log"
+)
+
+func main() {
+	// 配置日志
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+
+	log.Info().Msg("Starting Prometheus Adapter server")
+
+	// 加载 Prometheus Adapter 配置
+	adapter, err := prometheusadapter.NewPrometheusAdapterServer(&config.Config{})
+	if err != nil {
+		log.Fatal().Err(err).Msg("Failed to create Prometheus Adapter server")
+	}
+
+	// 获取 Prometheus Adapter 内部配置的绑定地址
+	bindAddr := ":9999" // 默认端口
+	if adapter.GetBindAddr() != "" {
+		bindAddr = adapter.GetBindAddr()
+	}
+
+	// 如果有环境变量，优先使用环境变量的端口
+	if port := os.Getenv("ADAPTER_PORT"); port != "" {
+		bindAddr = ":" + port
+	}
+
+	// 更新配置（虽然已经创建了 adapter，但需要端口信息用于启动服务器）
+	cfg := &config.Config{
+		Server: config.ServerConfig{
+			BindAddr: bindAddr,
+		},
+	}
+
+	// 创建路由
+	router := fox.New()
+
+	// 启动 API
+	if err := adapter.UseApi(router); err != nil {
+		log.Fatal().Err(err).Msg("Failed to setup API routes")
+	}
+
+	// 设置信号处理
+	sigChan := make(chan os.Signal, 1)
+	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
+
+	// 创建一个用于优雅关闭的context
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	// 在goroutine中启动服务器
+	serverErr := make(chan error, 1)
+	go func() {
+		log.Info().Msgf("Starting Prometheus Adapter on %s", cfg.Server.BindAddr)
+		if err := router.Run(cfg.Server.BindAddr); err != nil {
+			serverErr <- err
+		}
+	}()
+
+	// 等待信号或服务器错误
+	select {
+	case sig := <-sigChan:
+		log.Info().Msgf("Received signal %s, shutting down...", sig)
+
+		// 创建超时context
+		shutdownCtx, shutdownCancel := context.WithTimeout(ctx, 10*time.Second)
+		defer shutdownCancel()
+
+		// 调用adapter的Shutdown方法
+		if err := adapter.Close(shutdownCtx); err != nil {
+			log.Error().Err(err).Msg("Error during shutdown")
+		}
+
+		log.Info().Msg("Shutdown complete")
+
+	case err := <-serverErr:
+		log.Fatal().Err(err).Msg("Server error")
+	}
+}

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);