#920 Support servers on unix and tcp sockets.

plugins/inputs/uwsgi/uwsgi.go

@@ -2,24 +2,19 @@ package uwsgi
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/plugins/inputs"
-	"net/http"
+	"net"
+	"net/url"
 	"strconv"
 	"time"
 )
 
-var tr = &http.Transport{
+var timeout = 5 * time.Second
-	ResponseHeaderTimeout: time.Duration(3 * time.Second),
-}
-
-var client = &http.Client{
-	Transport: tr,
-	Timeout:   time.Duration(4 * time.Second),
-}
 
 type Uwsgi struct {
-	URLs []string `toml:"urls"`
+	Servers []string `toml:"server"`
 }
 
 func (u *Uwsgi) Description() string {
@@ -28,40 +23,49 @@ func (u *Uwsgi) Description() string {
 
 func (u *Uwsgi) SampleConfig() string {
 	return `
-    ### List with urls of uWSGI Stats servers
+    ## List with urls of uWSGI Stats servers. Url must match pattern:
-    urls = []
+    ## scheme://address[:port]
+    ##
+    ## For example:
+    ## servers = ["tcp://localhost:5050", "http://localhost:1717", "unix:///tmp/statsock"]
+    servers = []
 `
 }
 
 func (u *Uwsgi) Gather(acc telegraf.Accumulator) error {
-	for _, url := range u.URLs {
+	for _, s := range u.Servers {
-		err := u.gatherURL(acc, url)
+		n, err := url.Parse(s)
 		if err != nil {
-			return err
+			return fmt.Errorf("Could not parse uWSGI Stats Server url '%s': %s", s, err)
 		}
 
+		u.gatherServer(acc, n)
+
 	}
 	return nil
 }
 
-func (u *Uwsgi) gatherURL(acc telegraf.Accumulator, url string) error {
+func (u *Uwsgi) gatherServer(acc telegraf.Accumulator, url *url.URL) error {
-	resp, err := client.Get(url)
+	var err error
+	var conn net.Conn
+
+	if url.Scheme == "unix" {
+		conn, err = net.DialTimeout(url.Scheme, url.Path, timeout)
+	} else {
+		conn, err = net.DialTimeout(url.Scheme, url.Host, timeout)
+	}
 
 	if err != nil {
-		return err
+		return fmt.Errorf("Could not connect to uWSGI Stats Server '%s': %s", url.String(), err)
 	}
-	defer resp.Body.Close()
+	defer conn.Close()
 
 	var s StatsServer
-	s.Url = url
+	s.Url = url.String()
 
-	dec := json.NewDecoder(resp.Body)
+	dec := json.NewDecoder(conn)
 	dec.Decode(&s)
 
-	if err != nil {
-		return err
-	}
-
 	u.gatherStatServer(acc, &s)
 	u.gatherWorkers(acc, &s)
 

plugins/inputs/uwsgi/uwsgi_test.go

@@ -118,7 +118,7 @@ func TestBasic(t *testing.T) {
 	defer fakeServer.Close()
 
 	plugin := &uwsgi.Uwsgi{
-		URLs: []string{fakeServer.URL + "/"},
+		Servers: []string{fakeServer.URL + "/"},
 	}
 	var acc testutil.Accumulator
 	require.NoError(t, plugin.Gather(&acc))