From 2d6c8767f775cc612facc1fe82d53719a66b4b22 Mon Sep 17 00:00:00 2001
From: Mark McKinstry <mmckinst@users.noreply.github.com>
Date: Mon, 18 Jul 2016 07:03:39 -0400
Subject: [PATCH] add ability to read redis from a socket (#1480)
* add ability to read redis from a socket
* update CHANGELOG
---
CHANGELOG.md | 1 +
plugins/inputs/redis/redis.go | 48 +++++++++++++++++++++++++----------
2 files changed, 35 insertions(+), 14 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5388cb8..6128a698 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@ should now look like:
- [#1402](https://github.com/influxdata/telegraf/pull/1402): docker-machine/boot2docker no longer required for unit tests.
- [#1350](https://github.com/influxdata/telegraf/pull/1350): cgroup input plugin.
- [#1369](https://github.com/influxdata/telegraf/pull/1369): Add input plugin for consuming metrics from NSQD.
+- [#1369](https://github.com/influxdata/telegraf/pull/1480): add ability to read redis from a socket.
- [#1387](https://github.com/influxdata/telegraf/pull/1387): **Breaking Change** - Redis `role` tag renamed to `replication_role` to avoid global_tags override
- [#1437](https://github.com/influxdata/telegraf/pull/1437): Fetching Galera status metrics in MySQL
- [#1500](https://github.com/influxdata/telegraf/pull/1500): Aerospike plugin refactored to use official client lib.
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 76cbc89c..fc50387d 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -25,6 +25,7 @@ var sampleConfig = `
## e.g.
## tcp://localhost:6379
## tcp://:password@192.168.99.100
+ ## unix:///var/run/redis.sock
##
## If no servers are specified, then localhost is used as the host.
## If no port is specified, 6379 is used
@@ -80,12 +81,15 @@ var Tracking = map[string]string{
var ErrProtocolError = errors.New("redis protocol error")
+const defaultPort = "6379"
+
// Reads stats from all configured servers accumulates stats.
// Returns one of the errors encountered while gather stats (if any).
func (r *Redis) Gather(acc telegraf.Accumulator) error {
if len(r.Servers) == 0 {
url := &url.URL{
- Host: ":6379",
+ Scheme: "tcp",
+ Host: ":6379",
}
r.gatherServer(url, acc)
return nil
@@ -96,6 +100,10 @@ func (r *Redis) Gather(acc telegraf.Accumulator) error {
var outerr error
for _, serv := range r.Servers {
+ if !strings.HasPrefix(serv, "tcp://") || !strings.HasPrefix(serv, "unix://") {
+ serv = "tcp://" + serv
+ }
+
u, err := url.Parse(serv)
if err != nil {
return fmt.Errorf("Unable to parse to address '%s': %s", serv, err)
@@ -105,6 +113,13 @@ func (r *Redis) Gather(acc telegraf.Accumulator) error {
u.Host = serv
u.Path = ""
}
+ if u.Scheme == "tcp" {
+ _, _, err := net.SplitHostPort(u.Host)
+ if err != nil {
+ u.Host = u.Host + ":" + defaultPort
+ }
+ }
+
wg.Add(1)
go func(serv string) {
defer wg.Done()
@@ -117,17 +132,17 @@ func (r *Redis) Gather(acc telegraf.Accumulator) error {
return outerr
}
-const defaultPort = "6379"
-
func (r *Redis) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
- _, _, err := net.SplitHostPort(addr.Host)
- if err != nil {
- addr.Host = addr.Host + ":" + defaultPort
- }
+ var address string
- c, err := net.DialTimeout("tcp", addr.Host, defaultTimeout)
+ if addr.Scheme == "unix" {
+ address = addr.Path
+ } else {
+ address = addr.Host
+ }
+ c, err := net.DialTimeout(addr.Scheme, address, defaultTimeout)
if err != nil {
- return fmt.Errorf("Unable to connect to redis server '%s': %s", addr.Host, err)
+ return fmt.Errorf("Unable to connect to redis server '%s': %s", address, err)
}
defer c.Close()
@@ -155,12 +170,17 @@ func (r *Redis) gatherServer(addr *url.URL, acc telegraf.Accumulator) error {
c.Write([]byte("EOF\r\n"))
rdr := bufio.NewReader(c)
- // Setup tags for all redis metrics
- host, port := "unknown", "unknown"
- // If there's an error, ignore and use 'unknown' tags
- host, port, _ = net.SplitHostPort(addr.Host)
- tags := map[string]string{"server": host, "port": port}
+ var tags map[string]string
+ if addr.Scheme == "unix" {
+ tags = map[string]string{"socket": addr.Path}
+ } else {
+ // Setup tags for all redis metrics
+ host, port := "unknown", "unknown"
+ // If there's an error, ignore and use 'unknown' tags
+ host, port, _ = net.SplitHostPort(addr.Host)
+ tags = map[string]string{"server": host, "port": port}
+ }
return gatherInfoOutput(rdr, acc, tags)
}
--
GitLab