From 10b8a3e1a54c802e446d8f7dddb962a4ed441941 Mon Sep 17 00:00:00 2001 From: chrispeterson Date: Tue, 15 Dec 2015 17:10:48 -0800 Subject: [PATCH] add test coverage. add back wretr. remove check_status from recently added column --- plugins/haproxy/haproxy.go | 10 ++++---- plugins/haproxy/haproxy_test.go | 42 ++++++++++++++++++++------------- 2 files changed, 31 insertions(+), 21 deletions(-) diff --git a/plugins/haproxy/haproxy.go b/plugins/haproxy/haproxy.go index 6fccf60b2..e5ce6e404 100644 --- a/plugins/haproxy/haproxy.go +++ b/plugins/haproxy/haproxy.go @@ -230,6 +230,11 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) ([][]str if err == nil { acc.Add("eresp", ival, tags) } + case HF_WRETR: + ival, err := strconv.ParseUint(v, 10, 64) + if err == nil { + acc.Add("wretr", ival, tags) + } case HF_WREDIS: ival, err := strconv.ParseUint(v, 10, 64) if err == nil { @@ -270,11 +275,6 @@ func importCsvResult(r io.Reader, acc plugins.Accumulator, host string) ([][]str if err == nil { acc.Add("rate_max", ival, tags) } - case HF_CHECK_STATUS: - ival, err := strconv.ParseUint(v, 10, 64) - if err == nil { - acc.Add("check_status", ival, tags) - } case HF_CHECK_DURATION: ival, err := strconv.ParseUint(v, 10, 64) if err == nil { diff --git a/plugins/haproxy/haproxy_test.go b/plugins/haproxy/haproxy_test.go index b87618700..6f07d34d1 100644 --- a/plugins/haproxy/haproxy_test.go +++ b/plugins/haproxy/haproxy_test.go @@ -53,31 +53,41 @@ func TestHaproxyGeneratesMetricsWithAuthentication(t *testing.T) { name string value uint64 }{ - {"bin", 5557055817}, - {"scur", 288}, + {"qmax", 81}, + {"scur", 288}, + {"smax", 713}, + {"bin", 5557055817}, + {"bout", 24096715169}, + {"dreq", 1102}, + {"dresp", 80}, + {"ereq", 95740}, + {"econ", 0}, + {"eresp", 0}, + {"wretr", 17}, + {"wredis", 19}, + {"active_servers", 1}, + {"backup_servers", 0}, + {"downtime", 0}, + {"throttle", 13}, + {"lbtot", 114}, + {"rate", 18}, + {"rate_max", 102}, + {"check_duration", 1}, {"http_response.1xx", 0}, {"http_response.2xx", 1314093}, {"http_response.3xx", 537036}, {"http_response.4xx", 123452}, {"http_response.5xx", 11966}, - {"dreq", 1102}, - {"dresp", 80}, - {"wretr", 17}, - {"wredis", 19}, - {"ereq", 95740}, - {"econ", 0}, - {"eresp", 0}, {"req_rate", 35}, {"req_rate_max", 140}, {"req_tot", 1987928}, - {"bin", 5557055817}, - {"bout", 24096715169}, - {"rate", 18}, - {"rate_max", 102}, - - {"throttle", 13}, - {"lbtot", 114}, + {"cli_abort", 0}, + {"srv_abort", 0}, + {"qtime", 0}, + {"ctime", 2}, + {"rtime", 23}, + {"ttime", 545}, } for _, c := range checkInt {