From ee5827ccbdfcf28e4e388de562124303d7bf8cd5 Mon Sep 17 00:00:00 2001 From: Tomas Barton Date: Wed, 13 Feb 2019 01:17:09 +0100 Subject: [PATCH] Remove error log when snmp6 directory does not exists with nstat input (#5403) (#5413) --- plugins/inputs/nstat/README.md | 2 ++ plugins/inputs/nstat/nstat.go | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/plugins/inputs/nstat/README.md b/plugins/inputs/nstat/README.md index c80f893b9..5d2ca6c0a 100644 --- a/plugins/inputs/nstat/README.md +++ b/plugins/inputs/nstat/README.md @@ -36,6 +36,8 @@ The sample config file # dump_zeros = true ``` +In case that `proc_net_snmp6` path doesn't exist (e.g. IPv6 is not enabled) no error would be raised. + ### Measurements & Fields - nstat diff --git a/plugins/inputs/nstat/nstat.go b/plugins/inputs/nstat/nstat.go index 5096d7b03..e6dcb420f 100644 --- a/plugins/inputs/nstat/nstat.go +++ b/plugins/inputs/nstat/nstat.go @@ -83,13 +83,14 @@ func (ns *Nstat) Gather(acc telegraf.Accumulator) error { return err } - // collect SNMP6 data + // collect SNMP6 data, if SNMP6 directory exists (IPv6 enabled) snmp6, err := ioutil.ReadFile(ns.ProcNetSNMP6) - if err != nil { - return err - } - err = ns.gatherSNMP6(snmp6, acc) - if err != nil { + if err == nil { + err = ns.gatherSNMP6(snmp6, acc) + if err != nil { + return err + } + } else if !os.IsNotExist(err) { return err } return nil