Optional postgres server/address tags

plugins/inputs/postgresql/postgresql.go

@@ -20,6 +20,7 @@ type Postgresql struct {
 	OrderedColumns   []string
 	AllColumns       []string
 	sanitizedAddress string
+	AddressTag       bool `toml:"address_tag"`
 }
 
 var ignoredColumns = map[string]bool{"datid": true, "datname": true, "stats_reset": true}
@@ -43,6 +44,9 @@ var sampleConfig = `
   ## A list of databases to pull metrics about. If not specified, metrics for all
   ## databases are gathered.
   # databases = ["app_production", "testing"]
+  ## Toggle adding a server:canonicalizedAddress tag to the measurment. If not 
+  ## specified, it's enabled by default.
+  # address_tag = true|false
 `
 
 func (p *Postgresql) SampleConfig() string {
@@ -185,13 +189,16 @@ func (p *Postgresql) accRow(row scanner, acc telegraf.Accumulator) error {
 		dbname.WriteString("postgres")
 	}
 
-	var tagAddress string
-	tagAddress, err = p.SanitizedAddress()
-	if err != nil {
-		return err
-	}
+	tags := map[string]string{"db": dbname.String()}
 
-	tags := map[string]string{"server": tagAddress, "db": dbname.String()}
+	if p.AddressTag {
+		var tagAddress string
+		tagAddress, err = p.SanitizedAddress()
+		if err != nil {
+			return err
+		}
+		tags["server"] = tagAddress
+	}
 
 	fields := make(map[string]interface{})
 	for col, val := range columnMap {
@@ -207,6 +214,6 @@ func (p *Postgresql) accRow(row scanner, acc telegraf.Accumulator) error {
 
 func init() {
 	inputs.Add("postgresql", func() telegraf.Input {
-		return &Postgresql{}
+		return &Postgresql{AddressTag: true}
 	})
 }

plugins/inputs/postgresql/postgresql_test.go

@@ -102,6 +102,49 @@ func TestPostgresqlTagsMetricsWithDatabaseName(t *testing.T) {
 	assert.Equal(t, "postgres", point.Tags["db"])
 }
 
+func TestPostgresqlTagsMetricsWithServerTag(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+	address := fmt.Sprintf("host=%s user=postgres sslmode=disable",
+		testutil.GetLocalHost())
+	p := &Postgresql{
+		Address:    address,
+		AddressTag: true,
+	}
+
+	var acc testutil.Accumulator
+
+	err := p.Gather(&acc)
+	require.NoError(t, err)
+
+	point, ok := acc.Get("postgresql")
+	require.True(t, ok)
+	fmt.Println(point.Tags)
+	assert.Equal(t, address, point.Tags["server"])
+}
+
+func TestPostgresqlTagsMetricsWithoutServerTag(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping integration test in short mode")
+	}
+
+	p := &Postgresql{
+		Address: fmt.Sprintf("host=%s user=postgres sslmode=disable",
+			testutil.GetLocalHost()),
+		AddressTag: false,
+	}
+
+	var acc testutil.Accumulator
+
+	err := p.Gather(&acc)
+	require.NoError(t, err)
+
+	point, ok := acc.Get("postgresql")
+	require.True(t, ok)
+	assert.Equal(t, "", point.Tags["server"])
+}
+
 func TestPostgresqlDefaultsToAllDatabases(t *testing.T) {
 	if testing.Short() {
 		t.Skip("Skipping integration test in short mode")