dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cassandra: update plugin supported prefix & fix panic 

fixes #1102
This commit is contained in:
Cameron Sparr 2016-04-27 08:29:51 -06:00
parent ee4f4d7800
commit 89f2c0b0a4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/inputs/cassandra/cassandra.go
View File

@ -7,6 +7,7 @@ import (
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/plugins/inputs" "github.com/influxdata/telegraf/plugins/inputs"
"io/ioutil" "io/ioutil"
"log"
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
@ -263,15 +264,19 @@ func (c *Cassandra) Gather(acc telegraf.Accumulator) error {
for _, server := range servers { for _, server := range servers {
for _, metric := range metrics { for _, metric := range metrics {
var m jmxMetric
serverTokens := parseServerTokens(server) serverTokens := parseServerTokens(server)
var m jmxMetric
if strings.HasPrefix(metric, "/java.lang:") { if strings.HasPrefix(metric, "/java.lang:") {
m = newJavaMetric(serverTokens["host"], metric, acc) m = newJavaMetric(serverTokens["host"], metric, acc)
} else if strings.HasPrefix(metric, } else if strings.HasPrefix(metric,
"/org.apache.cassandra.metrics:") { "/org.apache.cassandra.metrics:") {
m = newCassandraMetric(serverTokens["host"], metric, acc) m = newCassandraMetric(serverTokens["host"], metric, acc)
} else {
// unsupported metric type
log.Printf("Unsupported Cassandra metric [%s], skipping",
metric)
continue
} }
// Prepare URL // Prepare URL