fix monitor

Author: root

Makefile

@@ -222,6 +222,11 @@ redo:
 	@docker rm -f $$(docker ps -aq --filter name=$(CONTAINER)) 2>/dev/null || true
 	@$(COMPOSE_CMD) down --timeout 5 -v 2>/dev/null || true
 	@echo "✓ Container and volumes removed"
+	@if grep -q '^APPOS_SECRET_KEY=replace-with-a-random-base64-secret' build/.env 2>/dev/null; then \
+		NEW_KEY=$$(openssl rand -base64 32); \
+		sed -i "s|^APPOS_SECRET_KEY=replace-with-a-random-base64-secret|APPOS_SECRET_KEY=$$NEW_KEY|" build/.env; \
+		echo "✓ Generated APPOS_SECRET_KEY in build/.env"; \
+	fi
 	@$(MAKE) build
 	@$(MAKE) image build-local
 	@$(MAKE) start dev
@@ -894,6 +899,11 @@ endif
 # Container Management
 # ============================================================
 start:
+	@if grep -q '^APPOS_SECRET_KEY=replace-with-a-random-base64-secret' build/.env 2>/dev/null; then \
+		NEW_KEY=$$(openssl rand -base64 32); \
+		sed -i "s|^APPOS_SECRET_KEY=replace-with-a-random-base64-secret|APPOS_SECRET_KEY=$$NEW_KEY|" build/.env; \
+		echo "✓ Generated APPOS_SECRET_KEY in build/.env"; \
+	fi
 	@if [ "$(ARG2)" = "dev" ] || [ "$(ARG2)" = "latest" ]; then \
 		IMAGE_TAG=$(ARG2); \
 		PORT=9091; \

Note.md

@@ -154,19 +154,6 @@ Docker tab 的 container
 2. 分页 <> 中的页号与分页操作图标之间建议保持一个字符的距离即可
 
 
-Components 的 Addos 优化：
-
-1. version 列显示两个版本： 
-Target version
-Current version
-没有安装时，仅显示 target  version
-
-2. 增加一列表示安装制品格式，包含：package, binary, docker 等
-3. Component 列表格内容，增加问号，点击查看这个组件的介绍。
-3. Status 列应该表示这个组件的真实运行态，installed 其实不属于这个态。
-
-
-
 
 
 ports tab 不稳定，经常打开显示  somethins wrong

backend/domain/monitor/metrics/query_test.go

@@ -410,3 +410,33 @@ func TestQueryMetricSeriesRejectsPartialCustomRange(t *testing.T) {
 		t.Fatalf("expected partial custom range rejection, got %v", err)
 	}
 }
+
+func TestResolveMetricSeriesWindowAlignsFixedWindowToStepBoundary(t *testing.T) {
+	now := time.Date(2026, time.May, 14, 10, 7, 23, 0, time.UTC)
+	start, end, step, err := metrics.ResolveMetricSeriesWindowForTest("24h", metrics.MetricSeriesQueryOptions{}, now)
+	if err != nil {
+		t.Fatal(err)
+	}
+	wantEnd := time.Date(2026, time.May, 14, 10, 0, 0, 0, time.UTC)
+	if !end.Equal(wantEnd) {
+		t.Fatalf("expected aligned end %s, got %s", wantEnd, end)
+	}
+	if got := end.Sub(start); got != 24*time.Hour {
+		t.Fatalf("expected 24h duration, got %s", got)
+	}
+	if step != 15*time.Minute {
+		t.Fatalf("expected 15m step, got %s", step)
+	}
+
+	_, end7d, step7d, err := metrics.ResolveMetricSeriesWindowForTest("7d", metrics.MetricSeriesQueryOptions{}, now)
+	if err != nil {
+		t.Fatal(err)
+	}
+	want7dEnd := time.Date(2026, time.May, 14, 10, 0, 0, 0, time.UTC)
+	if !end7d.Equal(want7dEnd) {
+		t.Fatalf("expected aligned 7d end %s, got %s", want7dEnd, end7d)
+	}
+	if step7d != time.Hour {
+		t.Fatalf("expected 1h step, got %s", step7d)
+	}
+}

backend/domain/monitor/metrics/query_window.go

