From 6e7675922527e9d66ddcfd09cc6283f10cc97179 Mon Sep 17 00:00:00 2001 From: Ruslan Islamgaliev Date: Wed, 23 Sep 2015 03:05:54 +0300 Subject: [PATCH] Add port tag to nginx plugin --- plugins/nginx/nginx.go | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/plugins/nginx/nginx.go b/plugins/nginx/nginx.go index 97f273b63..36caf7a63 100644 --- a/plugins/nginx/nginx.go +++ b/plugins/nginx/nginx.go @@ -141,16 +141,22 @@ func (n *Nginx) gatherUrl(addr *url.URL, acc plugins.Accumulator) error { // Get tag(s) for the nginx plugin func getTags(addr *url.URL) map[string]string { - h := addr.Host - var htag string - if host, _, err := net.SplitHostPort(h); err == nil { - htag = host - } else { - htag = h - } - return map[string]string{"server": htag} + h := addr.Host + host, port, err := net.SplitHostPort(h) + if err != nil { + host = addr.Host + if addr.Scheme == "http" { + port = "80" + } else if addr.Scheme == "https" { + port = "443" + } else { + port = "" + } + } + return map[string]string{"server": host, "port": port} } + func init() { plugins.Add("nginx", func() plugins.Plugin { return &Nginx{}