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

Fix skipped line with empty target in iptables (#3235) 

(cherry picked from commit d5f48e3e96)
This commit is contained in:
Daniel Nelson 2017-09-14 14:59:28 -07:00 committed by Daniel Nelson
parent 86537899b2
commit 72337a1c97
No known key found for this signature in database
GPG Key ID: CAAD59C9444F6155
2 changed files with 77 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/inputs/iptables/iptables.go
View File

@ -95,7 +95,7 @@ const measurement = "iptables"
var errParse = errors.New("Cannot parse iptables list information") var errParse = errors.New("Cannot parse iptables list information")
var chainNameRe = regexp.MustCompile(`^Chain\s+(\S+)`) var chainNameRe = regexp.MustCompile(`^Chain\s+(\S+)`)
var fieldsHeaderRe = regexp.MustCompile(`^\s*pkts\s+bytes\s+`) var fieldsHeaderRe = regexp.MustCompile(`^\s*pkts\s+bytes\s+`)
var commentRe = regexp.MustCompile(`\s*/\*\s*(.+?)\s*\*/\s*`) var valuesRe = regexp.MustCompile(`^\s*(\d+)\s+(\d+)\s+.*?/\*\s*(.+?)\s*\*/\s*`)
func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error { func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error {
lines := strings.Split(data, "\n") lines := strings.Split(data, "\n")
@ -110,21 +110,14 @@ func (ipt *Iptables) parseAndGather(data string, acc telegraf.Accumulator) error
return errParse return errParse
} }
for _, line := range lines[2:] { for _, line := range lines[2:] {
tokens := strings.Fields(line) matches := valuesRe.FindStringSubmatch(line)
if len(tokens) < 10 { if len(matches) != 4 {
continue continue
} }
pkts := tokens[0] pkts := matches[1]
bytes := tokens[1] bytes := matches[2]
end := strings.Join(tokens[9:], " ") comment := matches[3]
matches := commentRe.FindStringSubmatch(end)
if matches == nil {
continue
}
comment := matches[1]
tags := map[string]string{"table": ipt.Table, "chain": mchain[1], "ruleid": comment} tags := map[string]string{"table": ipt.Table, "chain": mchain[1], "ruleid": comment}
fields := make(map[string]interface{}) fields := make(map[string]interface{})

23
plugins/inputs/iptables/iptables_test.go
View File

@ -154,9 +154,25 @@ func TestIptables_Gather(t *testing.T) {
tags: []map[string]string{}, tags: []map[string]string{},
fields: [][]map[string]interface{}{}, fields: [][]map[string]interface{}{},
}, },
{ // 11 - all target and ports
table: "all_recv",
chains: []string{"accountfwd"},
values: []string{
`Chain accountfwd (1 references)
pkts bytes target prot opt in out source destination
123 456 all -- eth0 * 0.0.0.0/0 0.0.0.0/0 /* all_recv */
`},
tags: []map[string]string{
map[string]string{"table": "all_recv", "chain": "accountfwd", "ruleid": "all_recv"},
},
fields: [][]map[string]interface{}{
{map[string]interface{}{"pkts": uint64(123), "bytes": uint64(456)}},
},
},
} }
for i, tt := range tests { for i, tt := range tests {
t.Run(tt.table, func(t *testing.T) {
i++ i++
ipt := &Iptables{ ipt := &Iptables{
Table: tt.table, Table: tt.table,
@ -180,21 +196,21 @@ func TestIptables_Gather(t *testing.T) {
if n != 0 { if n != 0 {
t.Errorf("%d: expected 0 fields if empty table got %d", i, n) t.Errorf("%d: expected 0 fields if empty table got %d", i, n)
} }
continue return
} }
if len(tt.chains) == 0 { if len(tt.chains) == 0 {
n := acc.NFields() n := acc.NFields()
if n != 0 { if n != 0 {
t.Errorf("%d: expected 0 fields if empty chains got %d", i, n) t.Errorf("%d: expected 0 fields if empty chains got %d", i, n)
} }
continue return
} }
if len(tt.tags) == 0 { if len(tt.tags) == 0 {
n := acc.NFields() n := acc.NFields()
if n != 0 { if n != 0 {
t.Errorf("%d: expected 0 values got %d", i, n) t.Errorf("%d: expected 0 values got %d", i, n)
} }
continue return
} }
n := 0 n := 0
for j, tags := range tt.tags { for j, tags := range tt.tags {
@ -216,6 +232,7 @@ func TestIptables_Gather(t *testing.T) {
n++ n++
} }
} }
})
} }
} }