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

Enable gofmt code simplification (#4887)

Browse Source
This commit is contained in:
Trevor Pounds
2018-10-19 16:32:54 -04:00
committed by Daniel Nelson
parent 4a311830c6
commit ee056278f5
59 changed files with 599 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
plugins/inputs/pf/pf.go
View File

@@ -72,11 +72,11 @@ type pfctlOutputStanza struct {
}
var pfctlOutputStanzas = []*pfctlOutputStanza{
&pfctlOutputStanza{
{
HeaderRE: regexp.MustCompile("^State Table"),
ParseFunc: parseStateTable,
},
&pfctlOutputStanza{
{
HeaderRE: regexp.MustCompile("^Counters"),
ParseFunc: parseCounterTable,
},
@@ -127,10 +127,10 @@ type Entry struct {
}
var StateTable = []*Entry{
&Entry{"entries", "current entries", -1},
&Entry{"searches", "searches", -1},
&Entry{"inserts", "inserts", -1},
&Entry{"removals", "removals", -1},
{"entries", "current entries", -1},
{"searches", "searches", -1},
{"inserts", "inserts", -1},
{"removals", "removals", -1},
}
var stateTableRE = regexp.MustCompile(`^ (.*?)\s+(\d+)`)
@@ -140,21 +140,21 @@ func parseStateTable(lines []string, fields map[string]interface{}) error {
}
var CounterTable = []*Entry{
&Entry{"match", "match", -1},
&Entry{"bad-offset", "bad-offset", -1},
&Entry{"fragment", "fragment", -1},
&Entry{"short", "short", -1},
&Entry{"normalize", "normalize", -1},
&Entry{"memory", "memory", -1},
&Entry{"bad-timestamp", "bad-timestamp", -1},
&Entry{"congestion", "congestion", -1},
&Entry{"ip-option", "ip-option", -1},
&Entry{"proto-cksum", "proto-cksum", -1},
&Entry{"state-mismatch", "state-mismatch", -1},
&Entry{"state-insert", "state-insert", -1},
&Entry{"state-limit", "state-limit", -1},
&Entry{"src-limit", "src-limit", -1},
&Entry{"synproxy", "synproxy", -1},
{"match", "match", -1},
{"bad-offset", "bad-offset", -1},
{"fragment", "fragment", -1},
{"short", "short", -1},
{"normalize", "normalize", -1},
{"memory", "memory", -1},
{"bad-timestamp", "bad-timestamp", -1},
{"congestion", "congestion", -1},
{"ip-option", "ip-option", -1},
{"proto-cksum", "proto-cksum", -1},
{"state-mismatch", "state-mismatch", -1},
{"state-insert", "state-insert", -1},
{"state-limit", "state-limit", -1},
{"src-limit", "src-limit", -1},
{"synproxy", "synproxy", -1},
}
var counterTableRE = regexp.MustCompile(`^ (.*?)\s+(\d+)`)

18
plugins/inputs/pf/pf_test.go
View File

@@ -23,13 +23,13 @@ func TestPfctlInvocation(t *testing.T) {
var testCases = []pfctlInvocationTestCase{
// 0: no sudo
pfctlInvocationTestCase{
{
config: PF{UseSudo: false},
cmd: "fakepfctl",
args: []string{"-s", "info"},
},
// 1: with sudo
pfctlInvocationTestCase{
{
config: PF{UseSudo: true},
cmd: "fakesudo",
args: []string{"fakepfctl", "-s", "info"},
@@ -60,9 +60,9 @@ func TestPfMeasurements(t *testing.T) {
testCases := []pfTestCase{
// 0: nil input should raise an error
pfTestCase{TestInput: "", err: errParseHeader},
{TestInput: "", err: errParseHeader},
// 1: changes to pfctl output should raise an error
pfTestCase{TestInput: `Status: Enabled for 161 days 21:24:45 Debug: Urgent
{TestInput: `Status: Enabled for 161 days 21:24:45 Debug: Urgent
Interface Stats for re1 IPv4 IPv6
Bytes In 2585823744614 1059233657221
@@ -99,7 +99,7 @@ Counters
err: errMissingData("current entries"),
},
// 2: bad numbers should raise an error
pfTestCase{TestInput: `Status: Enabled for 0 days 00:26:05 Debug: Urgent
{TestInput: `Status: Enabled for 0 days 00:26:05 Debug: Urgent
State Table Total Rate
current entries -23
@@ -125,7 +125,7 @@ Counters
`,
err: errMissingData("current entries"),
},
pfTestCase{TestInput: `Status: Enabled for 0 days 00:26:05 Debug: Urgent
{TestInput: `Status: Enabled for 0 days 00:26:05 Debug: Urgent
State Table Total Rate
current entries 2
@@ -150,7 +150,7 @@ Counters
synproxy 0 0.0/s
`,
measurements: []measurementResult{
measurementResult{
{
fields: map[string]interface{}{
"entries": int64(2),
"searches": int64(11325),
@@ -175,7 +175,7 @@ Counters
},
},
},
pfTestCase{TestInput: `Status: Enabled for 161 days 21:24:45 Debug: Urgent
{TestInput: `Status: Enabled for 161 days 21:24:45 Debug: Urgent
Interface Stats for re1 IPv4 IPv6
Bytes In 2585823744614 1059233657221
@@ -210,7 +210,7 @@ Counters
synproxy 0 0.0/s
`,
measurements: []measurementResult{
measurementResult{
{
fields: map[string]interface{}{
"entries": int64(649),
"searches": int64(18421725761),