Support config server v2 provider(HeartBeat、FetchPipelineConfig、FetchProcessConfig)

config_server/protocol/v2/README.md

@@ -22,7 +22,7 @@
         string running_status = 8;                  // Human readable running status
         int64 startup_time = 9;                     // Required, Agent's startup time
         repeated ConfigInfo pipeline_configs = 10;  // Information about the current PIPELINE_CONFIG held by the Agent
-        repeated ConfigInfo process_configs = 11;   // Information about the current AGENT_CONFIG held by the Agent
+        repeated ConfigInfo instance_configs = 11;   // Information about the current AGENT_CONFIG held by the Agent
         repeated CommandInfo custom_commands = 12;  // Information about command history
         uint64 flags = 13;                          // Predefined command flag
         bytes opaque = 14;                          // Opaque data for extension
@@ -74,8 +74,8 @@
         UnspecifiedAgentCapability = 0;
         // The Agent can accept pipeline configuration from the Server.
         AcceptsPipelineConfig          = 0x00000001;
-        // The Agent can accept process configuration from the Server.
-        AcceptsProcessConfig           = 0x00000002;
+        // The Agent can accept instance configuration from the Server.
+        AcceptsInstanceConfig           = 0x00000002;
         // The Agent can accept custom command from the Server.
         AcceptsCustomCommand           = 0x00000004;
 
@@ -100,7 +100,7 @@
         uint64 capabilities = 3;                            // Bitmask of flags defined by ServerCapabilities enum
 
         repeated ConfigDetail pipeline_config_updates = 4;  // Agent's pipeline config update status
-        repeated ConfigDetail process_config_updates = 5;   // Agent's process config update status
+        repeated ConfigDetail instance_config_updates = 5;   // Agent's instance config update status
         repeated CommandDetail custom_command_updates = 6;  // Agent's commands updates
         uint64 flags = 7;                                   // Predefined command flag
         bytes opaque = 8;                                   // Opaque data for extension
@@ -126,8 +126,8 @@
         RembersAttribute                   = 0x00000001;
         // The Server can remember pipeline config status.
         RembersPipelineConfigStatus        = 0x00000002;
-        // The Server can remember process config status.
-        RembersProcessConfigStatus         = 0x00000004;
+        // The Server can remember instance config status.
+        RembersInstanceConfigStatus         = 0x00000004;
         // The Server can remember custom command status.
         RembersCustomCommandStatus         = 0x00000008;
 
@@ -150,7 +150,7 @@
         // restarted and lost state).
         ReportFullState           = 0x00000001;
         FetchPipelineConfigDetail = 0x00000002;
-        FetchProcessConfigDetail  = 0x00000004;
+        FetchInstanceConfigDetail  = 0x00000004;
         // bits before 2^16 (inclusive) are reserved for future official fields
     }
 
@@ -168,7 +168,7 @@ Server：应当通过capbilitiies上报Server自身的能力，这样如果新
 
 Client：Agent启动后第一次向Server汇报全量信息，request字段应填尽填。request\_id、sequence\_num、capabilities、instance\_id、agent\_type、startup\_time为必填字段。
 
-Server：Server根据上报的信息返回响应。pipeline\_config\_updates、process\_config\_updates中包含agent需要同步的配置，updates中必然包含name和version，是否包含详情context和detail取决于server端实现。custom\_command_updates包含要求agent执行的命令command中必然包含type、name和expire\_time。
+Server：Server根据上报的信息返回响应。pipeline\_config\_updates、instance\_config\_updates中包含agent需要同步的配置，updates中必然包含name和version，是否包含详情context和detail取决于server端实现。custom\_command_updates包含要求agent执行的命令command中必然包含type、name和expire\_time。
 
 Server是否保存Client信息取决于Server实现，如果服务端找不到或保存的sequence\_num + 1 ≠ 心跳的sequence\_num，那么就立刻返回并且flags中必须设置ReportFullStatus标识位。
 
@@ -192,15 +192,15 @@ Server：同注册
 
 ### 进程配置
 
-若Server的注册/心跳响应中有process\_config\_updates.detail
+若Server的注册/心跳响应中有instance\_config\_updates.detail
 
 Client：直接从response中获得detail，应用成功后下次心跳需要上报完整状态。
 
 若Server的响应不包含detail
 
-Client：根据process\_config\_updates的信息构造FetchProcessConfigRequest
+Client：根据instance\_config\_updates的信息构造FetchInstanceConfigRequest
 
-Server：返回FetchProcessConfigResponse
+Server：返回FetchInstanceConfigResponse
 
 Client获取到多个进程配置时，自动合并，若产生冲突默认行为是未定义。
 

config_server/protocol/v2/agent.proto → config_server/protocol/v2/agentV2.proto

