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

format code for CI

This commit is contained in:
Ali Alrahahleh 2016-05-24 23:33:49 -07:00
parent 3c211a6deb
commit 864177a850
2 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/inputs/graylog/graylog.go
View File

@ -1,18 +1,18 @@
package graylog package graylog
import ( import (
"bytes"
"encoding/json"
"errors" "errors"
"fmt" "fmt"
"strconv"
"bytes"
"regexp"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"regexp"
"strconv"
"strings" "strings"
"sync" "sync"
"time" "time"
"encoding/json"
"github.com/influxdata/telegraf" "github.com/influxdata/telegraf"
"github.com/influxdata/telegraf/internal" "github.com/influxdata/telegraf/internal"
@ -21,11 +21,11 @@ import (
) )
type GrayLog struct { type GrayLog struct {
Name string Name string
Servers []string Servers []string
TagKeys []string TagKeys []string
Metrics []string Metrics []string
Headers map[string]string Headers map[string]string
// Path to CA file // Path to CA file
SSLCA string `toml:"ssl_ca"` SSLCA string `toml:"ssl_ca"`
@ -55,7 +55,7 @@ type HTTPClient interface {
} }
type Messagebody struct { type Messagebody struct {
Metrics []string `json:"metrics"` Metrics []string `json:"metrics"`
} }
type RealHTTPClient struct { type RealHTTPClient struct {
@ -202,7 +202,7 @@ func (h *GrayLog) gatherServer(
return err return err
} }
if err := json.Unmarshal([]byte(resp), &dat); err != nil { if err := json.Unmarshal([]byte(resp), &dat); err != nil {
return err return err
} }
if rec, ok := dat["metrics"].([]interface{}); ok { if rec, ok := dat["metrics"].([]interface{}); ok {
for _, metric := range rec { for _, metric := range rec {
@ -222,7 +222,7 @@ func (h *GrayLog) gatherServer(
for k, v := range metric.Fields() { for k, v := range metric.Fields() {
re, _ := regexp.Compile(`metrics_([0-9]+)`) re, _ := regexp.Compile(`metrics_([0-9]+)`)
match := re.FindAllStringSubmatch(k, -1) match := re.FindAllStringSubmatch(k, -1)
if(match != nil) { if match != nil {
i, _ := strconv.Atoi(match[0][1]) i, _ := strconv.Atoi(match[0][1])
fields[name_list[i]] = v fields[name_list[i]] = v
} }

34
plugins/inputs/graylog/graylog_test.go
View File

@ -1,10 +1,10 @@
package graylog package graylog
import ( import (
// "fmt" // "fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
// "net/http/httptest" // "net/http/httptest"
"strings" "strings"
"testing" "testing"
@ -36,10 +36,9 @@ const validJSON = `
] ]
}` }`
var expectedFields = map[string]interface{}{ var expectedFields = map[string]interface{}{
"jvm.memory.pools.Metaspace.committed": float64(108040192), "jvm.memory.pools.Metaspace.committed": float64(108040192),
"jvm.cl.loaded": float64(18910), "jvm.cl.loaded": float64(18910),
} }
const invalidJSON = "I don't think this is JSON" const invalidJSON = "I don't think this is JSON"
@ -97,29 +96,29 @@ func genMockGrayLog(response string, statusCode int) []*GrayLog {
Servers: []string{ Servers: []string{
"http://localhost:12900/system/metrics/multiple", "http://localhost:12900/system/metrics/multiple",
}, },
Name: "my_webapp", Name: "my_webapp",
Metrics: []string{ Metrics: []string{
"jvm.cl.loaded", "jvm.cl.loaded",
}, },
Headers: map[string]string{ Headers: map[string]string{
"Content-Type" : "application/json", "Content-Type": "application/json",
"Accept" : "application/json", "Accept": "application/json",
"Authorization" : "Basic DESfdsfffoffo", "Authorization": "Basic DESfdsfffoffo",
}, },
}, },
&GrayLog{ &GrayLog{
client: &mockHTTPClient{responseBody: response, statusCode: statusCode}, client: &mockHTTPClient{responseBody: response, statusCode: statusCode},
Servers: []string{ Servers: []string{
"http://server2:12900/system/metrics/multiple", "http://server2:12900/system/metrics/multiple",
}, },
Name: "other_webapp", Name: "other_webapp",
Metrics: []string{ Metrics: []string{
"jvm.memory.pools.Metaspace.committed", "jvm.memory.pools.Metaspace.committed",
}, },
Headers: map[string]string{ Headers: map[string]string{
"Content-Type" : "application/json", "Content-Type": "application/json",
"Accept" : "application/json", "Accept": "application/json",
"Authorization" : "Basic DESfdsfffoffo", "Authorization": "Basic DESfdsfffoffo",
}, },
TagKeys: []string{ TagKeys: []string{
"role", "role",
@ -152,7 +151,6 @@ func TestNormalResponse(t *testing.T) {
} }
} }
// Test response to HTTP 500 // Test response to HTTP 500
func TestHttpJson500(t *testing.T) { func TestHttpJson500(t *testing.T) {
graylog := genMockGrayLog(validJSON, 500) graylog := genMockGrayLog(validJSON, 500)