pushgateway接口支持用户指定值置换agent_hostname

flashcatcloud · Jun 27, 2024 · e83f201 · e83f201 · tianyanli · Jun 27, 2024
1 parent b657029
commit e83f201
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/api/router_pushgateway.go b/api/router_pushgateway.go
@@ -70,6 +70,11 @@ func pushgateway(c *gin.Context) {
 
 	ignoreHostname := config.Config.HTTP.IgnoreHostname || c.GetBool("ignore_hostname")
 	ignoreGlobalLabels := config.Config.HTTP.IgnoreGlobalLabels || c.GetBool("ignore_global_labels")
+	// 获取 AgentHostTag 的值
+	AgentHostTag := config.Config.HTTP.AgentHostTag
+	if AgentHostTag == "" {
+		AgentHostTag = c.GetString("agent_host_tag")
+	}
 
 	now := time.Now()
 
@@ -92,13 +97,20 @@ func pushgateway(c *gin.Context) {
 		// add url labels
 		for k, v := range labels {
 			samples[i].Labels[k] = v
+
 		}
 
 		// add label: agent_hostname
-		if _, has := samples[i].Labels[agentHostnameLabelKey]; !has && !ignoreHostname {
-			samples[i].Labels[agentHostnameLabelKey] = config.Config.GetHostname()
+		if !ignoreHostname {
+			if _, has := samples[i].Labels[agentHostnameLabelKey]; !has && AgentHostTag == "" {
+				samples[i].Labels[agentHostnameLabelKey] = config.Config.GetHostname()
+			} else if AgentHostTag != "" {
+				// 从当前现有的 Labels 中找到 key 等于 config.Config.HTTP.AgentHostTag 的值并置换到agent_hostname
+				if value, exists := samples[i].Labels[AgentHostTag]; exists {
+					samples[i].Labels[agentHostnameLabelKey] = value
+				}
+			}
 		}
-
 	}
 	writer.WriteSamples(samples)
 	c.String(200, "forwarding...")

diff --git a/conf/config.toml b/conf/config.toml
@@ -84,6 +84,7 @@ address = ":9100"
 print_access = false
 run_mode = "release"
 ignore_hostname = false
+agent_host_tag = ""
 ignore_global_labels = false
 
 [ibex]

diff --git a/config/config.go b/config/config.go
@@ -66,11 +66,13 @@ type WriterOption struct {
 }
 
 type HTTP struct {
-	Enable             bool   `toml:"enable"`
-	Address            string `toml:"address"`
-	PrintAccess        bool   `toml:"print_access"`
-	RunMode            string `toml:"run_mode"`
-	IgnoreHostname     bool   `toml:"ignore_hostname"`
+	Enable         bool   `toml:"enable"`
+	Address        string `toml:"address"`
+	PrintAccess    bool   `toml:"print_access"`
+	RunMode        string `toml:"run_mode"`
+	IgnoreHostname bool   `toml:"ignore_hostname"`
+	// The tag used to name the agent host
+	AgentHostTag       string `toml:"agent_host_tag"`
 	IgnoreGlobalLabels bool   `toml:"ignore_global_labels"`
 	CertFile           string `toml:"cert_file"`
 	KeyFile            string `toml:"key_file"`