diff --git a/plugins/inputs/mqtt_consumer/README.md b/plugins/inputs/mqtt_consumer/README.md index c61545e8e97fd46b0eca685f0e32138b812924ab..52990ef762532637c8863b589306a0b506bad4f0 100644 --- a/plugins/inputs/mqtt_consumer/README.md +++ b/plugins/inputs/mqtt_consumer/README.md @@ -14,7 +14,7 @@ The plugin expects messages in the ## MQTT QoS, must be 0, 1, or 2 qos = 0 ## Connection timeout for initial connection in seconds - connection_timeout = 30 + connection_timeout = "30s" ## Topics to subscribe to topics = [ diff --git a/plugins/inputs/mqtt_consumer/mqtt_consumer.go b/plugins/inputs/mqtt_consumer/mqtt_consumer.go index 3cd98baea61481f554073424d41c67c0690a0d27..e0d668879f8ac3879bd1f10e9920298244390bc8 100644 --- a/plugins/inputs/mqtt_consumer/mqtt_consumer.go +++ b/plugins/inputs/mqtt_consumer/mqtt_consumer.go @@ -15,6 +15,9 @@ import ( "github.com/eclipse/paho.mqtt.golang" ) +// 30 Seconds is the default used by paho.mqtt.golang +var defaultConnectionTimeout = internal.Duration{Duration: 30 * time.Second} + type MQTTConsumer struct { Servers []string Topics []string @@ -57,7 +60,7 @@ var sampleConfig = ` ## MQTT QoS, must be 0, 1, or 2 qos = 0 ## Connection timeout for initial connection in seconds - connection_timeout = 30 + connection_timeout = "30s" ## Topics to subscribe to topics = [ @@ -270,6 +273,8 @@ func (m *MQTTConsumer) createOpts() (*mqtt.ClientOptions, error) { func init() { inputs.Add("mqtt_consumer", func() telegraf.Input { - return &MQTTConsumer{} + return &MQTTConsumer{ + ConnectionTimeout: defaultConnectionTimeout, + } }) }