Merge branch 'master' into master

CHANGELOG.md

@@ -48,7 +48,15 @@ based on _prefix_ in addition to globs. This means that a filter like
   - disque: `host -> disque_host`
   - rethinkdb: `host -> rethinkdb_host`
 
-- **Breaking Change**: The `win_perf_counters` input has been changed to sanitize field names, replacing `/Sec` and `/sec` with `_persec`, as well as spaces with underscores. This is needed because Graphite doesn't like slashes and spaces, and was failing to accept metrics that had them. The `/[sS]ec` -> `_persec` is just to make things clearer and uniform.
+- **Breaking Change**: The `win_perf_counters` input has been changed to
+sanitize field names, replacing `/Sec` and `/sec` with `_persec`, as well as
+spaces with underscores. This is needed because Graphite doesn't like slashes
+and spaces, and was failing to accept metrics that had them.
+The `/[sS]ec` -> `_persec` is just to make things clearer and uniform.
+
+- **Breaking Change**: snmp plugin. The `host` tag of the snmp plugin has been
+changed to the `snmp_host` tag.
+
 - The `disk` input plugin can now be configured with the `HOST_MOUNT_PREFIX` environment variable.
 This value is prepended to any mountpaths discovered before retrieving stats.
 It is not included on the report path. This is necessary for reporting host disk stats when running from within a container.

etc/telegraf.conf

@@ -638,8 +638,8 @@
 # 
 #   ## If no servers are specified, then default to 127.0.0.1:1936
 #   servers = ["http://myhaproxy.com:1936", "http://anotherhaproxy.com:1936"]
-#   ## Or you can also use local socket(not work yet)
+#   ## Or you can also use local socket
-#   ## servers = ["socket://run/haproxy/admin.sock"]
+#   ## servers = ["socket:/run/haproxy/admin.sock"]
 
 
 # # HTTP/HTTPS request given an address a method and a timeout

plugins/inputs/snmp/snmp.go

@@ -792,7 +792,7 @@ func (h *Host) HandleResponse(
 						// Because the result oid is equal to inputs.snmp.get section
 						field_name = oid.Name
 					}
-					tags["host"], _, _ = net.SplitHostPort(h.Address)
+					tags["snmp_host"], _, _ = net.SplitHostPort(h.Address)
 					fields := make(map[string]interface{})
 					fields[string(field_name)] = variable.Value
 

plugins/inputs/snmp/snmp_test.go

@@ -103,7 +103,7 @@ func TestSNMPGet1(t *testing.T) {
 		},
 		map[string]string{
 			"unit":      "octets",
-			"host": testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -141,7 +141,7 @@ func TestSNMPGet2(t *testing.T) {
 		},
 		map[string]string{
 			"instance":  "0",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -182,7 +182,7 @@ func TestSNMPGet3(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "1",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -224,7 +224,7 @@ func TestSNMPEasyGet4(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "1",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -235,7 +235,7 @@ func TestSNMPEasyGet4(t *testing.T) {
 		},
 		map[string]string{
 			"instance":  "0",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -277,7 +277,7 @@ func TestSNMPEasyGet5(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "1",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -288,7 +288,7 @@ func TestSNMPEasyGet5(t *testing.T) {
 		},
 		map[string]string{
 			"instance":  "0",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -321,7 +321,7 @@ func TestSNMPEasyGet6(t *testing.T) {
 		},
 		map[string]string{
 			"instance":  "0",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -362,7 +362,7 @@ func TestSNMPBulk1(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "1",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -374,7 +374,7 @@ func TestSNMPBulk1(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "2",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -386,7 +386,7 @@ func TestSNMPBulk1(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "3",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -398,7 +398,7 @@ func TestSNMPBulk1(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "36",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }
@@ -440,7 +440,7 @@ func dTestSNMPBulk2(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "1",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -452,7 +452,7 @@ func dTestSNMPBulk2(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "2",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -464,7 +464,7 @@ func dTestSNMPBulk2(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "3",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 
@@ -476,7 +476,7 @@ func dTestSNMPBulk2(t *testing.T) {
 		map[string]string{
 			"unit":      "octets",
 			"instance":  "36",
-			"host":     testutil.GetLocalHost(),
+			"snmp_host": testutil.GetLocalHost(),
 		},
 	)
 }