feat: add new agent.proto func

deepflowio · Oct 9, 2024 · 716a833 · 716a833
1 parent d3f6333
commit 716a833
Show file tree

Hide file tree

Showing 65 changed files with 9,676 additions and 56 deletions.
diff --git a/cli/ctl/agent_check.go b/cli/ctl/agent_check.go
diff --git a/cli/ctl/cli.go b/cli/ctl/cli.go
@@ -69,6 +69,7 @@ func Execute(version string) {
 	root.AddCommand(RegisterPluginCommand())
 	root.AddCommand(RegisterPrometheusCommand())
 	root.AddCommand(RegisterPromQLCommand())
+	//root.AddCommand(AgentCheckRegisterCommand())
 
 	cmd.RegisterIngesterCommand(root)
 

diff --git a/cli/ctl/common/domainenabled_string.go b/cli/ctl/common/domainenabled_string.go
diff --git a/cli/ctl/common/domainstate_string.go b/cli/ctl/common/domainstate_string.go
diff --git a/cli/ctl/common/domaintype_string.go b/cli/ctl/common/domaintype_string.go
diff --git a/cli/ctl/common/plugintype_string.go b/cli/ctl/common/plugintype_string.go
diff --git a/cli/ctl/common/pluginuser_string.go b/cli/ctl/common/pluginuser_string.go
diff --git a/cli/ctl/common/vtapexception_string.go b/cli/ctl/common/vtapexception_string.go
diff --git a/cli/ctl/common/vtapstate_string.go b/cli/ctl/common/vtapstate_string.go
diff --git a/cli/ctl/common/vtaptapmode_string.go b/cli/ctl/common/vtaptapmode_string.go
diff --git a/cli/ctl/common/vtaptype_string.go b/cli/ctl/common/vtaptype_string.go
diff --git a/message/agent.proto b/message/agent.proto
@@ -14,6 +14,7 @@ service Synchronizer {
     rpc KubernetesAPISync(KubernetesAPISyncRequest) returns (KubernetesAPISyncResponse) {}
     rpc GetKubernetesClusterID(KubernetesClusterIDRequest) returns (KubernetesClusterIDResponse) {}
     rpc GPIDSync(GPIDSyncRequest) returns (GPIDSyncResponse) {}
+    rpc ShareGPIDLocalData(ShareGPIDSyncRequests) returns (ShareGPIDSyncRequests) {}
     rpc Plugin(PluginRequest) returns (stream PluginResponse) {}
     // because gRPC cannot be initiated by server, the req/resp of this rpc is reversed
     rpc RemoteExecute(stream RemoteExecResponse) returns (stream RemoteExecRequest) {}
@@ -25,7 +26,6 @@ service Debug {
     rpc DebugGPIDAgentData(GPIDSyncRequest) returns (GPIDAgentData) {}
     rpc DebugRealGlobalData(GPIDSyncRequest) returns (RealGlobalData) {}
     rpc DebugRIPToVIP(GPIDSyncRequest) returns (RVData) {}
-    rpc DebugAgentCache(AgentCacheRequest) returns (AgentCacheResponse) {}
 }
 
 enum AgentType {
@@ -621,6 +621,12 @@ enum GPIDSyncCompressAlgorithm {
     COMPRESS_ALGO_IGNORE_IF_EQUAL_TO_PREVIOUS = 1;
 }
 
+message ShareGPIDSyncRequests {
+    optional string server_ip = 1;
+    repeated GPIDSyncRequest sync_requests = 2;
+    optional uint32 org_id = 3;
+}
+
 message GPIDSyncRequest {
     optional string ctrl_ip = 1;
     optional string ctrl_mac = 2;
@@ -697,16 +703,6 @@ message GPIDAgentData {
     optional GPIDSyncRequest sync_request = 2;
 }
 
-message AgentCacheRequest {
-    optional string ctrl_ip = 1;
-    optional string ctrl_mac = 2;
-    optional string team_id = 3; // agent team identity
-}
-
-message AgentCacheResponse {
-    optional bytes content = 1;  // json数据
-}
-
 message AgentId {
     optional string ip = 1;
     optional string mac = 2;

diff --git a/server/Makefile b/server/Makefile
@@ -18,7 +18,7 @@ generated_libs = libs/hmap/idmap/ubig_id_map.go libs/hmap/idmap/ubig_id_map_test
 		 libs/hmap/lru/ubig_lru.go libs/hmap/lru/ubig_lru_test.go \
 		 libs/flow-metrics/pooled_meters.go libs/kubernetes/watcher.gen.go
 
-proto = vendor/${MESSAGE}/common/common.pb.go vendor/${MESSAGE}/trident/trident.pb.go  vendor/${MESSAGE}/agent/agent.pb.go vendor/${MESSAGE}/controller/controller.pb.go vendor/${MESSAGE}/alert_event/alert_event.pb.go vendor/${MESSAGE}/k8s_event/k8s_event.pb.go libs/datatype/pb/flow_log.pb.go libs/flow-metrics/pb/metric.pb.go libs/stats/pb/stats.pb.go
+proto = vendor/${MESSAGE}/common/common.pb.go vendor/${MESSAGE}/trident/trident.pb.go vendor/${MESSAGE}/agent/agent.pb.go vendor/${MESSAGE}/controller/controller.pb.go vendor/${MESSAGE}/alert_event/alert_event.pb.go vendor/${MESSAGE}/k8s_event/k8s_event.pb.go libs/datatype/pb/flow_log.pb.go libs/flow-metrics/pb/metric.pb.go libs/stats/pb/stats.pb.go
 
 $(generated_libs): $(generate_sources)
 	go generate ./...

diff --git a/server/agent_config/config.go b/server/agent_config/config.go
@@ -21,6 +21,9 @@ import _ "embed"
 //go:embed example.yaml
 var YamlAgentGroupConfig []byte
 
+//go:embed template.yaml
+var YamlAgentGroupConfigTemplate []byte
+
 type AgentGroupConfig struct {
 	VTapGroupID                       *string       `json:"VTAP_GROUP_ID" yaml:"vtap_group_id,omitempty"`
 	VTapGroupLcuuid                   *string       `json:"VTAP_GROUP_LCUUID" yaml:"vtap_group_lcuuid,omitempty"`