Merge pull request #24 from amuluze/v1.3.5

V1.3.5

.gitignore

@@ -5,7 +5,6 @@
 */.vitepress/cache/*
 */deploy.sh
 */pwd
-*/dist/*
 amprobe.installer.zip
 amprobe.installer.arm.zip
 amprobe.tar.gz

amprobe/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 as build
+FROM golang:1.21 AS build
 COPY . /app/amprobe
 ENV GO111MODULE="on" \
  GOPROXY=https://goproxy.cn,direct

amprobe/Makefile

@@ -23,15 +23,15 @@ wire:
 .PHONY: amd64
 # docker amd64 image
 amd64:
- # docker build -t amuluze/amprobe:v1.3.4 -f ./Dockerfile.amd .
- docker buildx build --platform linux/amd64 -t amuluze/amprobe:v1.3.4 -o type=docker .
+ # docker build -t amuluze/amprobe:v1.3.5 -f ./Dockerfile.amd .
+ docker buildx build --platform linux/amd64 -t amuluze/amprobe:v1.3.5 -o type=docker .
 
 .PHONY: arm64
 # docker arm64 image
 arm64:
- # docker build -t amuluze/amprobe_arm:v1.3.4 -f ./Dockerfile.arm .
- docker buildx build --platform linux/arm64 -t amuluze/amprobe_arm:v1.3.4 -o type=docker .
+ # docker build -t amuluze/amprobe_arm:v1.3.5 -f ./Dockerfile.arm .
+ docker buildx build --platform linux/arm64 -t amuluze/amprobe_arm:v1.3.5 -o type=docker .
 
 .PHONY: build
 build:
- docker buildx build --platform linux/amd64,linux/arm64 -t amuluze/amprobe:v1.3.4 . --push
+ docker buildx build --platform linux/amd64,linux/arm64 -t amuluze/amprobe:v1.3.5 . --push

amprobe/configs/config.toml

@@ -10,7 +10,7 @@ AppName = "probe"
 Prefork = false
 
 [Rpc]
-Address = "/app/amvector.socket"
+Address = "/app/vector.sock"
 
 # 数据库文件存放位置的配置
 # 需要监控的磁盘设备配置

amprobe/go.mod

@@ -4,10 +4,10 @@ go 1.21
 
 require (
  github.com/amuluze/amutool/database v0.0.0-20240425152605-07fd57342644
- github.com/amuluze/amutool/docker v0.0.0-20240425152605-07fd57342644
  github.com/amuluze/amutool/errors v0.0.0-20240425152605-07fd57342644
  github.com/amuluze/amutool/logger v0.0.0-20240425152605-07fd57342644
  github.com/amuluze/amutool/timex v0.0.0-20240425152605-07fd57342644
+ github.com/amuluze/docker v0.0.0-20240712060310-82e95def381e
  github.com/fsnotify/fsnotify v1.7.0
  github.com/go-playground/validator/v10 v10.19.0
  github.com/gofiber/contrib/websocket v1.3.1
@@ -20,7 +20,8 @@ require (
  github.com/smallnest/rpcx v1.8.31
  github.com/spf13/viper v1.18.2
  github.com/urfave/cli/v2 v2.27.1
- gopkg.in/yaml.v3 v3.0.1
+ golang.org/x/crypto v0.23.0
+ gopkg.in/yaml.v2 v2.4.0
  gorm.io/gorm v1.25.9
 )
 
@@ -35,19 +36,21 @@ require (
  github.com/cenkalti/backoff v2.2.1+incompatible // indirect
  github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
  github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0 // indirect
- github.com/distribution/reference v0.5.0 // indirect
- github.com/docker/docker v26.0.0+incompatible // indirect
- github.com/docker/go-connections v0.4.0 // indirect
+ github.com/distribution/reference v0.6.0 // indirect
+ github.com/docker/docker v27.0.3+incompatible // indirect
+ github.com/docker/go-connections v0.5.0 // indirect
  github.com/docker/go-units v0.5.0 // indirect
+ github.com/docker/libcompose v0.4.0 // indirect
  github.com/edwingeng/doublejump v1.0.1 // indirect
  github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a // indirect
  github.com/fasthttp/websocket v1.5.8 // indirect
  github.com/fatih/color v1.16.0 // indirect
  github.com/felixge/httpsnoop v1.0.4 // indirect
+ github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
  github.com/gabriel-vasile/mimetype v1.4.3 // indirect
  github.com/go-faster/city v1.0.1 // indirect
  github.com/go-faster/errors v0.7.0 // indirect
- github.com/go-logr/logr v1.4.1 // indirect
+ github.com/go-logr/logr v1.4.2 // indirect
  github.com/go-logr/stdr v1.2.2 // indirect
  github.com/go-ole/go-ole v1.3.0 // indirect
  github.com/go-ping/ping v1.1.0 // indirect
@@ -86,7 +89,7 @@ require (
  github.com/moby/docker-image-spec v1.3.1 // indirect
  github.com/onsi/ginkgo/v2 v2.17.2 // indirect
  github.com/opencontainers/go-digest v1.0.0 // indirect
- github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
+ github.com/opencontainers/image-spec v1.1.0 // indirect
  github.com/paulmach/orb v0.10.0 // indirect
  github.com/pelletier/go-toml/v2 v2.1.0 // indirect
  github.com/philhofer/fwd v1.1.2 // indirect
@@ -111,7 +114,7 @@ require (
  github.com/subosito/gotenv v1.6.0 // indirect
  github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
  github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
- github.com/tidwall/gjson v1.17.0 // indirect
+ github.com/tidwall/gjson v1.17.1 // indirect
  github.com/tidwall/match v1.1.1 // indirect
  github.com/tidwall/pretty v1.2.0 // indirect
  github.com/tinylib/msgp v1.1.9 // indirect
@@ -127,22 +130,22 @@ require (
  github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
  github.com/xtaci/kcp-go v5.4.20+incompatible // indirect
  github.com/yusufpapurcu/wmi v1.2.4 // indirect
- go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
- go.opentelemetry.io/otel v1.24.0 // indirect
- go.opentelemetry.io/otel/metric v1.24.0 // indirect
- go.opentelemetry.io/otel/trace v1.24.0 // indirect
+ go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
+ go.opentelemetry.io/otel v1.28.0 // indirect
+ go.opentelemetry.io/otel/metric v1.28.0 // indirect
+ go.opentelemetry.io/otel/trace v1.28.0 // indirect
  go.uber.org/mock v0.4.0 // indirect
  go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/crypto v0.23.0 // indirect
  golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
  golang.org/x/mod v0.17.0 // indirect
  golang.org/x/net v0.25.0 // indirect
  golang.org/x/sync v0.7.0 // indirect
- golang.org/x/sys v0.20.0 // indirect
+ golang.org/x/sys v0.21.0 // indirect
  golang.org/x/text v0.15.0 // indirect
  golang.org/x/tools v0.21.0 // indirect
  google.golang.org/protobuf v1.34.1 // indirect
  gopkg.in/ini.v1 v1.67.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
  gorm.io/driver/clickhouse v0.5.1 // indirect
  gorm.io/driver/mysql v1.5.2 // indirect
  gorm.io/driver/postgres v1.5.4 // indirect