From ccb521b422c867e3e37d04d681a737b7a818fe2e Mon Sep 17 00:00:00 2001 From: Greg Linton Date: Wed, 11 May 2016 08:14:24 -0400 Subject: [PATCH] Updated haproxy_test.go to reflect CSV field names. --- plugins/inputs/haproxy/haproxy_test.go | 195 +++++++++++++------------ 1 file changed, 105 insertions(+), 90 deletions(-) diff --git a/plugins/inputs/haproxy/haproxy_test.go b/plugins/inputs/haproxy/haproxy_test.go index f9057e0cd..5568dcf9f 100644 --- a/plugins/inputs/haproxy/haproxy_test.go +++ b/plugins/inputs/haproxy/haproxy_test.go @@ -73,36 +73,41 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) { } fields := map[string]interface{}{ - "active_servers": uint64(1), - "backup_servers": uint64(0), - "bin": uint64(510913516), - "bout": uint64(2193856571), - "check_duration": uint64(10), - "cli_abort": uint64(73), - "ctime": uint64(2), - "downtime": uint64(0), - "dresp": uint64(0), - "econ": uint64(0), - "eresp": uint64(1), - "http_response.1xx": uint64(0), - "http_response.2xx": uint64(119534), - "http_response.3xx": uint64(48051), - "http_response.4xx": uint64(2345), - "http_response.5xx": uint64(1056), - "lbtot": uint64(171013), - "qcur": uint64(0), - "qmax": uint64(0), - "qtime": uint64(0), - "rate": uint64(3), - "rate_max": uint64(12), - "rtime": uint64(312), - "scur": uint64(1), - "smax": uint64(32), - "srv_abort": uint64(1), - "stot": uint64(171014), - "ttime": uint64(2341), - "wredis": uint64(0), - "wretr": uint64(1), + "act": uint64(1), + "bck": uint64(0), + "bin": uint64(510913516), + "bout": uint64(2193856571), + "check_duration": uint64(10), + "chkdown": uint64(0), + "chkfail": uint64(1), + "cli_abrt": uint64(73), + "ctime": uint64(2), + "downtime": uint64(0), + "dresp": uint64(0), + "econ": uint64(0), + "eresp": uint64(1), + "hanafail": uint64(0), + "hrsp_1xx": uint64(0), + "hrsp_2xx": uint64(119534), + "hrsp_3xx": uint64(48051), + "hrsp_4xx": uint64(2345), + "hrsp_5xx": uint64(1056), + "hrsp_other": uint64(0), + "lbtot": uint64(171013), + "qcur": uint64(0), + "qmax": uint64(0), + "qtime": uint64(0), + "rate": uint64(3), + "rate_max": uint64(12), + "rtime": uint64(312), + "scur": uint64(1), + "smax": uint64(32), + "srv_abrt": uint64(1), + "stot": uint64(171014), + "ttime": uint64(2341), + "weight": uint(100), + "wredis": uint64(0), + "wretr": uint64(1), } acc.AssertContainsTaggedFields(t, "haproxy", fields, tags) @@ -137,36 +142,41 @@ func TestHaproxyGeneratesMetricsWithoutAuthentication(t *testing.T) { } fields := map[string]interface{}{ - "active_servers": uint64(1), - "backup_servers": uint64(0), - "bin": uint64(510913516), - "bout": uint64(2193856571), - "check_duration": uint64(10), - "cli_abort": uint64(73), - "ctime": uint64(2), - "downtime": uint64(0), - "dresp": uint64(0), - "econ": uint64(0), - "eresp": uint64(1), - "http_response.1xx": uint64(0), - "http_response.2xx": uint64(119534), - "http_response.3xx": uint64(48051), - "http_response.4xx": uint64(2345), - "http_response.5xx": uint64(1056), - "lbtot": uint64(171013), - "qcur": uint64(0), - "qmax": uint64(0), - "qtime": uint64(0), - "rate": uint64(3), - "rate_max": uint64(12), - "rtime": uint64(312), - "scur": uint64(1), - "smax": uint64(32), - "srv_abort": uint64(1), - "stot": uint64(171014), - "ttime": uint64(2341), - "wredis": uint64(0), - "wretr": uint64(1), + "act": uint64(1), + "bck": uint64(0), + "bin": uint64(510913516), + "bout": uint64(2193856571), + "check_duration": uint64(10), + "chkdown": uint64(0), + "chkfail": uint64(1), + "cli_abrt": uint64(73), + "ctime": uint64(2), + "downtime": uint64(0), + "dresp": uint64(0), + "econ": uint64(0), + "eresp": uint64(1), + "hanafail": uint64(0), + "hrsp_1xx": uint64(0), + "hrsp_2xx": uint64(119534), + "hrsp_3xx": uint64(48051), + "hrsp_4xx": uint64(2345), + "hrsp_5xx": uint64(1056), + "hrsp_other": uint64(0), + "lbtot": uint64(171013), + "qcur": uint64(0), + "qmax": uint64(0), + "qtime": uint64(0), + "rate": uint64(3), + "rate_max": uint64(12), + "rtime": uint64(312), + "scur": uint64(1), + "smax": uint64(32), + "srv_abrt": uint64(1), + "stot": uint64(171014), + "ttime": uint64(2341), + "weight": uint(100), + "wredis": uint64(0), + "wretr": uint64(1), } acc.AssertContainsTaggedFields(t, "haproxy", fields, tags) } @@ -200,36 +210,41 @@ func TestHaproxyGeneratesMetricsUsingSocket(t *testing.T) { } fields := map[string]interface{}{ - "active_servers": uint64(1), - "backup_servers": uint64(0), - "bin": uint64(510913516), - "bout": uint64(2193856571), - "check_duration": uint64(10), - "cli_abort": uint64(73), - "ctime": uint64(2), - "downtime": uint64(0), - "dresp": uint64(0), - "econ": uint64(0), - "eresp": uint64(1), - "http_response.1xx": uint64(0), - "http_response.2xx": uint64(119534), - "http_response.3xx": uint64(48051), - "http_response.4xx": uint64(2345), - "http_response.5xx": uint64(1056), - "lbtot": uint64(171013), - "qcur": uint64(0), - "qmax": uint64(0), - "qtime": uint64(0), - "rate": uint64(3), - "rate_max": uint64(12), - "rtime": uint64(312), - "scur": uint64(1), - "smax": uint64(32), - "srv_abort": uint64(1), - "stot": uint64(171014), - "ttime": uint64(2341), - "wredis": uint64(0), - "wretr": uint64(1), + "act": uint64(1), + "bck": uint64(0), + "bin": uint64(510913516), + "bout": uint64(2193856571), + "check_duration": uint64(10), + "chkdown": uint64(0), + "chkfail": uint64(1), + "cli_abrt": uint64(73), + "ctime": uint64(2), + "downtime": uint64(0), + "dresp": uint64(0), + "econ": uint64(0), + "eresp": uint64(1), + "hanafail": uint64(0), + "hrsp_1xx": uint64(0), + "hrsp_2xx": uint64(119534), + "hrsp_3xx": uint64(48051), + "hrsp_4xx": uint64(2345), + "hrsp_5xx": uint64(1056), + "hrsp_other": uint64(0), + "lbtot": uint64(171013), + "qcur": uint64(0), + "qmax": uint64(0), + "qtime": uint64(0), + "rate": uint64(3), + "rate_max": uint64(12), + "rtime": uint64(312), + "scur": uint64(1), + "smax": uint64(32), + "srv_abrt": uint64(1), + "stot": uint64(171014), + "ttime": uint64(2341), + "weight": uint(100), + "wredis": uint64(0), + "wretr": uint64(1), } acc.AssertContainsTaggedFields(t, "haproxy", fields, tags) }