@@ -40,6 +40,7 @@ message AgentAttributes {
     bytes version = 1;                 // Agent's version
     bytes ip = 2;                      // Agent's ip
     bytes hostname = 3;                // Agent's hostname
+    bytes hostid = 4;                  // Agent's hostid  https://opentelemetry.io/docs/specs/semconv/attributes-registry/host/
     map<string, bytes> extras = 100;   // Agent's other attributes
     // before 100 (inclusive) are reserved for future official fields
 }
@@ -49,8 +50,8 @@ enum AgentCapabilities {
     UnspecifiedAgentCapability = 0;
     // The Agent can accept pipeline configuration from the Server.
     AcceptsPipelineConfig          = 0x00000001;
-    // The Agent can accept process configuration from the Server.
-    AcceptsProcessConfig           = 0x00000002;
+    // The Agent can accept instance configuration from the Server.
+    AcceptsInstanceConfig           = 0x00000002;
     // The Agent can accept custom command from the Server.
     AcceptsCustomCommand           = 0x00000004;
 
@@ -81,7 +82,7 @@ message HeartbeatRequest {
     string running_status = 8;                  // Human readable running status
     int64 startup_time = 9;                     // Required, Agent's startup time
     repeated ConfigInfo pipeline_configs = 10;  // Information about the current PIPELINE_CONFIG held by the Agent
-    repeated ConfigInfo process_configs = 11;   // Information about the current AGENT_CONFIG held by the Agent
+    repeated ConfigInfo instance_configs = 11;  // Information about the current AGENT_CONFIG held by the Agent
     repeated CommandInfo custom_commands = 12;  // Information about command history
     uint64 flags = 13;                          // Predefined command flag
     bytes opaque = 14;                          // Opaque data for extension
@@ -102,20 +103,15 @@ message CommandDetail {
     int64 expire_time = 4;          // After which the command can be safely removed from history
 }
 
-message ServerErrorResponse {
-    int32 error_code = 1;           // None-zero value indicates error
-    string error_message = 2;       // Error message
-}
-
 enum ServerCapabilities {
     // The capabilities field is unspecified.
     UnspecifiedServerCapability = 0;
     // The Server can remember agent attributes.
     RembersAttribute                   = 0x00000001;
     // The Server can remember pipeline config status.
     RembersPipelineConfigStatus        = 0x00000002;
-    // The Server can remember process config status.
-    RembersProcessConfigStatus         = 0x00000004;
+    // The Server can remember instance config status.
+    RembersInstanceConfigStatus         = 0x00000004;
     // The Server can remember custom command status.
     RembersCustomCommandStatus         = 0x00000008;
 
@@ -133,25 +129,25 @@ enum ResponseFlags {
     // restarted and lost state).
     ReportFullState           = 0x00000001;
     FetchPipelineConfigDetail = 0x00000002;
-    FetchProcessConfigDetail  = 0x00000004;
+    FetchInstanceConfigDetail = 0x00000004;
     // bits before 2^16 (inclusive) are reserved for future official fields
 }
 
 // ConfigServer's response to Agent's request
 message HeartbeatResponse {
     bytes request_id = 1;  
-    ServerErrorResponse error_response = 2;             // Set value indicates error
+    CommonResponse commonResponse = 2;                  // Set common response
     uint64 capabilities = 3;                            // Bitmask of flags defined by ServerCapabilities enum
 
     repeated ConfigDetail pipeline_config_updates = 4;  // Agent's pipeline config update status
-    repeated ConfigDetail process_config_updates = 5;   // Agent's process config update status
+    repeated ConfigDetail instance_config_updates = 5;  // Agent's instance config update status
     repeated CommandDetail custom_command_updates = 6;  // Agent's commands updates
     uint64 flags = 7;                                   // Predefined command flag
     bytes opaque = 8;                                   // Opaque data for extension
 }
 
 // API: /Agent/FetchPipelineConfig/
-// API: /Agent/FetchProcessConfig/
+// API: /Agent/FetchInstanceConfig/
 // Agent request to ConfigServer, pulling details of the config
 message FetchConfigRequest {
     bytes request_id = 1; 
@@ -162,6 +158,12 @@ message FetchConfigRequest {
 // ConfigServer response to Agent's request
 message FetchConfigResponse {
     bytes request_id = 1;                     
-    ServerErrorResponse error_response = 2;
+    CommonResponse commonResponse = 2;
     repeated ConfigDetail config_details = 3;   // config detail
+}
+
+message CommonResponse
+{
+    int32 status = 1;
+    bytes errorMessage = 2;
 }

config_server/protocol/v2/user.proto

@@ -0,0 +1,221 @@
+syntax = "proto3";
+option go_package = "/protov2;";
+import "agentV2.proto";
+
+
+message Agent{
+  uint64 capabilities = 1;                    // Bitmask of flags defined by AgentCapabilities enum
+  bytes instance_id = 2;                      // Required, Agent's unique identification, consistent throughout the process lifecycle
+  string agent_type = 3;                      // Required, Agent's type(ilogtail, ..)
+  AgentAttributes attributes = 4;             // Agent's basic attributes
+  string running_status = 5;                  // Human readable running status
+  int64 startup_time = 6;                     // Required, Agent's startup time
+}
+
+
+// API: /User/CreateAgentGroup
+
+message CreateAgentGroupRequest {
+  bytes request_id = 1;
+  AgentGroupTag agent_group = 2;
+}
+
+message CreateAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+}
+
+// API: /User/UpdateAgentGroup
+
+message UpdateAgentGroupRequest {
+  bytes request_id = 1;
+  AgentGroupTag agent_group = 2;
+}
+
+message UpdateAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+}
+
+// API: /User/DeleteAgentGroup/
+
+message DeleteAgentGroupRequest {
+  bytes request_id = 1;
+  string group_name = 2;
+}
+
+message DeleteAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+}
+
+// API: /User/GetAgentGroup/
+
+message GetAgentGroupRequest {
+  bytes request_id = 1;
+  string group_name = 2;
+}
+
+message GetAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+  AgentGroupTag agent_group = 3;
+}
+
+// API: /User/ListAgentGroups/
+
+message ListAgentGroupsRequest {
+  bytes request_id = 1;
+}
+
+message ListAgentGroupsResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+
+  repeated AgentGroupTag agent_groups = 4;
+}
+
+// API: /User/CreatePipelineConfig
+// API: /User/CreateInstanceConfig
+message CreateConfigRequest {
+  bytes request_id = 1;
+  ConfigDetail config_detail = 2;
+}
+
+message CreateConfigResponse {
+  bytes request_id = 1;
+  CommonResponse common_response =2;
+}
+
+// API: /User/UpdatePipelineConfig
+// API: /User/UpdateInstanceConfig
+message UpdateConfigRequest {
+  bytes request_id = 1;
+  ConfigDetail config_detail = 2;
+}
+
+message UpdateConfigResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+}
+
+// API: /User/DeletePipelineConfig
+// API: /User/DeleteInstanceConfig
+message DeleteConfigRequest {
+  bytes request_id = 1;
+  string config_name = 2;
+}
+
+message DeleteConfigResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+}
+
+// API: /User/GetPipelineConfig
+// API: /User/GetInstanceConfig
+message GetConfigRequest {
+  bytes request_id = 1;
+  string config_name = 2;
+}
+
+message GetConfigResponse {
+  bytes request_id = 1;
+  CommonResponse common_response=2;
+
+  ConfigDetail config_detail = 3;
+}
+
+// API: /User/GetPipelineConfigStatusList
+// API: /User/GetInstanceConfigStatusList
+message GetConfigStatusListRequest{
+  bytes request_id = 1;
+  bytes instance_id = 2;
+}
+
+message GetConfigStatusListResponse{
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+  repeated ConfigInfo config_status = 3;
+}
+
+// API: /User/ListPipelineConfigs
+// API: /User/ListInstanceConfigs
+message ListConfigsRequest {
+  bytes request_id = 1;
+}
+
+message ListConfigsResponse {
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+
+  repeated ConfigDetail config_details = 3;
+}
+
+// API: /User/ApplyPipelineConfigToAgentGroup
+// API: /User/ApplyInstanceConfigToAgentGroup
+message ApplyConfigToAgentGroupRequest {
+  bytes request_id = 1;
+  string config_name = 2;
+  string group_name = 3;
+}
+
+message ApplyConfigToAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+}
+
+// API: /User/RemovePipelineConfigFromAgentGroup/
+// API: /User/RemoveInstanceConfigFromAgentGroup/
+message RemoveConfigFromAgentGroupRequest {
+  bytes request_id = 1;
+  string config_name = 2;
+  string group_name = 3;
+}
+
+message RemoveConfigFromAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+}
+
+
+// API: /User/GetAppliedPipelineConfigsForAgentGroup/
+// API: /User/GetAppliedInstanceConfigsForAgentGroup/
+message GetAppliedConfigsForAgentGroupRequest {
+  bytes request_id = 1;
+  string group_name = 2;
+}
+
+message GetAppliedConfigsForAgentGroupResponse {
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+
+  repeated string config_names = 4;
+}
+
+// API: /User/GetAppliedAgentGroupsWithPipelineConfig/
+// API: /User/GetAppliedAgentGroupsWithInstanceConfig/
+message GetAppliedAgentGroupsRequest {
+  bytes request_id = 1;
+  string config_name = 2;
+}
+
+message GetAppliedAgentGroupsResponse {
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+
+  repeated string agent_group_names = 3;
+}
+
+// API: /User/ListAgents/
+
+message ListAgentsRequest {
+  bytes request_id = 1;
+  string group_name = 2;
+}
+
+message ListAgentsResponse {
+  bytes request_id = 1;
+  CommonResponse common_response = 2;
+
+  repeated Agent agents = 3;
+}