From 3c5c3b98dfb3a0f7a1b16346e7e1888530ede9a2 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Sat, 21 May 2016 20:47:20 +0100 Subject: [PATCH] update gopsutil to commit with timeout support closes #1215 --- CHANGELOG.md | 1 + Godeps | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ac72ef12..d01cabe47 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - [#1195](https://github.com/influxdata/telegraf/pull/1195): Docker panic on timeout. Thanks @zstyblik! - [#1211](https://github.com/influxdata/telegraf/pull/1211): mongodb input. Fix possible panic. Thanks @kols! +- [#1215](https://github.com/influxdata/telegraf/pull/1215): Fix for possible gopsutil-dependent plugin hangs. - [#1228](https://github.com/influxdata/telegraf/pull/1228): Fix service plugin host tag overwrite. - [#1198](https://github.com/influxdata/telegraf/pull/1198): http_response: override request Host header properly diff --git a/Godeps b/Godeps index 59c09d514..42c499fc7 100644 --- a/Godeps +++ b/Godeps @@ -42,7 +42,7 @@ github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6 github.com/prometheus/common e8eabff8812b05acf522b45fdcd725a785188e37 github.com/prometheus/procfs 406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8 github.com/samuel/go-zookeeper 218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f -github.com/shirou/gopsutil bae75faa5ad1212d3e80f11f5e9cd147c6be9198 +github.com/shirou/gopsutil 83c6e72cbdef6e8ada934549abf700ff0ba96776 github.com/soniah/gosnmp b1b4f885b12c5dcbd021c5cee1c904110de6db7d github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744 github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c