@@ -48,7 +48,7 @@ func resolveMetricSeriesWindow(window string, options MetricSeriesQueryOptions,
 	if !ok {
 		return metricSeriesWindowSpec{}, fmt.Errorf("window %q is not allowed", window)
 	}
-	end := now.UTC()
+	end := alignTimeToStepBoundary(now.UTC(), windowSpec.Step)
 	start := end.Add(-windowSpec.Duration)
 	return metricSeriesWindowSpec{
 		Label: window,
@@ -58,6 +58,18 @@ func resolveMetricSeriesWindow(window string, options MetricSeriesQueryOptions,
 	}, nil
 }
 
+func alignTimeToStepBoundary(value time.Time, step time.Duration) time.Time {
+	if step <= 0 {
+		return value
+	}
+	unix := value.Unix()
+	stepSeconds := int64(step / time.Second)
+	if stepSeconds <= 0 {
+		return value
+	}
+	return time.Unix((unix/stepSeconds)*stepSeconds, 0).UTC()
+}
+
 func stepForSeriesDuration(duration time.Duration) time.Duration {
 	switch {
 	case duration <= time.Hour:
@@ -118,3 +130,12 @@ func normalizeRequestedSeries(seriesNames []string) []string {
 	}
 	return normalized
 }
+
+// ResolveMetricSeriesWindowForTest exposes fixed-window resolution to external tests.
+func ResolveMetricSeriesWindowForTest(window string, options MetricSeriesQueryOptions, now time.Time) (time.Time, time.Time, time.Duration, error) {
+	spec, err := resolveMetricSeriesWindow(window, options, now)
+	if err != nil {
+		return time.Time{}, time.Time{}, 0, err
+	}
+	return spec.Start, spec.End, spec.Step, nil
+}

backend/domain/monitor/signals/checks/server_facts_pull.go

@@ -144,7 +144,7 @@ func ParseServerFactsCommandOutput(output string) (map[string]any, error) {
 	if err != nil || memoryTotalBytes <= 0 {
 		return nil, fmt.Errorf("invalid memory.total_bytes %q", values["memory.total_bytes"])
 	}
-	return map[string]any{
+	facts := map[string]any{
 		"os": map[string]any{
 			"family":       values["os.family"],
 			"distribution": values["os.distribution"],
@@ -160,7 +160,25 @@ func ParseServerFactsCommandOutput(output string) (map[string]any, error) {
 		"memory": map[string]any{
 			"total_bytes": memoryTotalBytes,
 		},
-	}, nil
+	}
+
+	if provider := normalizeCloudFactValue(values["cloud.provider"]); provider != "" {
+		cloudFacts := map[string]any{
+			"provider": provider,
+		}
+		if region := normalizeCloudFactValue(values["cloud.region"]); region != "" {
+			cloudFacts["region"] = region
+		}
+		if zone := normalizeCloudFactValue(values["cloud.zone"]); zone != "" {
+			cloudFacts["zone"] = zone
+		}
+		if source := normalizeCloudFactValue(values["cloud.source"]); source != "" {
+			cloudFacts["source"] = source
+		}
+		facts["cloud"] = cloudFacts
+	}
+
+	return facts, nil
 }
 
 func serverFactsCommand() string {
@@ -176,12 +194,37 @@ func serverFactsCommand() string {
 		"architecture=$(uname -m 2>/dev/null || printf unknown)",
 		"cpu_cores=$(getconf _NPROCESSORS_ONLN 2>/dev/null || nproc 2>/dev/null || printf 1)",
 		"memory_total_bytes=$(awk '/^MemTotal:/ {printf \"%d\", $2 * 1024}' /proc/meminfo 2>/dev/null || printf 1)",
+		"cloud_provider=",
+		"cloud_region=",
+		"cloud_zone=",
+		"cloud_source=",
+		"if command -v cloud-init >/dev/null 2>&1; then cloud_provider=$(cloud-init query cloud_name 2>/dev/null || printf ''); fi",
+		"if [ -z \"$cloud_provider\" ] && command -v cloud-init >/dev/null 2>&1; then cloud_provider=$(cloud-init query cloud_id 2>/dev/null || printf ''); fi",
+		"if command -v cloud-init >/dev/null 2>&1; then cloud_region=$(cloud-init query region 2>/dev/null || printf ''); fi",
+		"if command -v cloud-init >/dev/null 2>&1; then cloud_zone=$(cloud-init query availability_zone 2>/dev/null || printf ''); fi",
+		"if [ -z \"$cloud_zone\" ] && command -v cloud-init >/dev/null 2>&1; then cloud_zone=$(cloud-init query availability-zone 2>/dev/null || printf ''); fi",
+		"if [ -z \"$cloud_region\" ] && [ -n \"$cloud_zone\" ]; then cloud_region=$(printf '%s' \"$cloud_zone\" | sed 's/[[:alpha:]]$//'); fi",
+		"if [ -n \"$cloud_provider\" ]; then cloud_source=cloud-init; fi",
 		"printf 'os.family=%s\\n' \"$os_family\"",
 		"printf 'os.distribution=%s\\n' \"$os_distribution\"",
 		"printf 'os.version=%s\\n' \"$os_version\"",
 		"printf 'kernel.release=%s\\n' \"$kernel_release\"",
 		"printf 'architecture=%s\\n' \"$architecture\"",
 		"printf 'cpu.cores=%s\\n' \"$cpu_cores\"",
 		"printf 'memory.total_bytes=%s\\n' \"$memory_total_bytes\"",
+		"if [ -n \"$cloud_provider\" ]; then printf 'cloud.provider=%s\\n' \"$cloud_provider\"; fi",
+		"if [ -n \"$cloud_region\" ]; then printf 'cloud.region=%s\\n' \"$cloud_region\"; fi",
+		"if [ -n \"$cloud_zone\" ]; then printf 'cloud.zone=%s\\n' \"$cloud_zone\"; fi",
+		"if [ -n \"$cloud_source\" ]; then printf 'cloud.source=%s\\n' \"$cloud_source\"; fi",
 	}, " && ")
 }
+
+func normalizeCloudFactValue(value string) string {
+	text := strings.TrimSpace(value)
+	switch strings.ToLower(text) {
+	case "", "<nil>", "null", "(null)", "undefined", "(undefined)":
+		return ""
+	default:
+		return text
+	}
+}

backend/domain/monitor/signals/checks/server_facts_pull_test.go

@@ -10,6 +10,10 @@ kernel.release=6.8.0-31-generic
 architecture=x86_64
 cpu.cores=4
 memory.total_bytes=8589934592
+cloud.provider=aws
+cloud.region=cn-northwest-1
+cloud.zone=cn-northwest-1a
+cloud.source=cloud-init
 `)
 	if err != nil {
 		t.Fatal(err)
@@ -26,6 +30,10 @@ memory.total_bytes=8589934592
 	if memoryFacts["total_bytes"] != int64(8589934592) {
 		t.Fatalf("expected memory total bytes, got %+v", facts)
 	}
+	cloudFacts := facts["cloud"].(map[string]any)
+	if cloudFacts["provider"] != "aws" || cloudFacts["region"] != "cn-northwest-1" || cloudFacts["zone"] != "cn-northwest-1a" || cloudFacts["source"] != "cloud-init" {
+		t.Fatalf("expected cloud facts, got %+v", facts)
+	}
 }
 
 func TestParseServerFactsCommandOutputRejectsMissingRequiredField(t *testing.T) {
@@ -40,3 +48,21 @@ cpu.cores=4
 		t.Fatal("expected missing memory.total_bytes error")
 	}
 }
+
+func TestParseServerFactsCommandOutputTreatsCloudFieldsAsOptional(t *testing.T) {
+	facts, err := ParseServerFactsCommandOutput(`os.family=Linux
+os.distribution=Ubuntu
+os.version=24.04
+kernel.release=6.8.0-31-generic
+architecture=x86_64
+cpu.cores=4
+memory.total_bytes=8589934592
+cloud.provider=
+`)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, ok := facts["cloud"]; ok {
+		t.Fatalf("expected no cloud facts group, got %+v", facts)
+	}
+}

backend/domain/monitor/signals/snapshots/facts.go

@@ -94,6 +94,12 @@ func normalizeFactsSnapshot(facts map[string]any) (map[string]any, error) {
 				return nil, err
 			}
 			normalized["memory"] = group
+		case "cloud":
+			group, err := normalizeCloudFacts(value)
+			if err != nil {
+				return nil, err
+			}
+			normalized["cloud"] = group
 		default:
 			return nil, fmt.Errorf("unknown facts group %q", key)
 		}
@@ -197,6 +203,36 @@ func normalizeMemoryFacts(value any) (map[string]any, error) {
 	return normalized, nil
 }
 
+func normalizeCloudFacts(value any) (map[string]any, error) {
+	group, err := requireMap(value, "cloud")
+	if err != nil {
+		return nil, err
+	}
+	normalized := make(map[string]any, len(group))
+	for key, nested := range group {
+		switch strings.TrimSpace(key) {
+		case "provider":
+			text, err := normalizeRequiredString(nested, "cloud.provider")
+			if err != nil {
+				return nil, err
+			}
+			normalized[key] = text
+		case "region", "zone", "source":
+			text, err := normalizeRequiredString(nested, "cloud."+key)
+			if err != nil {
+				return nil, err
+			}
+			normalized[key] = text
+		default:
+			return nil, fmt.Errorf("unknown facts field %q", "cloud."+key)
+		}
+	}
+	if strings.TrimSpace(fmt.Sprint(normalized["provider"])) == "" {
+		return nil, fmt.Errorf("cloud.provider must be a non-empty string")
+	}
+	return normalized, nil
+}
+
 func requireMap(value any, field string) (map[string]any, error) {
 	group, ok := value.(map[string]any)
 	if !ok {