Failed conntrack update should return success=0 (#1323, #1723)

Signed-off-by: Li Ling <liiling@google.com>
pull/1816/head
Li Ling 2020-08-20 14:18:57 +02:00
parent f0332993ef
commit a26ffaf4f8
1 changed files with 2 additions and 2 deletions

View File

@ -51,14 +51,14 @@ func (c *conntrackCollector) Update(ch chan<- prometheus.Metric) error {
value, err := readUintFromFile(procFilePath("sys/net/netfilter/nf_conntrack_count")) value, err := readUintFromFile(procFilePath("sys/net/netfilter/nf_conntrack_count"))
if err != nil { if err != nil {
// Conntrack probably not loaded into the kernel. // Conntrack probably not loaded into the kernel.
return nil return err
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.current, prometheus.GaugeValue, float64(value)) c.current, prometheus.GaugeValue, float64(value))
value, err = readUintFromFile(procFilePath("sys/net/netfilter/nf_conntrack_max")) value, err = readUintFromFile(procFilePath("sys/net/netfilter/nf_conntrack_max"))
if err != nil { if err != nil {
return nil return err
} }
ch <- prometheus.MustNewConstMetric( ch <- prometheus.MustNewConstMetric(
c.limit, prometheus.GaugeValue, float64(value)) c.limit, prometheus.GaugeValue, float64(value))