From 7be74816a250f6cca7fc095108446c9e97d8ebe5 Mon Sep 17 00:00:00 2001
From: Daniel Nelson <daniel.nelson@influxdb.com>
Date: Wed, 5 Jun 2019 12:47:17 -0700
Subject: [PATCH] Add source tag to hddtemp plugin (#5955)

---
 plugins/inputs/hddtemp/README.md       | 54 +++++++++++++-------------
 plugins/inputs/hddtemp/hddtemp.go      |  9 ++++-
 plugins/inputs/hddtemp/hddtemp_test.go |  3 ++
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/plugins/inputs/hddtemp/README.md b/plugins/inputs/hddtemp/README.md
index 3bafb4f21..d2d3e4f13 100644
--- a/plugins/inputs/hddtemp/README.md
+++ b/plugins/inputs/hddtemp/README.md
@@ -1,43 +1,41 @@
-# Hddtemp Input Plugin
+# HDDtemp Input Plugin
 
-This plugin reads data from hddtemp daemon
+This plugin reads data from hddtemp daemon.
 
-## Requirements
+Hddtemp should be installed and its daemon running.
 
-Hddtemp should be installed and its daemon running
-
-## Configuration
+### Configuration
 
 ```toml
 [[inputs.hddtemp]]
-## By default, telegraf gathers temps data from all disks detected by the
-## hddtemp.
-##
-## Only collect temps from the selected disks.
-##
-## A * as the device name will return the temperature values of all disks.
-##
-# address = "127.0.0.1:7634"
-# devices = ["sda", "*"]
+  ## By default, telegraf gathers temps data from all disks detected by the
+  ## hddtemp.
+  ##
+  ## Only collect temps from the selected disks.
+  ##
+  ## A * as the device name will return the temperature values of all disks.
+  ##
+  # address = "127.0.0.1:7634"
+  # devices = ["sda", "*"]
 ```
 
-## Measurements
+### Metrics
 
 - hddtemp
-  - temperature
-
-Tags:
-- device
-- model
-- unit
-- status
+  - tags:
+    - device
+    - model
+    - unit
+    - status
+    - source
+  - fields:
+    - temperature
 
 
-
-## Example output
+### Example output
 
 ```
-> hddtemp,unit=C,status=,host=server1,device=sdb,model=WDC\ WD740GD-00FLA1 temperature=43i 1481655647000000000
-> hddtemp,device=sdc,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=38i 148165564700000000
-> hddtemp,device=sdd,model=SAMSUNG\ HD103UI,unit=C,status=,host=server1 temperature=36i 1481655647000000000
+hddtemp,source=server1,unit=C,status=,device=sdb,model=WDC\ WD740GD-00FLA1 temperature=43i 1481655647000000000
+hddtemp,device=sdc,model=SAMSUNG\ HD103UI,unit=C,source=server1,status= temperature=38i 148165564700000000
+hddtemp,device=sdd,model=SAMSUNG\ HD103UI,unit=C,source=server1,status= temperature=36i 1481655647000000000
 ```
diff --git a/plugins/inputs/hddtemp/hddtemp.go b/plugins/inputs/hddtemp/hddtemp.go
index dd4622df4..0f084ac21 100644
--- a/plugins/inputs/hddtemp/hddtemp.go
+++ b/plugins/inputs/hddtemp/hddtemp.go
@@ -1,6 +1,8 @@
 package hddtemp
 
 import (
+	"net"
+
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	gohddtemp "github.com/influxdata/telegraf/plugins/inputs/hddtemp/go-hddtemp"
@@ -42,8 +44,12 @@ func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
 	if h.fetcher == nil {
 		h.fetcher = gohddtemp.New()
 	}
-	disks, err := h.fetcher.Fetch(h.Address)
+	source, _, err := net.SplitHostPort(h.Address)
+	if err != nil {
+		source = h.Address
+	}
 
+	disks, err := h.fetcher.Fetch(h.Address)
 	if err != nil {
 		return err
 	}
@@ -56,6 +62,7 @@ func (h *HDDTemp) Gather(acc telegraf.Accumulator) error {
 					"model":  disk.Model,
 					"unit":   disk.Unit,
 					"status": disk.Status,
+					"source": source,
 				}
 
 				fields := map[string]interface{}{
diff --git a/plugins/inputs/hddtemp/hddtemp_test.go b/plugins/inputs/hddtemp/hddtemp_test.go
index e09e833e7..f299c2ac6 100644
--- a/plugins/inputs/hddtemp/hddtemp_test.go
+++ b/plugins/inputs/hddtemp/hddtemp_test.go
@@ -36,6 +36,7 @@ func newMockFetcher() *mockFetcher {
 func TestFetch(t *testing.T) {
 	hddtemp := &HDDTemp{
 		fetcher: newMockFetcher(),
+		Address: "localhost",
 		Devices: []string{"*"},
 	}
 
@@ -58,6 +59,7 @@ func TestFetch(t *testing.T) {
 				"model":  "Model1",
 				"unit":   "C",
 				"status": "",
+				"source": "localhost",
 			},
 		},
 		{
@@ -69,6 +71,7 @@ func TestFetch(t *testing.T) {
 				"model":  "Model2",
 				"unit":   "C",
 				"status": "",
+				"source": "localhost",
 			},
 		},
 	}