From 5d915f01e13fa6d316e2d1c786e14dcf76556624 Mon Sep 17 00:00:00 2001
From: Mischa Gresser <mgresser@dstillery.com>
Date: Wed, 2 Dec 2015 13:20:31 -0500
Subject: [PATCH 1/3] Adding all memcached stats that return a single value as
 described at
 https://docs.oracle.com/cd/E17952_01/refman-5.0-en/ha-memcached-stats-general.html

---
 plugins/memcached/memcached.go      | 22 ++++++++++++++++++++++
 plugins/memcached/memcached_test.go |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/plugins/memcached/memcached.go b/plugins/memcached/memcached.go
index 3efa9f151..752c98331 100644
--- a/plugins/memcached/memcached.go
+++ b/plugins/memcached/memcached.go
@@ -33,6 +33,28 @@ var sendAsIs = []string{
 	"evictions",
 	"limit_maxbytes",
 	"bytes",
+	"uptime",
+	"curr_items",
+	"total_items",
+	"curr_connections",
+	"total_connections",
+	"connection_structures",
+	"cmd_get",
+	"cmd_set",
+	"delete_hits",
+	"delete_misses",
+	"incr_hits",
+	"incr_misses",
+	"decr_hits",
+	"decr_misses",
+	"cas_hits",
+	"cas_misses",
+	"cas_badvalue",
+	"evictions",
+	"bytes_read",
+	"bytes_written",
+	"threads",
+	"conn_yields"
 }
 
 // SampleConfig returns sample configuration message
diff --git a/plugins/memcached/memcached_test.go b/plugins/memcached/memcached_test.go
index 501fed1b9..fe6620b5c 100644
--- a/plugins/memcached/memcached_test.go
+++ b/plugins/memcached/memcached_test.go
@@ -22,7 +22,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 	err := m.Gather(&acc)
 	require.NoError(t, err)
 
-	intMetrics := []string{"get_hits", "get_misses", "evictions", "limit_maxbytes", "bytes"}
+	intMetrics := []string{"get_hits", "get_misses", "evictions", "limit_maxbytes", "bytes", "uptime", "curr_items", "total_items", "curr_connections", "total_connections", "connection_structures", "cmd_get", "cmd_set", "delete_hits", "delete_misses", "incr_hits", "incr_misses", "decr_hits", "decr_misses", "cas_hits", "cas_misses", "cas_badvalue", "evictions", "bytes_read", "bytes_written", "threads", "conn_yields"}
 
 	for _, metric := range intMetrics {
 		assert.True(t, acc.HasIntValue(metric), metric)

From c08bf18005483b18a05ebc9a87d58ec3ac9e6a06 Mon Sep 17 00:00:00 2001
From: Mischa Gresser <mgresser@dstillery.com>
Date: Wed, 2 Dec 2015 13:22:59 -0500
Subject: [PATCH 2/3] Add missing final comma

---
 plugins/memcached/memcached.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/memcached/memcached.go b/plugins/memcached/memcached.go
index 752c98331..7fb638be9 100644
--- a/plugins/memcached/memcached.go
+++ b/plugins/memcached/memcached.go
@@ -54,7 +54,7 @@ var sendAsIs = []string{
 	"bytes_read",
 	"bytes_written",
 	"threads",
-	"conn_yields"
+	"conn_yields",
 }
 
 // SampleConfig returns sample configuration message

From aa2fd6fa7b8408f3b288de7de3e3d36d221a15f9 Mon Sep 17 00:00:00 2001
From: Mischa Gresser <mgresser@dstillery.com>
Date: Wed, 2 Dec 2015 13:33:11 -0500
Subject: [PATCH 3/3] Removed cas_badvalue

---
 plugins/memcached/memcached.go      | 1 -
 plugins/memcached/memcached_test.go | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/memcached/memcached.go b/plugins/memcached/memcached.go
index 7fb638be9..7186b1aae 100644
--- a/plugins/memcached/memcached.go
+++ b/plugins/memcached/memcached.go
@@ -49,7 +49,6 @@ var sendAsIs = []string{
 	"decr_misses",
 	"cas_hits",
 	"cas_misses",
-	"cas_badvalue",
 	"evictions",
 	"bytes_read",
 	"bytes_written",
diff --git a/plugins/memcached/memcached_test.go b/plugins/memcached/memcached_test.go
index fe6620b5c..3e1580d17 100644
--- a/plugins/memcached/memcached_test.go
+++ b/plugins/memcached/memcached_test.go
@@ -22,7 +22,7 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 	err := m.Gather(&acc)
 	require.NoError(t, err)
 
-	intMetrics := []string{"get_hits", "get_misses", "evictions", "limit_maxbytes", "bytes", "uptime", "curr_items", "total_items", "curr_connections", "total_connections", "connection_structures", "cmd_get", "cmd_set", "delete_hits", "delete_misses", "incr_hits", "incr_misses", "decr_hits", "decr_misses", "cas_hits", "cas_misses", "cas_badvalue", "evictions", "bytes_read", "bytes_written", "threads", "conn_yields"}
+	intMetrics := []string{"get_hits", "get_misses", "evictions", "limit_maxbytes", "bytes", "uptime", "curr_items", "total_items", "curr_connections", "total_connections", "connection_structures", "cmd_get", "cmd_set", "delete_hits", "delete_misses", "incr_hits", "incr_misses", "decr_hits", "decr_misses", "cas_hits", "cas_misses", "evictions", "bytes_read", "bytes_written", "threads", "conn_yields"}
 
 	for _, metric := range intMetrics {
 		assert.True(t, acc.HasIntValue(metric), metric)