From 97d92bba67301c0e0758894cb7ce41b9774170f5 Mon Sep 17 00:00:00 2001
From: Andrei Burd <burdandrei@users.noreply.github.com>
Date: Thu, 14 Jul 2016 20:28:36 +0100
Subject: [PATCH] Redis input enhancement (#1387)
master_last_io_seconds_ago added
role tag renamed to replication_role
---
CHANGELOG.md | 1 +
plugins/inputs/redis/README.md | 2 ++
plugins/inputs/redis/redis.go | 5 +++--
plugins/inputs/redis/redis_test.go | 4 ++--
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d206a7d5..d6267580 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,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.
+- [#1387](https://github.com/influxdata/telegraf/pull/1387): **Breaking Change** - Redis `role` tag renamed to `replication_role` to avoid global_tags override
### Bugfixes
diff --git a/plugins/inputs/redis/README.md b/plugins/inputs/redis/README.md
index 1cbaea0c..51b596aa 100644
--- a/plugins/inputs/redis/README.md
+++ b/plugins/inputs/redis/README.md
@@ -43,6 +43,7 @@
- latest_fork_usec
- connected_slaves
- master_repl_offset
+ - master_last_io_seconds_ago
- repl_backlog_active
- repl_backlog_size
- repl_backlog_histlen
@@ -57,6 +58,7 @@
- All measurements have the following tags:
- port
- server
+ - replication role
### Example Output:
diff --git a/plugins/inputs/redis/redis.go b/plugins/inputs/redis/redis.go
index 94f56247..76cbc89c 100644
--- a/plugins/inputs/redis/redis.go
+++ b/plugins/inputs/redis/redis.go
@@ -66,6 +66,7 @@ var Tracking = map[string]string{
"latest_fork_usec": "latest_fork_usec",
"connected_slaves": "connected_slaves",
"master_repl_offset": "master_repl_offset",
+ "master_last_io_seconds_ago": "master_last_io_seconds_ago",
"repl_backlog_active": "repl_backlog_active",
"repl_backlog_size": "repl_backlog_size",
"repl_backlog_histlen": "repl_backlog_histlen",
@@ -74,7 +75,7 @@ var Tracking = map[string]string{
"used_cpu_user": "used_cpu_user",
"used_cpu_sys_children": "used_cpu_sys_children",
"used_cpu_user_children": "used_cpu_user_children",
- "role": "role",
+ "role": "replication_role",
}
var ErrProtocolError = errors.New("redis protocol error")
@@ -208,7 +209,7 @@ func gatherInfoOutput(
}
if name == "role" {
- tags["role"] = val
+ tags["replication_role"] = val
continue
}
diff --git a/plugins/inputs/redis/redis_test.go b/plugins/inputs/redis/redis_test.go
index b12950ee..2e2fc1e3 100644
--- a/plugins/inputs/redis/redis_test.go
+++ b/plugins/inputs/redis/redis_test.go
@@ -35,7 +35,7 @@ func TestRedis_ParseMetrics(t *testing.T) {
err := gatherInfoOutput(rdr, &acc, tags)
require.NoError(t, err)
- tags = map[string]string{"host": "redis.net", "role": "master"}
+ tags = map[string]string{"host": "redis.net", "replication_role": "master"}
fields := map[string]interface{}{
"uptime": uint64(238),
"clients": uint64(1),
@@ -71,7 +71,7 @@ func TestRedis_ParseMetrics(t *testing.T) {
"used_cpu_user_children": float64(0.00),
"keyspace_hitrate": float64(0.50),
}
- keyspaceTags := map[string]string{"host": "redis.net", "role": "master", "database": "db0"}
+ keyspaceTags := map[string]string{"host": "redis.net", "replication_role": "master", "database": "db0"}
keyspaceFields := map[string]interface{}{
"avg_ttl": uint64(0),
"expires": uint64(0),
--
GitLab