fix: resolved confilct

Signed-off-by: yuluo-yx <yuluo08290126@gmail.com>

Author: yuluo-yx

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/go-sql-driver/mysql v1.9.3
 	github.com/lib/pq v1.10.9
 	github.com/microsoft/go-mssqldb v1.9.3
+	github.com/milvus-io/milvus-sdk-go/v2 v2.4.2
 	github.com/prometheus/client_golang v1.23.0
 	github.com/prometheus/common v0.65.0
 	github.com/redis/go-redis/v9 v9.17.1
@@ -28,23 +29,37 @@ require (
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cockroachdb/errors v1.9.1 // indirect
+	github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
+	github.com/cockroachdb/redact v1.1.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/getsentry/sentry-go v0.12.0 // indirect
 	github.com/goccy/go-json v0.10.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/flatbuffers v23.1.21+incompatible // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.3 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/milvus-io/milvus-proto/go-api/v2 v2.4.10-0.20240819025435-512e3b98866a // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pierrec/lz4/v4 v4.1.17 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/spf13/pflag v1.0.9 // indirect
+	github.com/tidwall/gjson v1.14.4 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 	github.com/yuin/gopher-lua v1.1.1 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect

go.sum

@@ -17,11 +17,6 @@
  * under the License.
  */
 
-// Copyright Envoy Gateway Authors
-// SPDX-License-Identifier: Apache-2.0
-// The full text of the Apache license is available in the LICENSE file at
-// the root of the repo.
-
 package version
 
 import (

internal/cmd/version/version.go

@@ -31,7 +31,7 @@ import (
 	"github.com/redis/go-redis/v9"
 	"golang.org/x/crypto/ssh"
 
-	sshhelper "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/ssh"
+	sshhelper "hertzbeat.apache.org/hertzbeat-collector-go/internal/util/ssh"
 	jobtypes "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/job"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/job/protocol"
 	consts "hertzbeat.apache.org/hertzbeat-collector-go/internal/constants"

internal/collector/basic/redis/redis_collector.go

@@ -26,12 +26,12 @@ import (
 	"strings"
 	"time"
 
-	sshhelper "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/ssh"
 	jobtypes "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/job"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/job/protocol"
 	consts "hertzbeat.apache.org/hertzbeat-collector-go/internal/constants"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/util/logger"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/util/param"
+	sshhelper "hertzbeat.apache.org/hertzbeat-collector-go/internal/util/ssh"
 )
 
 const (

internal/collector/basic/ssh/ssh_collector.go

@@ -34,6 +34,7 @@ import (
 	_ "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/basic"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/collect/strategy"
 	jobtypes "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/common/types/job"
+	_ "hertzbeat.apache.org/hertzbeat-collector-go/internal/collector/extension/milvus"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/constants"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/util/logger"
 	"hertzbeat.apache.org/hertzbeat-collector-go/internal/util/param"

internal/collector/common/collect/dispatch/metrics_collector.go

@@ -53,6 +53,7 @@ type Metrics struct {
 	JMX     *protocol.JMXProtocol     `json:"jmx,omitempty"`
 	Redis   *protocol.RedisProtocol   `json:"redis,omitempty"`
 	MongoDB *protocol.MongoDBProtocol `json:"mongodb,omitempty"`
+	Milvus  *protocol.MilvusProtocol  `json:"milvus,omitempty"`
 }
 
 // Field represents a metric field
@@ -169,6 +170,119 @@ type ValueRow struct {
 
 // Protocol specific types
 
+// HTTPProtocol represents HTTP protocol configuration
+type HTTPProtocol struct {
+	URL           string            `json:"url"`
+	Method        string            `json:"method"`
+	Headers       map[string]string `json:"headers"`
+	Params        map[string]string `json:"params"`
+	Body          string            `json:"body"`
+	ParseScript   string            `json:"parseScript"`
+	ParseType     string            `json:"parseType"`
+	Keyword       string            `json:"keyword"`
+	Timeout       string            `json:"timeout"`
+	SSL           string            `json:"ssl"`
+	Authorization *Authorization    `json:"authorization"`
+}
+
+// Authorization represents HTTP authorization configuration
+type Authorization struct {
+	Type               string `json:"type"`
+	BasicAuthUsername  string `json:"basicAuthUsername"`
+	BasicAuthPassword  string `json:"basicAuthPassword"`
+	DigestAuthUsername string `json:"digestAuthUsername"`
+	DigestAuthPassword string `json:"digestAuthPassword"`
+	BearerTokenToken   string `json:"bearerTokenToken"`
+}
+
+// SSHProtocol represents SSH protocol configuration
+type SSHProtocol struct {
+	Host                 string `json:"host"`
+	Port                 string `json:"port"`
+	Username             string `json:"username"`
+	Password             string `json:"password"`
+	PrivateKey           string `json:"privateKey"`
+	PrivateKeyPassphrase string `json:"privateKeyPassphrase"`
+	Script               string `json:"script"`
+	ParseType            string `json:"parseType"`
+	ParseScript          string `json:"parseScript"`
+	Timeout              string `json:"timeout"`
+	ReuseConnection      string `json:"reuseConnection"`
+	UseProxy             string `json:"useProxy"`
+	ProxyHost            string `json:"proxyHost"`
+	ProxyPort            string `json:"proxyPort"`
+	ProxyUsername        string `json:"proxyUsername"`
+	ProxyPassword        string `json:"proxyPassword"`
+	ProxyPrivateKey      string `json:"proxyPrivateKey"`
+}
+
+// JDBCProtocol represents JDBC protocol configuration
+type JDBCProtocol struct {
+	Host            string              `json:"host"`
+	Port            string              `json:"port"`
+	Platform        string              `json:"platform"`
+	Username        string              `json:"username"`
+	Password        string              `json:"password"`
+	Database        string              `json:"database"`
+	Timeout         string              `json:"timeout"`
+	QueryType       string              `json:"queryType"`
+	SQL             string              `json:"sql"`
+	URL             string              `json:"url"`
+	ReuseConnection string              `json:"reuseConnection"`
+	SSHTunnel       *protocol.SSHTunnel `json:"sshTunnel,omitempty"`
+}
+
+// SNMPProtocol represents SNMP protocol configuration
+type SNMPProtocol struct {
+	Host        string `json:"host"`
+	Port        int    `json:"port"`
+	Version     string `json:"version"`
+	Community   string `json:"community"`
+	Username    string `json:"username"`
+	AuthType    string `json:"authType"`
+	AuthPasswd  string `json:"authPasswd"`
+	PrivType    string `json:"privType"`
+	PrivPasswd  string `json:"privPasswd"`
+	ContextName string `json:"contextName"`
+	Timeout     int    `json:"timeout"`
+	Operation   string `json:"operation"`
+	OIDs        string `json:"oids"`
+}
+
+// JMXProtocol represents JMX protocol configuration
+type JMXProtocol struct {
+	Host     string `json:"host"`
+	Port     int    `json:"port"`
+	Username string `json:"username"`
+	Password string `json:"password"`
+	Protocol string `json:"protocol"`
+	URL      string `json:"url"`
+	Timeout  int    `json:"timeout"`
+}
+
+// RedisProtocol represents Redis protocol configuration
+type RedisProtocol struct {
+	Host      string              `json:"host"`
+	Port      string              `json:"port"`
+	Username  string              `json:"username"`
+	Password  string              `json:"password"`
+	Pattern   string              `json:"pattern"`
+	Timeout   string              `json:"timeout"`
+	SSHTunnel *protocol.SSHTunnel `json:"sshTunnel,omitempty"`
+}
+
+// MongoDBProtocol represents MongoDB protocol configuration
+type MongoDBProtocol struct {
+	Host         string `json:"host"`
+	Port         int    `json:"port"`
+	Username     string `json:"username"`
+	Password     string `json:"password"`
+	Database     string `json:"database"`
+	AuthDatabase string `json:"authDatabase"`
+	Command      string `json:"command"`
+	Timeout      int    `json:"timeout"`
+}
+
 // GetInterval returns the interval for the metric, using default if not set
 func (m *Metrics) GetInterval() time.Duration {
 	if m.Interval > 0 {

internal/collector/common/types/job/metrics_types.go

@@ -0,0 +1,43 @@
+package protocol
+
+import (
+  "hertzbeat.apache.org/hertzbeat-collector-go/internal/util/logger"
+)
+
+// MilvusProtocol represents Milvus protocol configuration
+type MilvusProtocol struct {
+  Host     string `json:"host"`
+  Port     string `json:"port"`
+  Username string `json:"username"`
+  Password string `json:"password"`
+  Timeout  string `json:"timeout"`
+
+  logger logger.Logger
+}
+
+type MilvusProtocolOption func(protocol *MilvusProtocol)
+
+func NewMilvusProtocol(host, port string, logger logger.Logger, opts ...MilvusProtocolOption) *MilvusProtocol {
+
+  p := &MilvusProtocol{
+    Host:   host,
+    Port:   port,
+    logger: logger,
+  }
+  for _, opt := range opts {
+    opt(p)
+  }
+  return p
+}
+
+func (p *MilvusProtocol) IsInvalid() error {
+  if p.Host == "" {
+    p.logger.Error(ErrorInvalidHost, "milvus protocol host is empty")
+    return ErrorInvalidHost
+  }
+  if p.Port == "" {
+    p.logger.Error(ErrorInvalidPort, "milvus protocol port is empty")
+    return ErrorInvalidPort
+  }
+  return nil
+}