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

normalizing metric names to fit better with snakecase

This commit is contained in:
shubhamDX 2016-08-12 23:24:59 +05:30 committed by Daniel Nelson
parent dcf81d7dfe
commit d193a9416d
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/inputs/spark/spark.go
View File

@ -98,7 +98,7 @@ func parseJmxMetricRequest(mbean string) map[string]string {
tokens := make(map[string]string) tokens := make(map[string]string)
classAndPairs := strings.Split(mbean, ":") classAndPairs := strings.Split(mbean, ":")
if classAndPairs[0] == "metrics" { if classAndPairs[0] == "metrics" {
tokens["class"] = "spark_jolokiaMetrics" tokens["class"] = "spark_jolokia_metrics"
} else if classAndPairs[0] == "java.lang" { } else if classAndPairs[0] == "java.lang" {
tokens["class"] = "java" tokens["class"] = "java"
} else { } else {
@ -131,7 +131,7 @@ func addJavaMetric(class string, c *javaMetric,
tags["spark_host"] = c.host tags["spark_host"] = c.host
tags["spark_class"] = class tags["spark_class"] = class
if class == "spark_Threading" { if class == "spark_threading" {
list := []string{"PeakThreadCount", "CurrentThreadCpuTime", "DaemonThreadCount", "TotalStartedThreadCount", "CurrentThreadUserTime", "ThreadCount"} list := []string{"PeakThreadCount", "CurrentThreadCpuTime", "DaemonThreadCount", "TotalStartedThreadCount", "CurrentThreadUserTime", "ThreadCount"}
for _, value := range list { for _, value := range list {
if values[value] != nil { if values[value] != nil {
@ -157,9 +157,9 @@ func (j *javaMetric) addTagsFields(out map[string]interface{}) {
if valuesMap, ok := out["value"]; ok { if valuesMap, ok := out["value"]; ok {
if class == "Memory" { if class == "Memory" {
addJavaMetric("spark_HeapMemoryUsage", j, valuesMap.(map[string]interface{})) addJavaMetric("spark_heap_memory_usage", j, valuesMap.(map[string]interface{}))
} else if class == "Threading" { } else if class == "Threading" {
addJavaMetric("spark_Threading", j, valuesMap.(map[string]interface{})) addJavaMetric("spark_threading", j, valuesMap.(map[string]interface{}))
} else { } else {
fmt.Printf("Missing key in '%s' output response\n%v\n", fmt.Printf("Missing key in '%s' output response\n%v\n",
j.metric, out) j.metric, out)
@ -211,9 +211,9 @@ func addYarnMetric(c *yarnMetric, value map[string]interface{}, metrictype strin
func (c *yarnMetric) addTagsFields(out map[string]interface{}) { func (c *yarnMetric) addTagsFields(out map[string]interface{}) {
if valuesMap, ok := out["clusterMetrics"]; ok { if valuesMap, ok := out["clusterMetrics"]; ok {
addYarnMetric(c, valuesMap.(map[string]interface{}), "spark_clusterMetrics") addYarnMetric(c, valuesMap.(map[string]interface{}), "spark_cluster_metrics")
} else if valuesMap, ok := out["clusterInfo"]; ok { } else if valuesMap, ok := out["clusterInfo"]; ok {
addYarnMetric(c, valuesMap.(map[string]interface{}), "spark_clusterInfo") addYarnMetric(c, valuesMap.(map[string]interface{}), "spark_cluster_info")
} else if valuesMap, ok := out["apps"]; ok { } else if valuesMap, ok := out["apps"]; ok {
for _, value := range valuesMap.(map[string]interface{}) { for _, value := range valuesMap.(map[string]interface{}) {
for _, vv := range value.([]interface{}) { for _, vv := range value.([]interface{}) {
@ -236,9 +236,9 @@ func (c *yarnMetric) addTagsFields(out map[string]interface{}) {
func (j *Spark) SampleConfig() string { func (j *Spark) SampleConfig() string {
return ` return `
## Spark server exposing jolokia read service ## Spark server exposing jolokia read service
spark_servers = ["127.0.0.1:8778"] #optional #spark_servers = ["127.0.0.1:8778"] #optional
## Server running Yarn Resource Manager ## Server running Yarn Resource Manager
yarn_server = "127.0.0.1:8088" #optional #yarn_server = "127.0.0.1:8088" #optional
` `
} }