fix: fix nginx host tag error

GuanceCloud · Sep 19, 2024 · 4dc62b8 · 4dc62b8
1 parent 8d17788
commit 4dc62b8
Show file tree

Hide file tree

Showing 132 changed files with 81 additions and 107 deletions.
diff --git a/internal/export/doc/en/apis.md b/internal/export/doc/en/apis.md
diff --git a/internal/export/doc/en/changelog.md b/internal/export/doc/en/changelog.md
diff --git a/internal/export/doc/en/confd.md b/internal/export/doc/en/confd.md
diff --git a/internal/export/doc/en/datakit-batch-deploy.md b/internal/export/doc/en/datakit-batch-deploy.md
diff --git a/internal/export/doc/en/datakit-conf.md b/internal/export/doc/en/datakit-conf.md
diff --git a/internal/export/doc/en/datakit-daemonset-deploy.md b/internal/export/doc/en/datakit-daemonset-deploy.md
diff --git a/internal/export/doc/en/datakit-dql-how-to.md b/internal/export/doc/en/datakit-dql-how-to.md
diff --git a/internal/export/doc/en/datakit-filter.md b/internal/export/doc/en/datakit-filter.md
diff --git a/internal/export/doc/en/datakit-input-conf.md b/internal/export/doc/en/datakit-input-conf.md
diff --git a/internal/export/doc/en/datakit-install.md b/internal/export/doc/en/datakit-install.md
diff --git a/internal/export/doc/en/datakit-monitor.md b/internal/export/doc/en/datakit-monitor.md
diff --git a/internal/export/doc/en/datakit-offline-install.md b/internal/export/doc/en/datakit-offline-install.md
diff --git a/internal/export/doc/en/datakit-refer-table.md b/internal/export/doc/en/datakit-refer-table.md
diff --git a/internal/export/doc/en/datakit-service-how-to.md b/internal/export/doc/en/datakit-service-how-to.md
diff --git a/internal/export/doc/en/datakit-tools-how-to.md b/internal/export/doc/en/datakit-tools-how-to.md
diff --git a/internal/export/doc/en/datakit-update.md b/internal/export/doc/en/datakit-update.md
diff --git a/internal/export/doc/en/dca.md b/internal/export/doc/en/dca.md
diff --git a/internal/export/doc/en/development.md b/internal/export/doc/en/development.md
diff --git a/internal/export/doc/en/election.md b/internal/export/doc/en/election.md
diff --git a/internal/export/doc/en/git-config-how-to.md b/internal/export/doc/en/git-config-how-to.md
diff --git a/internal/export/doc/en/inputs/apache.md b/internal/export/doc/en/inputs/apache.md
diff --git a/internal/export/doc/en/inputs/beats_output.md b/internal/export/doc/en/inputs/beats_output.md
diff --git a/internal/export/doc/en/inputs/cassandra.md b/internal/export/doc/en/inputs/cassandra.md
diff --git a/internal/export/doc/en/inputs/clickhousev1.md b/internal/export/doc/en/inputs/clickhousev1.md
diff --git a/internal/export/doc/en/inputs/cloudprober.md b/internal/export/doc/en/inputs/cloudprober.md
diff --git a/internal/export/doc/en/inputs/cockroachdb.md b/internal/export/doc/en/inputs/cockroachdb.md
diff --git a/internal/export/doc/en/inputs/consul.md b/internal/export/doc/en/inputs/consul.md
diff --git a/internal/export/doc/en/inputs/container-log.md b/internal/export/doc/en/inputs/container-log.md
diff --git a/internal/export/doc/en/inputs/container.md b/internal/export/doc/en/inputs/container.md
diff --git a/internal/export/doc/en/inputs/coredns.md b/internal/export/doc/en/inputs/coredns.md
diff --git a/internal/export/doc/en/inputs/cpu.md b/internal/export/doc/en/inputs/cpu.md
diff --git a/internal/export/doc/en/inputs/datakit-logging-how.md b/internal/export/doc/en/inputs/datakit-logging-how.md
diff --git a/internal/export/doc/en/inputs/datakit-logging.md b/internal/export/doc/en/inputs/datakit-logging.md
diff --git a/internal/export/doc/en/inputs/datakit-tracing-introduction.md b/internal/export/doc/en/inputs/datakit-tracing-introduction.md
diff --git a/internal/export/doc/en/inputs/datakit-tracing-struct.md b/internal/export/doc/en/inputs/datakit-tracing-struct.md
diff --git a/internal/export/doc/en/inputs/datakit-tracing.md b/internal/export/doc/en/inputs/datakit-tracing.md
diff --git a/internal/export/doc/en/inputs/db2.md b/internal/export/doc/en/inputs/db2.md
diff --git a/internal/export/doc/en/inputs/ddtrace-cpp.md b/internal/export/doc/en/inputs/ddtrace-cpp.md
diff --git a/internal/export/doc/en/inputs/ddtrace-golang.md b/internal/export/doc/en/inputs/ddtrace-golang.md
diff --git a/internal/export/doc/en/inputs/ddtrace-java.md b/internal/export/doc/en/inputs/ddtrace-java.md
diff --git a/internal/export/doc/en/inputs/ddtrace-nodejs.md b/internal/export/doc/en/inputs/ddtrace-nodejs.md
diff --git a/internal/export/doc/en/inputs/ddtrace-php.md b/internal/export/doc/en/inputs/ddtrace-php.md
diff --git a/internal/export/doc/en/inputs/ddtrace-python.md b/internal/export/doc/en/inputs/ddtrace-python.md
diff --git a/internal/export/doc/en/inputs/ddtrace-ruby.md b/internal/export/doc/en/inputs/ddtrace-ruby.md
diff --git a/internal/export/doc/en/inputs/ddtrace.md b/internal/export/doc/en/inputs/ddtrace.md
diff --git a/internal/export/doc/en/inputs/dialtesting_json.md b/internal/export/doc/en/inputs/dialtesting_json.md
diff --git a/internal/export/doc/en/inputs/disk.md b/internal/export/doc/en/inputs/disk.md
diff --git a/internal/export/doc/en/inputs/diskio.md b/internal/export/doc/en/inputs/diskio.md
diff --git a/internal/export/doc/en/inputs/doc-logging.md b/internal/export/doc/en/inputs/doc-logging.md
diff --git a/internal/export/doc/en/inputs/doris.md b/internal/export/doc/en/inputs/doris.md
diff --git a/internal/export/doc/en/inputs/ebpf.md b/internal/export/doc/en/inputs/ebpf.md
diff --git a/internal/export/doc/en/inputs/elasticsearch.md b/internal/export/doc/en/inputs/elasticsearch.md
diff --git a/internal/export/doc/en/inputs/etcd.md b/internal/export/doc/en/inputs/etcd.md
diff --git a/internal/export/doc/en/inputs/external.md b/internal/export/doc/en/inputs/external.md
diff --git a/internal/export/doc/en/inputs/flinkv1.md b/internal/export/doc/en/inputs/flinkv1.md
diff --git a/internal/export/doc/en/inputs/gitlab.md b/internal/export/doc/en/inputs/gitlab.md
diff --git a/internal/export/doc/en/inputs/gpu_smi.md b/internal/export/doc/en/inputs/gpu_smi.md
diff --git a/internal/export/doc/en/inputs/host_processes.md b/internal/export/doc/en/inputs/host_processes.md
diff --git a/internal/export/doc/en/inputs/hostdir.md b/internal/export/doc/en/inputs/hostdir.md
diff --git a/internal/export/doc/en/inputs/hostobject.md b/internal/export/doc/en/inputs/hostobject.md
diff --git a/internal/export/doc/en/inputs/iis.md b/internal/export/doc/en/inputs/iis.md
diff --git a/internal/export/doc/en/inputs/influxdb.md b/internal/export/doc/en/inputs/influxdb.md
diff --git a/internal/export/doc/en/inputs/ipmi.md b/internal/export/doc/en/inputs/ipmi.md
diff --git a/internal/export/doc/en/inputs/jaeger.md b/internal/export/doc/en/inputs/jaeger.md
diff --git a/internal/export/doc/en/inputs/jenkins.md b/internal/export/doc/en/inputs/jenkins.md
diff --git a/internal/export/doc/en/inputs/jvm.md b/internal/export/doc/en/inputs/jvm.md
diff --git a/internal/export/doc/en/inputs/kafka.md b/internal/export/doc/en/inputs/kafka.md
diff --git a/internal/export/doc/en/inputs/kafkamq.md b/internal/export/doc/en/inputs/kafkamq.md
diff --git a/internal/export/doc/en/inputs/kubernetes-crd.md b/internal/export/doc/en/inputs/kubernetes-crd.md
diff --git a/internal/export/doc/en/inputs/kubernetes-prom.md b/internal/export/doc/en/inputs/kubernetes-prom.md
diff --git a/internal/export/doc/en/inputs/kubernetes-prometheus-operator-crd.md b/internal/export/doc/en/inputs/kubernetes-prometheus-operator-crd.md
diff --git a/internal/export/doc/en/inputs/logfwd.md b/internal/export/doc/en/inputs/logfwd.md
diff --git a/internal/export/doc/en/inputs/logfwdserver.md b/internal/export/doc/en/inputs/logfwdserver.md
diff --git a/internal/export/doc/en/inputs/logging-pipeline-bench.md b/internal/export/doc/en/inputs/logging-pipeline-bench.md
diff --git a/internal/export/doc/en/inputs/logging.md b/internal/export/doc/en/inputs/logging.md
diff --git a/internal/export/doc/en/inputs/logging_socket.md b/internal/export/doc/en/inputs/logging_socket.md
diff --git a/internal/export/doc/en/inputs/logstreaming.md b/internal/export/doc/en/inputs/logstreaming.md
diff --git a/internal/export/doc/en/inputs/mem.md b/internal/export/doc/en/inputs/mem.md
diff --git a/internal/export/doc/en/inputs/memcached.md b/internal/export/doc/en/inputs/memcached.md
diff --git a/internal/export/doc/en/inputs/mongodb.md b/internal/export/doc/en/inputs/mongodb.md
diff --git a/internal/export/doc/en/inputs/mysql.md b/internal/export/doc/en/inputs/mysql.md
diff --git a/internal/export/doc/en/inputs/net.md b/internal/export/doc/en/inputs/net.md
diff --git a/internal/export/doc/en/inputs/netflow.md b/internal/export/doc/en/inputs/netflow.md
diff --git a/internal/export/doc/en/inputs/netstat.md b/internal/export/doc/en/inputs/netstat.md
diff --git a/internal/export/doc/en/inputs/nginx.md b/internal/export/doc/en/inputs/nginx.md
diff --git a/internal/export/doc/en/inputs/nsq.md b/internal/export/doc/en/inputs/nsq.md
diff --git a/internal/export/doc/en/inputs/oceanbase.md b/internal/export/doc/en/inputs/oceanbase.md
diff --git a/internal/export/doc/en/inputs/opentelemetry-go.md b/internal/export/doc/en/inputs/opentelemetry-go.md
diff --git a/internal/export/doc/en/inputs/opentelemetry-java.md b/internal/export/doc/en/inputs/opentelemetry-java.md
diff --git a/internal/export/doc/en/inputs/opentelemetry.md b/internal/export/doc/en/inputs/opentelemetry.md
diff --git a/internal/export/doc/en/inputs/oracle.md b/internal/export/doc/en/inputs/oracle.md
diff --git a/internal/export/doc/en/inputs/postgresql.md b/internal/export/doc/en/inputs/postgresql.md
diff --git a/internal/export/doc/en/inputs/profile.md b/internal/export/doc/en/inputs/profile.md
diff --git a/internal/export/doc/en/inputs/prom.md b/internal/export/doc/en/inputs/prom.md
diff --git a/internal/export/doc/en/inputs/prom_remote_write.md b/internal/export/doc/en/inputs/prom_remote_write.md
diff --git a/internal/export/doc/en/inputs/promtail.md b/internal/export/doc/en/inputs/promtail.md
diff --git a/internal/export/doc/en/inputs/proxy.md b/internal/export/doc/en/inputs/proxy.md
diff --git a/internal/export/doc/en/inputs/python-profiling.md b/internal/export/doc/en/inputs/python-profiling.md
diff --git a/internal/export/doc/en/inputs/rabbitmq.md b/internal/export/doc/en/inputs/rabbitmq.md
diff --git a/internal/export/doc/en/inputs/redis.md b/internal/export/doc/en/inputs/redis.md
diff --git a/internal/export/doc/en/inputs/rum.md b/internal/export/doc/en/inputs/rum.md
diff --git a/internal/export/doc/en/inputs/sec-checker.md b/internal/export/doc/en/inputs/sec-checker.md
diff --git a/internal/export/doc/en/inputs/sensors.md b/internal/export/doc/en/inputs/sensors.md
diff --git a/internal/export/doc/en/inputs/skywalking.md b/internal/export/doc/en/inputs/skywalking.md
diff --git a/internal/export/doc/en/inputs/smart.md b/internal/export/doc/en/inputs/smart.md
diff --git a/internal/export/doc/en/inputs/snmp.md b/internal/export/doc/en/inputs/snmp.md
diff --git a/internal/export/doc/en/inputs/socket.md b/internal/export/doc/en/inputs/socket.md
diff --git a/internal/export/doc/en/inputs/solr.md b/internal/export/doc/en/inputs/solr.md
diff --git a/internal/export/doc/en/inputs/sqlserver.md b/internal/export/doc/en/inputs/sqlserver.md
diff --git a/internal/export/doc/en/inputs/ssh.md b/internal/export/doc/en/inputs/ssh.md
diff --git a/internal/export/doc/en/inputs/statsd.md b/internal/export/doc/en/inputs/statsd.md
diff --git a/internal/export/doc/en/inputs/swap.md b/internal/export/doc/en/inputs/swap.md
diff --git a/internal/export/doc/en/inputs/system.md b/internal/export/doc/en/inputs/system.md
diff --git a/internal/export/doc/en/inputs/tdengine.md b/internal/export/doc/en/inputs/tdengine.md
diff --git a/internal/export/doc/en/inputs/telegraf.md b/internal/export/doc/en/inputs/telegraf.md
diff --git a/internal/export/doc/en/inputs/tomcat.md b/internal/export/doc/en/inputs/tomcat.md
diff --git a/internal/export/doc/en/inputs/windows_event.md b/internal/export/doc/en/inputs/windows_event.md
diff --git a/internal/export/doc/en/inputs/zipkin.md b/internal/export/doc/en/inputs/zipkin.md
diff --git a/internal/export/doc/en/k8s-config-how-to.md b/internal/export/doc/en/k8s-config-how-to.md
diff --git a/internal/export/doc/en/why-no-data.md b/internal/export/doc/en/why-no-data.md
diff --git a/internal/export/doc/zh/inputs/datakit-trace-performance.md b/internal/export/doc/zh/inputs/datakit-trace-performance.md
diff --git a/internal/plugins/inputs/nginx/cfg.go b/internal/plugins/inputs/nginx/cfg.go
@@ -65,6 +65,7 @@ type Input struct {
 	UsePlusAPI      bool              `toml:"use_plus_api"`
 	Log             *ngxlog           `toml:"log"`
 	Tags            map[string]string `toml:"tags"`
+	mergedTags      map[string]string
 
 	UpState int
 

diff --git a/internal/plugins/inputs/nginx/collector.go b/internal/plugins/inputs/nginx/collector.go
@@ -105,7 +105,7 @@ func (ipt *Input) getStubStatusModuleMetric(port int) {
 
 	kvs := make(point.KVs, 0, 9)
 	opts := point.DefaultMetricOptions()
-	opts = append(opts, point.WithTime(ipt.start))
+	opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 	for k, v := range ipt.Tags {
 		kvs = kvs.MustAddTag(k, v)
@@ -176,7 +176,7 @@ func (ipt *Input) handVTSResponse(r io.Reader, port int) {
 func (ipt *Input) makeConnectionsLine(vtsResp NginxVTSResponse) {
 	kvs := make(point.KVs, 0, 12)
 	opts := point.DefaultMetricOptions()
-	opts = append(opts, point.WithTime(ipt.start))
+	opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 	for k, v := range vtsResp.tags {
 		kvs = kvs.MustAddTag(k, v)
@@ -198,7 +198,7 @@ func (ipt *Input) makeServerZoneLine(vtsResp NginxVTSResponse) {
 	for k, v := range vtsResp.ServerZones {
 		kvs := make(point.KVs, 0, 13)
 		opts := point.DefaultMetricOptions()
-		opts = append(opts, point.WithTime(ipt.start))
+		opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 		for kk, vv := range vtsResp.tags {
 			kvs = kvs.MustAddTag(kk, vv)
@@ -223,7 +223,7 @@ func (ipt *Input) makeUpstreamZoneLine(vtsResp NginxVTSResponse) {
 		for _, upstream := range upstreams {
 			kvs := make(point.KVs, 0, 14)
 			opts := point.DefaultMetricOptions()
-			opts = append(opts, point.WithTime(ipt.start))
+			opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 			for kk, vv := range vtsResp.tags {
 				kvs = kvs.MustAddTag(kk, vv)
@@ -249,7 +249,7 @@ func (ipt *Input) makeCacheZoneLine(vtsResp NginxVTSResponse) {
 	for cacheName, cacheZone := range vtsResp.CacheZones {
 		kvs := make(point.KVs, 0, 17)
 		opts := point.DefaultMetricOptions()
-		opts = append(opts, point.WithTime(ipt.start))
+		opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 		for kk, vv := range vtsResp.tags {
 			kvs = kvs.MustAddTag(kk, vv)
@@ -341,7 +341,7 @@ func (ipt *Input) handlePlusAPIResponse(r io.Reader, plusAPIResp *NginxPlusAPIRe
 func (ipt *Input) makeNginxLine(plusAPIResp NginxPlusAPIResponse) {
 	kvs := make(point.KVs, 0, 10)
 	opts := point.DefaultMetricOptions()
-	opts = append(opts, point.WithTime(ipt.start))
+	opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 	for k, v := range plusAPIResp.tags {
 		kvs = kvs.MustAddTag(k, v)
@@ -358,7 +358,7 @@ func (ipt *Input) makeServerLine(plusAPIResp NginxPlusAPIResponse) {
 	for k, v := range plusAPIResp.Servers {
 		kvs := make(point.KVs, 0, 20)
 		opts := point.DefaultMetricOptions()
-		opts = append(opts, point.WithTime(ipt.start))
+		opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 		for kk, vv := range plusAPIResp.tags {
 			kvs = kvs.MustAddTag(kk, vv)
@@ -392,7 +392,7 @@ func (ipt *Input) makeUpStreamLine(plusAPIResp NginxPlusAPIResponse) {
 		for _, upstream := range upstreams.Peers {
 			kvs := make(point.KVs, 0, 20)
 			opts := point.DefaultMetricOptions()
-			opts = append(opts, point.WithTime(ipt.start))
+			opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 			for kk, vv := range plusAPIResp.tags {
 				kvs = kvs.MustAddTag(kk, vv)
@@ -424,7 +424,7 @@ func (ipt *Input) makeCacheLine(plusAPIResp NginxPlusAPIResponse) {
 	for k, v := range plusAPIResp.Caches {
 		kvs := make(point.KVs, 0, 15)
 		opts := point.DefaultMetricOptions()
-		opts = append(opts, point.WithTime(ipt.start))
+		opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 		for kk, vv := range plusAPIResp.tags {
 			kvs = kvs.MustAddTag(kk, vv)
@@ -450,7 +450,7 @@ func (ipt *Input) makeLocationLine(plusAPIResp NginxPlusAPIResponse) {
 	for locationName, location := range plusAPIResp.Locations {
 		kvs := make(point.KVs, 0, 20)
 		opts := point.DefaultMetricOptions()
-		opts = append(opts, point.WithTime(ipt.start))
+		opts = append(opts, point.WithTime(ipt.start), point.WithExtraTags(ipt.mergedTags))
 
 		for kk, vv := range plusAPIResp.tags {
 			kvs = kvs.MustAddTag(kk, vv)

diff --git a/internal/plugins/inputs/nginx/export.go b/internal/plugins/inputs/nginx/export.go
diff --git a/internal/plugins/inputs/nginx/input.go b/internal/plugins/inputs/nginx/input.go
@@ -188,6 +188,14 @@ func (ipt *Input) Run() {
 	tick := time.NewTicker(ipt.Interval)
 	defer tick.Stop()
 
+	if ipt.Election {
+		ipt.mergedTags = inputs.MergeTags(ipt.Tagger.ElectionTags(), ipt.Tags, ipt.URL)
+	} else {
+		ipt.mergedTags = inputs.MergeTags(ipt.Tagger.HostTags(), ipt.Tags, ipt.URL)
+	}
+
+	l.Infof("merged tags: %+#v", ipt.mergedTags)
+
 	for {
 		if ipt.pause {
 			l.Debugf("not leader, skipped")

diff --git a/internal/plugins/inputs/postgresql/customer_object.go b/internal/plugins/inputs/postgresql/customer_object.go
@@ -7,29 +7,21 @@ package postgresql
 
 import (
 	"github.com/GuanceCloud/cliutils/point"
-	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/datakit"
 	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/plugins/inputs"
 )
 
 type customerObjectMeasurement struct {
-	name     string
-	tags     map[string]string
-	fields   map[string]interface{}
-	election bool
+	name   string
+	tags   map[string]string
+	fields map[string]interface{}
+	ipt    *Input
 }
 
 // Point implement MeasurementV2.
 func (m *customerObjectMeasurement) Point() *point.Point {
-	opts := point.DefaultObjectOptions()
-	if m.election {
-		opts = append(opts,
-			point.WithExtraTags(datakit.GlobalElectionTags()),
-		)
-		point.DefaultObjectOptions()
-	}
 	return point.NewPointV2(m.name,
 		append(point.NewTags(m.tags), point.NewKVs(m.fields)...),
-		opts...)
+		append(point.DefaultObjectOptions(), point.WithExtraTags(m.ipt.mergedTags))...)
 }
 
 //nolint:lll

diff --git a/internal/plugins/inputs/postgresql/customer_object_helpers.go b/internal/plugins/inputs/postgresql/customer_object_helpers.go
@@ -70,10 +70,10 @@ func (ipt *Input) getCoPointByColErr() []*gcPoint.Point {
 			"col_co_status": ipt.CollectCoStatus,
 		}
 		m := &customerObjectMeasurement{
-			name:     "database",
-			tags:     tags,
-			fields:   fields,
-			election: ipt.Election,
+			name:   "database",
+			tags:   tags,
+			fields: fields,
+			ipt:    ipt,
 		}
 		ipt.setIptLastCOInfo(m)
 		ms = append(ms, m)
@@ -170,10 +170,10 @@ func (ipt *Input) collectCustomerObjectMeasurement() ([]*gcPoint.Point, error) {
 		"col_co_status": ipt.CollectCoStatus,
 	}
 	m := &customerObjectMeasurement{
-		name:     "database",
-		tags:     tags,
-		fields:   fields,
-		election: ipt.Election,
+		name:   "database",
+		tags:   tags,
+		fields: fields,
+		ipt:    ipt,
 	}
 	ipt.setIptLastCOInfo(m)
 	ms = append(ms, m)

diff --git a/internal/plugins/inputs/postgresql/input.go b/internal/plugins/inputs/postgresql/input.go
@@ -192,9 +192,10 @@ type Input struct {
 	Databases        []string          `toml:"databases"`
 	Interval         string            `toml:"interval"`
 	Tags             map[string]string `toml:"tags"`
-	Relations        []Relation        `toml:"relations"`
-	CustomQuery      []*customQuery    `toml:"custom_queries"`
-	Log              *postgresqllog    `toml:"log"`
+	mergedTags       map[string]string
+	Relations        []Relation     `toml:"relations"`
+	CustomQuery      []*customQuery `toml:"custom_queries"`
+	Log              *postgresqllog `toml:"log"`
 
 	Version            string
 	Uptime             int
@@ -832,11 +833,11 @@ func (ipt *Input) accRow(columnMap map[string]*interface{}, measurementInfo *inp
 			name = measurementInfo.Name
 		}
 		ms := &inputMeasurement{
-			name:     name,
-			fields:   fields,
-			tags:     tags,
-			ts:       time.Now(),
-			election: ipt.Election,
+			name:   name,
+			fields: fields,
+			tags:   tags,
+			ts:     time.Now(),
+			ipt:    ipt,
 		}
 		ipt.collectCache = append(ipt.collectCache, ms.Point())
 	}
@@ -912,6 +913,14 @@ func (ipt *Input) init() error {
 	ipt.Tags["server"] = tagAddress
 	ipt.Tags["db"] = dbName
 
+	if ipt.Election {
+		ipt.mergedTags = inputs.MergeTags(ipt.tagger.ElectionTags(), ipt.Tags, ipt.Address)
+	} else {
+		ipt.mergedTags = inputs.MergeTags(ipt.tagger.HostTags(), ipt.Tags, ipt.Address)
+	}
+
+	l.Infof("merged tags: %+#v", ipt.mergedTags)
+
 	// init query cache
 	ipt.metricQueryCache = map[string]*queryCacheItem{}
 

diff --git a/internal/plugins/inputs/postgresql/input_unit_test.go b/internal/plugins/inputs/postgresql/input_unit_test.go
@@ -129,9 +129,9 @@ func getTrueData(mockFields map[string]interface{}) map[string]interface{} {
 }
 
 func TestCollect(t *testing.T) {
-	input := &Input{
-		version: &semver.Version{Major: 12},
-	}
+	input := defaultInput()
+
+	input.version = &semver.Version{Major: 12}
 	input.service = &MockCollectService{}
 	err := input.Collect()
 	if err != nil {

diff --git a/internal/plugins/inputs/postgresql/metric_fields.go b/internal/plugins/inputs/postgresql/metric_fields.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/GuanceCloud/cliutils/point"
 
-	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/datakit"
 	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/plugins/inputs"
 )
 
@@ -109,20 +108,16 @@ WHERE %s
 }
 
 type inputMeasurement struct {
-	name     string
-	tags     map[string]string
-	fields   map[string]interface{}
-	ts       time.Time
-	election bool
+	name   string
+	tags   map[string]string
+	fields map[string]interface{}
+	ts     time.Time
+	ipt    *Input
 }
 
 // Point implement MeasurementV2.
 func (m *inputMeasurement) Point() *point.Point {
-	opts := point.DefaultMetricOptions()
-
-	if m.election {
-		opts = append(opts, point.WithExtraTags(datakit.GlobalElectionTags()))
-	}
+	opts := append(point.DefaultMetricOptions(), point.WithExtraTags(m.ipt.mergedTags))
 
 	return point.NewPointV2(m.name,
 		append(point.NewTags(m.tags), point.NewKVs(m.fields)...),

diff --git a/internal/plugins/inputs/postgresql/metric_up.go b/internal/plugins/inputs/postgresql/metric_up.go
@@ -7,28 +7,21 @@ package postgresql
 
 import (
 	"github.com/GuanceCloud/cliutils/point"
-	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/datakit"
 	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/plugins/inputs"
 )
 
 type upMeasurement struct {
-	name     string
-	tags     map[string]string
-	fields   map[string]interface{}
-	election bool
+	name   string
+	tags   map[string]string
+	fields map[string]interface{}
+	ipt    *Input
 }
 
 // Point implement MeasurementV2.
 func (m *upMeasurement) Point() *point.Point {
-	opts := point.DefaultMetricOptions()
-
-	if m.election {
-		opts = append(opts, point.WithExtraTags(datakit.GlobalElectionTags()))
-	}
-
 	return point.NewPointV2(m.name,
 		append(point.NewTags(m.tags), point.NewKVs(m.fields)...),
-		opts...)
+		append(point.DefaultMetricOptions(), point.WithExtraTags(m.ipt.mergedTags))...)
 }
 
 func (m *upMeasurement) Info() *inputs.MeasurementInfo { //nolint:funlen

diff --git a/internal/plugins/inputs/postgresql/metric_up_helpers.go b/internal/plugins/inputs/postgresql/metric_up_helpers.go
@@ -10,13 +10,11 @@ import (
 	"net"
 	"net/url"
 	"strconv"
-	"time"
 
 	"github.com/GuanceCloud/cliutils/point"
 
 	dkio "gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/io"
 	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/metrics"
-	"gitlab.jiagouyun.com/cloudcare-tools/datakit/internal/plugins/inputs"
 )
 
 func (ipt *Input) setUpState() {
@@ -51,8 +49,7 @@ func (ipt *Input) getUpInstance() string {
 	return ipPort
 }
 
-func (ipt *Input) buildUpPoints() ([]*point.Point, error) {
-	ms := []inputs.MeasurementV2{}
+func (ipt *Input) buildUpPoints() *point.Point {
 	tags := map[string]string{
 		"job":      ipt.getUpJob(),
 		"instance": ipt.getUpInstance(),
@@ -61,49 +58,28 @@ func (ipt *Input) buildUpPoints() ([]*point.Point, error) {
 		"up": ipt.UpState,
 	}
 	m := &upMeasurement{
-		name:     "collector",
-		tags:     tags,
-		fields:   fields,
-		election: ipt.Election,
-	}
-	l.Debugf("build up %s points:%s", inputName, m.Point().LineProto())
-	ms = append(ms, m)
-	if len(ms) > 0 {
-		pts := getPointsFromMeasurement2(ms)
-		for k, v := range ipt.Tags {
-			for _, pt := range pts {
-				pt.AddTag(k, v)
-			}
-		}
-		return pts, nil
+		name:   "collector",
+		tags:   tags,
+		fields: fields,
+		ipt:    ipt,
 	}
 
-	return []*point.Point{}, nil
+	return m.Point()
 }
 
-func getPointsFromMeasurement2(ms []inputs.MeasurementV2) []*point.Point {
-	pts := []*point.Point{}
-	for _, m := range ms {
-		pts = append(pts, m.Point())
-	}
+func (ipt *Input) FeedUpMetric() {
+	pt := ipt.buildUpPoints()
 
-	return pts
-}
+	l.Debug("feed up metric")
 
-func (ipt *Input) FeedUpMetric() {
-	pts, _ := ipt.buildUpPoints()
-	if len(pts) > 0 {
-		l.Debug("feed up metric")
-		if err := ipt.feeder.FeedV2(point.Metric, pts,
-			dkio.WithCollectCost(time.Since(time.Now())),
-			dkio.WithElection(ipt.Election),
-			dkio.WithInputName(inputName),
-		); err != nil {
-			ipt.feeder.FeedLastError(err.Error(),
-				metrics.WithLastErrorInput(inputName),
-				metrics.WithLastErrorCategory(point.Metric),
-			)
-			l.Errorf("feed : %s", err)
-		}
+	if err := ipt.feeder.FeedV2(point.Metric, []*point.Point{pt},
+		dkio.WithElection(ipt.Election),
+		dkio.WithInputName(inputName),
+	); err != nil {
+		ipt.feeder.FeedLastError(err.Error(),
+			metrics.WithLastErrorInput(inputName),
+			metrics.WithLastErrorCategory(point.Metric),
+		)
+		l.Errorf("feed : %s", err)
 	}
 }