feat: add labels defined in harvest config to metadata metrics

cmd/poller/collector/collector.go

@@ -217,6 +217,12 @@ func Init(c Collector) error {
 	md.SetGlobalLabel("object", object)
 	md.SetGlobalLabel("datacenter", params.GetChildContentS("datacenter"))
 
+	if params.HasChildS("labels") {
+		for _, l := range params.GetChildS("labels").GetChildren() {
+			md.SetGlobalLabel(l.GetNameS(), l.GetContentS())
+		}
+	}
+
 	_, _ = md.NewMetricInt64("poll_time")
 	_, _ = md.NewMetricInt64("task_time")
 	_, _ = md.NewMetricInt64("api_time")

cmd/poller/exporter/exporter.go

@@ -22,8 +22,8 @@ import (
 type Exporter interface {
 	Init() error      // initialize exporter
 	GetClass() string // the class of the exporter, e.g. Prometheus, InfluxDB
-	GetName() string  // the name of the exporter instance
-	// Name is different from Class, since we can have multiple instances of the same Class
+	// GetName is different from Class, since we can have multiple instances of the same Class
+	GetName() string                    // the name of the exporter instance
 	GetExportCount() uint64             // return and reset number of exported data points, used by Poller to keep stats
 	AddExportCount(uint64)              // add count to the export count, called by the exporter itself
 	GetStatus() (uint8, string, string) // return current state of the exporter
@@ -72,6 +72,12 @@ func New(c, n string, o *options.Options, p conf.Exporter, params *conf.Poller)
 	}
 	if params != nil {
 		abc.Metadata.SetGlobalLabel("datacenter", params.Datacenter)
+		labels := params.Labels
+		if labels != nil {
+			for _, labelPtr := range *labels {
+				abc.Metadata.SetGlobalLabels(labelPtr)
+			}
+		}
 	}
 	return &abc
 }

cmd/poller/poller.go

@@ -931,6 +931,13 @@ func (p *Poller) loadMetadata() {
 	if p.options.PromPort != 0 {
 		p.status.SetGlobalLabel("promport", strconv.Itoa(p.options.PromPort))
 	}
+	labels := p.params.Labels
+	if labels != nil {
+		for _, labelPtr := range *labels {
+			p.metadata.SetGlobalLabels(labelPtr)
+			p.status.SetGlobalLabels(labelPtr)
+		}
+	}
 	p.status.SetExportOptions(matrix.DefaultExportOptions())
 }
 

pkg/conf/conf.go

@@ -421,32 +421,32 @@ type CertificateScript struct {
 }
 
 type Poller struct {
-	Addr              string                `yaml:"addr,omitempty"`
-	APIVersion        string                `yaml:"api_version,omitempty"`
-	APIVfiler         string                `yaml:"api_vfiler,omitempty"`
-	AuthStyle         string                `yaml:"auth_style,omitempty"`
-	CaCertPath        string                `yaml:"ca_cert,omitempty"`
-	ClientTimeout     string                `yaml:"client_timeout,omitempty"`
-	Collectors        []Collector           `yaml:"collectors,omitempty"`
-	CredentialsFile   string                `yaml:"credentials_file,omitempty"`
-	CredentialsScript CredentialsScript     `yaml:"credentials_script,omitempty"`
-	CertificateScript CertificateScript     `yaml:"certificate_script,omitempty"`
-	Datacenter        string                `yaml:"datacenter,omitempty"`
-	Exporters         []string              `yaml:"exporters,omitempty"`
-	IsKfs             bool                  `yaml:"is_kfs,omitempty"`
-	Labels            *[]*map[string]string `yaml:"labels,omitempty"`
-	LogMaxBytes       int64                 `yaml:"log_max_bytes,omitempty"`
-	LogMaxFiles       int                   `yaml:"log_max_files,omitempty"`
-	LogSet            *[]string             `yaml:"log,omitempty"`
-	Password          string                `yaml:"password,omitempty"`
-	PollerSchedule    string                `yaml:"poller_schedule,omitempty"`
-	SslCert           string                `yaml:"ssl_cert,omitempty"`
-	SslKey            string                `yaml:"ssl_key,omitempty"`
-	TLSMinVersion     string                `yaml:"tls_min_version,omitempty"`
-	UseInsecureTLS    *bool                 `yaml:"use_insecure_tls,omitempty"`
-	Username          string                `yaml:"username,omitempty"`
-	PreferZAPI        bool                  `yaml:"prefer_zapi,omitempty"`
-	ConfPath          string                `yaml:"conf_path,omitempty"`
+	Addr              string               `yaml:"addr,omitempty"`
+	APIVersion        string               `yaml:"api_version,omitempty"`
+	APIVfiler         string               `yaml:"api_vfiler,omitempty"`
+	AuthStyle         string               `yaml:"auth_style,omitempty"`
+	CaCertPath        string               `yaml:"ca_cert,omitempty"`
+	ClientTimeout     string               `yaml:"client_timeout,omitempty"`
+	Collectors        []Collector          `yaml:"collectors,omitempty"`
+	CredentialsFile   string               `yaml:"credentials_file,omitempty"`
+	CredentialsScript CredentialsScript    `yaml:"credentials_script,omitempty"`
+	CertificateScript CertificateScript    `yaml:"certificate_script,omitempty"`
+	Datacenter        string               `yaml:"datacenter,omitempty"`
+	Exporters         []string             `yaml:"exporters,omitempty"`
+	IsKfs             bool                 `yaml:"is_kfs,omitempty"`
+	Labels            *[]map[string]string `yaml:"labels,omitempty"`
+	LogMaxBytes       int64                `yaml:"log_max_bytes,omitempty"`
+	LogMaxFiles       int                  `yaml:"log_max_files,omitempty"`
+	LogSet            *[]string            `yaml:"log,omitempty"`
+	Password          string               `yaml:"password,omitempty"`
+	PollerSchedule    string               `yaml:"poller_schedule,omitempty"`
+	SslCert           string               `yaml:"ssl_cert,omitempty"`
+	SslKey            string               `yaml:"ssl_key,omitempty"`
+	TLSMinVersion     string               `yaml:"tls_min_version,omitempty"`
+	UseInsecureTLS    *bool                `yaml:"use_insecure_tls,omitempty"`
+	Username          string               `yaml:"username,omitempty"`
+	PreferZAPI        bool                 `yaml:"prefer_zapi,omitempty"`
+	ConfPath          string               `yaml:"conf_path,omitempty"`
 	promIndex         int
 	Name              string
 }