Skip to content

Commit c3b630d

Browse files
committed
Merge remote-tracking branch 'origin/release/v11' into release/v11
2 parents 74ac5eb + d37d5cc commit c3b630d

38 files changed

Lines changed: 1200 additions & 1472 deletions

installer/config/const.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,18 @@ import (
66
)
77

88
const INSTALLER_VERSION = ""
9+
const REPLACE = ""
910
const PUBLIC_KEY = ``
1011

1112
const (
12-
REPLACE = ""
1313
RegisterInstanceEndpoint = "/api/v1/instances/register"
1414
GetInstanceDetailsEndpoint = "/api/v1/instances"
1515
GetUpdatesInfoEndpoint = "/api/v1/updates"
1616
GetLicenseEndpoint = "/api/v1/licenses"
1717
HealthEndpoint = "/api/v1/health"
18-
ImagesPath = "/utmstack/images"
18+
LogCollectorEndpoint = "/api/v1/logcollectors/upload"
19+
20+
ImagesPath = "/utmstack/images"
1921

2022
CMServer = "https://customermanager.utmstack.com"
2123

@@ -33,6 +35,7 @@ var (
3335
VersionFilePath = filepath.Join(GetConfig().UpdatesFolder, "version.json")
3436
LicenseFilePath = filepath.Join(GetConfig().UpdatesFolder, "LICENSE")
3537
CheckUpdatesEvery = 5 * time.Minute
38+
SyncSystemLogsEvery = 5 * time.Minute
3639
ConnectedToInternet = false
3740
Updating = false
3841
)

installer/go.mod

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.23.4
44

55
require (
66
github.com/cloudfoundry/gosigar v1.3.91
7+
github.com/docker/docker v28.1.1+incompatible
78
github.com/kardianos/service v1.2.2
89
github.com/levigross/grequests v0.0.0-20231203190023-9c307ef1f48d
910
github.com/lib/pq v1.10.9
@@ -16,44 +17,64 @@ require (
1617

1718
require (
1819
github.com/AtlasInsideCorp/AtlasInsideAES v1.0.0 // indirect
20+
github.com/Microsoft/go-winio v0.4.14 // indirect
1921
github.com/bytedance/sonic v1.13.2 // indirect
2022
github.com/bytedance/sonic/loader v0.2.4 // indirect
2123
github.com/cloudwego/base64x v0.1.5 // indirect
22-
github.com/cloudwego/iasm v0.2.0 // indirect
24+
github.com/containerd/log v0.1.0 // indirect
25+
github.com/distribution/reference v0.6.0 // indirect
26+
github.com/docker/go-connections v0.5.0 // indirect
27+
github.com/docker/go-units v0.5.0 // indirect
28+
github.com/felixge/httpsnoop v1.0.4 // indirect
2329
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
2430
github.com/gin-contrib/sse v1.1.0 // indirect
2531
github.com/gin-gonic/gin v1.10.0 // indirect
32+
github.com/go-logr/logr v1.4.2 // indirect
33+
github.com/go-logr/stdr v1.2.2 // indirect
2634
github.com/go-ole/go-ole v1.3.0 // indirect
2735
github.com/go-playground/locales v0.14.1 // indirect
2836
github.com/go-playground/universal-translator v0.18.1 // indirect
2937
github.com/go-playground/validator/v10 v10.26.0 // indirect
3038
github.com/goccy/go-json v0.10.5 // indirect
39+
github.com/gogo/protobuf v1.3.2 // indirect
3140
github.com/google/go-querystring v1.1.0 // indirect
3241
github.com/google/uuid v1.6.0 // indirect
3342
github.com/json-iterator/go v1.1.12 // indirect
3443
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
35-
github.com/kr/pretty v0.3.1 // indirect
3644
github.com/leodido/go-urn v1.4.0 // indirect
3745
github.com/lufia/plan9stats v0.0.0-20250317134145-8bc96cf8fc35 // indirect
3846
github.com/mattn/go-isatty v0.0.20 // indirect
47+
github.com/moby/docker-image-spec v1.3.1 // indirect
48+
github.com/moby/sys/atomicwriter v0.1.0 // indirect
49+
github.com/moby/term v0.5.2 // indirect
3950
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4051
github.com/modern-go/reflect2 v1.0.2 // indirect
52+
github.com/morikuni/aec v1.0.0 // indirect
53+
github.com/opencontainers/go-digest v1.0.0 // indirect
54+
github.com/opencontainers/image-spec v1.1.1 // indirect
4155
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
4256
github.com/pkg/errors v0.9.1 // indirect
4357
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
44-
github.com/rogpeppe/go-internal v1.13.1 // indirect
4558
github.com/shoenig/go-m1cpu v0.1.6 // indirect
4659
github.com/shoenig/test v1.8.0 // indirect
4760
github.com/tklauser/go-sysconf v0.3.15 // indirect
4861
github.com/tklauser/numcpus v0.10.0 // indirect
4962
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
5063
github.com/ugorji/go/codec v1.2.12 // indirect
5164
github.com/yusufpapurcu/wmi v1.2.4 // indirect
65+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
66+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
67+
go.opentelemetry.io/otel v1.35.0 // indirect
68+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.35.0 // indirect
69+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
70+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
5271
golang.org/x/arch v0.16.0 // indirect
5372
golang.org/x/crypto v0.37.0 // indirect
5473
golang.org/x/net v0.39.0 // indirect
5574
golang.org/x/sys v0.32.0 // indirect
5675
golang.org/x/text v0.24.0 // indirect
76+
golang.org/x/time v0.11.0 // indirect
5777
google.golang.org/protobuf v1.36.6 // indirect
5878
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
79+
gotest.tools/v3 v3.5.2 // indirect
5980
)

0 commit comments

Comments
 (0)