From b86d789abe3f55ff611220fb87be12e42bc632dc Mon Sep 17 00:00:00 2001
From: Maksim Naumov <maksim.naumov@hitmeister.de>
Date: Tue, 23 Jun 2015 09:44:39 +0200
Subject: [PATCH] Explore "limit_maxbytes" and "bytes" individually

---
 plugins/memcached/memcached.go      | 18 ++----------------
 plugins/memcached/memcached_test.go |  7 +------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/plugins/memcached/memcached.go b/plugins/memcached/memcached.go
index 9de2a5959..802fae35d 100644
--- a/plugins/memcached/memcached.go
+++ b/plugins/memcached/memcached.go
@@ -30,6 +30,8 @@ var sendAsIs = []string{
 	"get_hits",
 	"get_misses",
 	"evictions",
+	"limit_maxbytes",
+	"bytes",
 }
 
 // SampleConfig returns sample configuration message
@@ -122,25 +124,9 @@ func (m *Memcached) gatherServer(address string, acc plugins.Accumulator) error
 			}
 		}
 	}
-
-	// Usage
-	acc.Add("usage", m.calcUsage(values), tags)
 	return nil
 }
 
-func (m *Memcached) calcUsage(values map[string]string) float64 {
-	maxBytes, maxOk := values["limit_maxbytes"]
-	bytes, bytesOk := values["bytes"]
-	if maxOk && bytesOk {
-		if fMax, errMax := strconv.ParseFloat(maxBytes, 64); errMax == nil && fMax > 0 {
-			if fBytes, errBytes := strconv.ParseFloat(bytes, 64); errBytes == nil {
-				return fBytes / fMax
-			}
-		}
-	}
-	return 0
-}
-
 func init() {
 	plugins.Add("memcached", func() plugins.Plugin {
 		return &Memcached{}
diff --git a/plugins/memcached/memcached_test.go b/plugins/memcached/memcached_test.go
index 04184fff6..08e696fb7 100644
--- a/plugins/memcached/memcached_test.go
+++ b/plugins/memcached/memcached_test.go
@@ -18,14 +18,9 @@ func TestMemcachedGeneratesMetrics(t *testing.T) {
 	err := m.Gather(&acc)
 	require.NoError(t, err)
 
-	intMetrics := []string{"get_hits", "get_misses", "evictions"}
-	floatMetrics := []string{"usage"}
+	intMetrics := []string{"get_hits", "get_misses", "evictions", "limit_maxbytes", "bytes"}
 
 	for _, metric := range intMetrics {
 		assert.True(t, acc.HasIntValue(metric), metric)
 	}
-
-	for _, metric := range floatMetrics {
-		assert.True(t, acc.HasFloatValue(metric), metric)
-	}
 }