From 89f2c0b0a4cda76cea45cb40f0ddd79f12b48b55 Mon Sep 17 00:00:00 2001
From: Cameron Sparr <cameronsparr@gmail.com>
Date: Wed, 27 Apr 2016 08:29:51 -0600
Subject: [PATCH] Cassandra: update plugin supported prefix & fix panic
fixes #1102
---
plugins/inputs/cassandra/cassandra.go | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/plugins/inputs/cassandra/cassandra.go b/plugins/inputs/cassandra/cassandra.go
index f49a74ab..351232ac 100644
--- a/plugins/inputs/cassandra/cassandra.go
+++ b/plugins/inputs/cassandra/cassandra.go
@@ -7,6 +7,7 @@ import (
"github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs"
"io/ioutil"
+ "log"
"net/http"
"net/url"
"strings"
@@ -263,15 +264,19 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
for _, server := range servers {
for _, metric := range metrics {
- var m jmxMetric
-
serverTokens := parseServerTokens(server)
+ var m jmxMetric
if strings.HasPrefix(metric, "/java.lang:") {
m = newJavaMetric(serverTokens["host"], metric, acc)
} else if strings.HasPrefix(metric,
"/org.apache.cassandra.metrics:") {
m = newCassandraMetric(serverTokens["host"], metric, acc)
+ } else {
+ // unsupported metric type
+ log.Printf("Unsupported Cassandra metric [%s], skipping",
+ metric)
+ continue
}
// Prepare URL
--
GitLab