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

newJsonParser function is now unexported, must use NewParser(config)

Browse Source
This commit is contained in:
Max U
2018-06-28 15:35:20 -07:00
parent 7f2b2a08ae
commit 4db667573a
11 changed files with 81 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/inputs/exec/exec_test.go
View File

@@ -93,7 +93,11 @@ func (r runnerMock) Run(e *Exec, command string, acc telegraf.Accumulator) ([]by
}
func TestExec(t *testing.T) {
parser, _ := parsers.NewJSONParser("exec", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "exec",
}
parser, _ := parsers.NewParser(config)
e := &Exec{
runner: newRunnerMock([]byte(validJson), nil),
Commands: []string{"testcommand arg1"},
@@ -119,7 +123,11 @@ func TestExec(t *testing.T) {
}
func TestExecMalformed(t *testing.T) {
parser, _ := parsers.NewJSONParser("exec", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "exec",
}
parser, _ := parsers.NewParser(config)
e := &Exec{
runner: newRunnerMock([]byte(malformedJson), nil),
Commands: []string{"badcommand arg1"},
@@ -132,7 +140,11 @@ func TestExecMalformed(t *testing.T) {
}
func TestCommandError(t *testing.T) {
parser, _ := parsers.NewJSONParser("exec", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "exec",
}
parser, _ := parsers.NewParser(config)
e := &Exec{
runner: newRunnerMock(nil, fmt.Errorf("exit status code 1")),
Commands: []string{"badcommand"},

27
plugins/inputs/http/http_test.go
View File

@@ -26,7 +26,11 @@ func TestHTTPwithJSONFormat(t *testing.T) {
URLs: []string{url},
}
metricName := "metricName"
p, _ := parsers.NewJSONParser(metricName, nil, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "metricName",
}
p, _ := parsers.NewParser(config)
plugin.SetParser(p)
var acc testutil.Accumulator
@@ -63,8 +67,12 @@ func TestHTTPHeaders(t *testing.T) {
URLs: []string{url},
Headers: map[string]string{header: headerValue},
}
metricName := "metricName"
p, _ := parsers.NewJSONParser(metricName, nil, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "metricName",
}
p, _ := parsers.NewParser(config)
plugin.SetParser(p)
var acc testutil.Accumulator
@@ -83,7 +91,11 @@ func TestInvalidStatusCode(t *testing.T) {
}
metricName := "metricName"
p, _ := parsers.NewJSONParser(metricName, nil, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: metricName,
}
p, _ := parsers.NewParser(config)
plugin.SetParser(p)
var acc testutil.Accumulator
@@ -105,8 +117,11 @@ func TestMethod(t *testing.T) {
Method: "POST",
}
metricName := "metricName"
p, _ := parsers.NewJSONParser(metricName, nil, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "metricName",
}
p, _ := parsers.NewParser(config)
plugin.SetParser(p)
var acc testutil.Accumulator

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

@@ -181,7 +181,14 @@ func (h *HttpJson) gatherServer(
"server": serverURL,
}
parser, err := parsers.NewJSONParser(msrmnt_name, h.TagKeys, nil, tags)
config := &parsers.Config{
DataFormat: "json",
MetricName: msrmnt_name,
TagKeys: h.TagKeys,
DefaultTags: tags,
}
parser, err := parsers.NewParser(config)
if err != nil {
return err
}

6
plugins/inputs/kafka_consumer/kafka_consumer_test.go
View File

@@ -125,7 +125,11 @@ func TestRunParserAndGatherJSON(t *testing.T) {
k.acc = &acc
defer close(k.done)
k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "kafka_json_test",
}
k.parser, _ = parsers.NewParser(config)
go k.receiver()
in <- saramaMsg(testMsgJSON)
acc.Wait(1)

7
plugins/inputs/kafka_consumer_legacy/kafka_consumer_legacy_test.go
View File

@@ -125,7 +125,12 @@ func TestRunParserAndGatherJSON(t *testing.T) {
k.acc = &acc
defer close(k.done)
k.parser, _ = parsers.NewJSONParser("kafka_json_test", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "kafka_json_test",
}
k.parser, _ = parsers.NewParser(config)
go k.receiver()
in <- saramaMsg(testMsgJSON)
acc.Wait(1)

7
plugins/inputs/mqtt_consumer/mqtt_consumer_test.go
View File

@@ -172,7 +172,12 @@ func TestRunParserAndGatherJSON(t *testing.T) {
n.acc = &acc
defer close(n.done)
n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "nats_json_test",
}
n.parser, _ = parsers.NewParser(config)
go n.receiver()
in <- mqttMsg(testMsgJSON)

7
plugins/inputs/nats_consumer/nats_consumer_test.go
View File

@@ -108,7 +108,12 @@ func TestRunParserAndGatherJSON(t *testing.T) {
n.acc = &acc
defer close(n.done)
n.parser, _ = parsers.NewJSONParser("nats_json_test", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "nats_json_test",
}
n.parser, _ = parsers.NewParser(config)
n.wg.Add(1)
go n.receiver()
in <- natsMsg(testMsgJSON)

7
plugins/inputs/tcp_listener/tcp_listener_test.go
View File

@@ -300,7 +300,12 @@ func TestRunParserJSONMsg(t *testing.T) {
listener.acc = &acc
defer close(listener.done)
listener.parser, _ = parsers.NewJSONParser("udp_json_test", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "udp_json_test",
}
listener.parser, _ = parsers.NewParser(config)
listener.wg.Add(1)
go listener.tcpParser()

7
plugins/inputs/udp_listener/udp_listener_test.go
View File

@@ -193,7 +193,12 @@ func TestRunParserJSONMsg(t *testing.T) {
listener.acc = &acc
defer close(listener.done)
listener.parser, _ = parsers.NewJSONParser("udp_json_test", []string{}, nil, nil)
config := &parsers.Config{
DataFormat: "json",
MetricName: "udp_json_test",
}
listener.parser, _ = parsers.NewParser(config)
listener.wg.Add(1)
go listener.udpParser()