format code for CI
This commit is contained in:
parent
3c211a6deb
commit
864177a850
|
@ -1,18 +1,18 @@
|
|||
package graylog
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strconv"
|
||||
"bytes"
|
||||
"regexp"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
"encoding/json"
|
||||
|
||||
"github.com/influxdata/telegraf"
|
||||
"github.com/influxdata/telegraf/internal"
|
||||
|
@ -21,11 +21,11 @@ import (
|
|||
)
|
||||
|
||||
type GrayLog struct {
|
||||
Name string
|
||||
Servers []string
|
||||
TagKeys []string
|
||||
Metrics []string
|
||||
Headers map[string]string
|
||||
Name string
|
||||
Servers []string
|
||||
TagKeys []string
|
||||
Metrics []string
|
||||
Headers map[string]string
|
||||
|
||||
// Path to CA file
|
||||
SSLCA string `toml:"ssl_ca"`
|
||||
|
@ -55,7 +55,7 @@ type HTTPClient interface {
|
|||
}
|
||||
|
||||
type Messagebody struct {
|
||||
Metrics []string `json:"metrics"`
|
||||
Metrics []string `json:"metrics"`
|
||||
}
|
||||
|
||||
type RealHTTPClient struct {
|
||||
|
@ -202,7 +202,7 @@ func (h *GrayLog) gatherServer(
|
|||
return err
|
||||
}
|
||||
if err := json.Unmarshal([]byte(resp), &dat); err != nil {
|
||||
return err
|
||||
return err
|
||||
}
|
||||
if rec, ok := dat["metrics"].([]interface{}); ok {
|
||||
for _, metric := range rec {
|
||||
|
@ -222,10 +222,10 @@ func (h *GrayLog) gatherServer(
|
|||
for k, v := range metric.Fields() {
|
||||
re, _ := regexp.Compile(`metrics_([0-9]+)`)
|
||||
match := re.FindAllStringSubmatch(k, -1)
|
||||
if(match != nil) {
|
||||
if match != nil {
|
||||
i, _ := strconv.Atoi(match[0][1])
|
||||
fields[name_list[i]] = v
|
||||
}
|
||||
}
|
||||
}
|
||||
fields["response_time"] = responseTime
|
||||
acc.AddFields(metric.Name(), fields, metric.Tags())
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
package graylog
|
||||
|
||||
import (
|
||||
// "fmt"
|
||||
// "fmt"
|
||||
"io/ioutil"
|
||||
"net/http"
|
||||
// "net/http/httptest"
|
||||
// "net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
|
@ -36,10 +36,9 @@ const validJSON = `
|
|||
]
|
||||
}`
|
||||
|
||||
|
||||
var expectedFields = map[string]interface{}{
|
||||
"jvm.memory.pools.Metaspace.committed": float64(108040192),
|
||||
"jvm.cl.loaded": float64(18910),
|
||||
"jvm.memory.pools.Metaspace.committed": float64(108040192),
|
||||
"jvm.cl.loaded": float64(18910),
|
||||
}
|
||||
|
||||
const invalidJSON = "I don't think this is JSON"
|
||||
|
@ -97,29 +96,29 @@ func genMockGrayLog(response string, statusCode int) []*GrayLog {
|
|||
Servers: []string{
|
||||
"http://localhost:12900/system/metrics/multiple",
|
||||
},
|
||||
Name: "my_webapp",
|
||||
Name: "my_webapp",
|
||||
Metrics: []string{
|
||||
"jvm.cl.loaded",
|
||||
"jvm.cl.loaded",
|
||||
},
|
||||
Headers: map[string]string{
|
||||
"Content-Type" : "application/json",
|
||||
"Accept" : "application/json",
|
||||
"Authorization" : "Basic DESfdsfffoffo",
|
||||
"Content-Type": "application/json",
|
||||
"Accept": "application/json",
|
||||
"Authorization": "Basic DESfdsfffoffo",
|
||||
},
|
||||
},
|
||||
&GrayLog{
|
||||
client: &mockHTTPClient{responseBody: response, statusCode: statusCode},
|
||||
Servers: []string{
|
||||
Servers: []string{
|
||||
"http://server2:12900/system/metrics/multiple",
|
||||
},
|
||||
Name: "other_webapp",
|
||||
Metrics: []string{
|
||||
"jvm.memory.pools.Metaspace.committed",
|
||||
Name: "other_webapp",
|
||||
Metrics: []string{
|
||||
"jvm.memory.pools.Metaspace.committed",
|
||||
},
|
||||
Headers: map[string]string{
|
||||
"Content-Type" : "application/json",
|
||||
"Accept" : "application/json",
|
||||
"Authorization" : "Basic DESfdsfffoffo",
|
||||
"Content-Type": "application/json",
|
||||
"Accept": "application/json",
|
||||
"Authorization": "Basic DESfdsfffoffo",
|
||||
},
|
||||
TagKeys: []string{
|
||||
"role",
|
||||
|
@ -152,7 +151,6 @@ func TestNormalResponse(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
// Test response to HTTP 500
|
||||
func TestHttpJson500(t *testing.T) {
|
||||
graylog := genMockGrayLog(validJSON, 500)
|
||||
|
|
Loading…
Reference in New Issue