From 2c4d6a867f28c0673399d701aeb06e6dd033f3a8 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Tue, 24 Apr 2018 14:40:19 -0700 Subject: [PATCH] Fix timeout parsing error in nvidia_smi (#4070) --- plugins/inputs/nvidia_smi/nvidia_smi.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/inputs/nvidia_smi/nvidia_smi.go b/plugins/inputs/nvidia_smi/nvidia_smi.go index 0cf9bd9e7..35e56c9b7 100644 --- a/plugins/inputs/nvidia_smi/nvidia_smi.go +++ b/plugins/inputs/nvidia_smi/nvidia_smi.go @@ -36,7 +36,7 @@ var ( // NvidiaSMI holds the methods for this plugin type NvidiaSMI struct { BinPath string - Timeout time.Duration + Timeout internal.Duration metrics string } @@ -81,7 +81,7 @@ func init() { inputs.Add("nvidia_smi", func() telegraf.Input { return &NvidiaSMI{ BinPath: "/usr/bin/nvidia-smi", - Timeout: 5 * time.Second, + Timeout: internal.Duration{Duration: 5 * time.Second}, metrics: metrics, } }) @@ -90,7 +90,7 @@ func init() { func (smi *NvidiaSMI) pollSMI() (string, error) { // Construct and execute metrics query opts := []string{"--format=noheader,nounits,csv", fmt.Sprintf("--query-gpu=%s", smi.metrics)} - ret, err := internal.CombinedOutputTimeout(exec.Command(smi.BinPath, opts...), smi.Timeout) + ret, err := internal.CombinedOutputTimeout(exec.Command(smi.BinPath, opts...), smi.Timeout.Duration) if err != nil { return "", err }