Change HAProxy plugin tag from host to server

fixes #342

CHANGELOG.md

@@ -6,6 +6,7 @@ changed to just run docker commands in the Makefile. See `make docker-run` and
 `make docker-kill`. `make test` will still run all unit tests with docker.
 - Long unit tests are now run in CircleCI, with docker & race detector
 - Redis plugin tag has changed from `host` to `server`
+- HAProxy plugin tag has changed from `host` to `server`
 
 ### Features
 - [#325](https://github.com/influxdb/telegraf/pull/325): NSQ output. Thanks @jrxFive!

plugins/haproxy/haproxy.go

@@ -165,7 +165,7 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) ([][]str
 
 		for field, v := range row {
 			tags := map[string]string{
-				"host":  host,
+				"server": host,
 				"proxy":  row[HF_PXNAME],
 				"sv":     row[HF_SVNAME],
 			}

plugins/haproxy/haproxy_test.go

@@ -42,7 +42,7 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) {
 	require.NoError(t, err)
 
 	tags := map[string]string{
-		"host":  ts.Listener.Addr().String(),
+		"server": ts.Listener.Addr().String(),
 		"proxy":  "be_app",
 		"sv":     "host0",
 	}
@@ -110,7 +110,7 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) {
 
 	tags := map[string]string{
 		"proxy":  "be_app",
-		"host":  ts.Listener.Addr().String(),
+		"server": ts.Listener.Addr().String(),
 		"sv":     "host0",
 	}