From 285be648c4c23159d40b4cf756bf786f2304653a Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Wed, 1 Feb 2017 16:18:39 +0000 Subject: [PATCH] Godeps update closes #2356 --- CHANGELOG.md | 5 +- Godeps | 110 ++++++++++++++------------- metric/metric_test.go | 3 +- plugins/inputs/docker/docker_test.go | 1 - plugins/outputs/kafka/kafka.go | 1 + 5 files changed, 62 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa0ae6056..1f377a98c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,7 +32,7 @@ It is highly recommended that all users migrate to the new riemann output plugin - [#2204](https://github.com/influxdata/telegraf/pull/2204): Extend http_response to support searching for a substring in response. Return 1 if found, else 0. - [#2137](https://github.com/influxdata/telegraf/pull/2137): Added userstats to mysql input plugin. - [#2179](https://github.com/influxdata/telegraf/pull/2179): Added more InnoDB metric to MySQL plugin. -- [#2229](https://github.com/influxdata/telegraf/pull/2229): `ceph_pgmap_state` metric now uses a single field `count`, with PG state published as `state` tag. +- [#2229](https://github.com/influxdata/telegraf/pull/2229): `ceph_pgmap_state` metric now uses a single field `count`, with PG state published as `state` tag. - [#2251](https://github.com/influxdata/telegraf/pull/2251): InfluxDB output: use own client for improved through-put and less allocations. - [#2330](https://github.com/influxdata/telegraf/pull/2330): Keep -config-directory when running as Windows service. - [#1900](https://github.com/influxdata/telegraf/pull/1900): Riemann plugin rewrite. @@ -44,7 +44,8 @@ It is highly recommended that all users migrate to the new riemann output plugin - [#2077](https://github.com/influxdata/telegraf/issues/2077): SQL Server Input - Arithmetic overflow error converting numeric to data type int. - [#2262](https://github.com/influxdata/telegraf/issues/2262): Flush jitter can inhibit metric collection. -- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods +- [#2287](https://github.com/influxdata/telegraf/issues/2287): Kubernetes input: Handle null startTime for stopped pods. +- [#2356](https://github.com/influxdata/telegraf/issues/2356): cpu input panic when /proc/stat is empty. ## v1.2.1 [2017-02-01] diff --git a/Godeps b/Godeps index c033159c3..5443c1039 100644 --- a/Godeps +++ b/Godeps @@ -1,65 +1,67 @@ -github.com/Shopify/sarama 8aadb476e66ca998f2f6bb3c993e9a2daa3666b9 -github.com/Sirupsen/logrus 219c8cb75c258c552e999735be6df753ffc7afdc -github.com/aerospike/aerospike-client-go 7f3a312c3b2a60ac083ec6da296091c52c795c63 +github.com/Shopify/sarama 574d3147eee384229bf96a5d12c207fe7b5234f3 +github.com/Sirupsen/logrus 61e43dc76f7ee59a82bdf3d71033dc12bea4c77d +github.com/aerospike/aerospike-client-go 95e1ad7791bdbca44707fedbb29be42024900d9c github.com/amir/raidman c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985 -github.com/aws/aws-sdk-go 13a12060f716145019378a10e2806c174356b857 -github.com/beorn7/perks 3ac7bf7a47d159a033b107610db8a1b6575507a4 -github.com/cenkalti/backoff 4dc77674aceaabba2c7e3da25d4c823edfb73f99 -github.com/couchbase/go-couchbase cb664315a324d87d19c879d9cc67fda6be8c2ac1 -github.com/couchbase/gomemcached a5ea6356f648fec6ab89add00edd09151455b4b2 +github.com/aws/aws-sdk-go 7524cb911daddd6e5c9195def8e59ae892bef8d9 +github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9 +github.com/cenkalti/backoff b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3 +github.com/couchbase/go-couchbase bfe555a140d53dc1adf390f1a1d4b0fd4ceadb28 +github.com/couchbase/gomemcached 4a25d2f4e1dea9ea7dd76dfd943407abf9b07d29 github.com/couchbase/goutils 5823a0cbaaa9008406021dc5daf80125ea30bba6 -github.com/dancannon/gorethink e7cac92ea2bc52638791a021f212145acfedb1fc -github.com/davecgh/go-spew 5215b55f46b2b919f50a1df0eaa5886afe4e3b3d -github.com/docker/engine-api 8924d6900370b4c7e7984be5adc61f50a80d7537 -github.com/docker/go-connections f549a9393d05688dff0992ef3efd8bbe6c628aeb -github.com/docker/go-units 5d2041e26a699eaca682e2ea41c8f891e1060444 +github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76 +github.com/docker/distribution fb0bebc4b64e3881cc52a2478d749845ed76d2a8 +github.com/docker/engine-api 4290f40c056686fcaa5c9caf02eac1dde9315adf +github.com/docker/go-connections 9670439d95da2651d9dfc7acc5d2ed92d3f25ee6 +github.com/docker/go-units 0dadbb0345b35ec7ef35e228dabb8de89a65bf52 github.com/eapache/go-resiliency b86b1ec0dd4209a588dc1285cdd471e73525c0b3 -github.com/eapache/queue ded5959c0d4e360646dc9e9908cff48666781367 -github.com/eclipse/paho.mqtt.golang 0f7a459f04f13a41b7ed752d47944528d4bf9a86 -github.com/go-sql-driver/mysql 1fca743146605a172a266e1654e01e5cd5669bee -github.com/gobwas/glob 49571a1557cd20e6a2410adc6421f85b66c730b5 -github.com/golang/protobuf 552c7b9542c194800fd493123b3798ef0a832032 -github.com/golang/snappy d9eb7a3d35ec988b8585d4a0068e462c27d28380 -github.com/gorilla/context 1ea25387ff6f684839d82767c1733ff4d4d15d0a -github.com/gorilla/mux c9e326e2bdec29039a3761c07bece13133863e1e +github.com/eapache/go-xerial-snappy bb955e01b9346ac19dc29eb16586c90ded99a98c +github.com/eapache/queue 44cc805cf13205b55f69e14bcb69867d1ae92f98 +github.com/eclipse/paho.mqtt.golang d4f545eb108a2d19f9b1a735689dbfb719bc21fb +github.com/go-sql-driver/mysql 2e00b5cd70399450106cec6431c2e2ce3cae5034 +github.com/gobwas/glob bea32b9cd2d6f55753d94a28e959b13f0244797a +github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93 +github.com/golang/snappy 7db9049039a047d955fe8c19b83c8ff5abd765c7 +github.com/gorilla/mux 392c28fe23e1c45ddba891b0320b3b5df220beea github.com/hailocab/go-hostpool e80d13ce29ede4452c43dea11e79b9bc8a15b478 -github.com/hashicorp/consul 5aa90455ce78d4d41578bafc86305e6e6b28d7d2 -github.com/hpcloud/tail b2940955ab8b26e19d43a43c4da0475dd81bdb56 -github.com/influxdata/config b79f6829346b8d6e78ba73544b1e1038f1f1c9da -github.com/influxdata/influxdb fc57c0f7c635df3873f3d64f0ed2100ddc94d5ae -github.com/influxdata/toml af4df43894b16e3fd2b788d01bd27ad0776ef2d0 +github.com/hashicorp/consul 63d2fc68239b996096a1c55a0d4b400ea4c2583f +github.com/hpcloud/tail 915e5feba042395f5fda4dbe9c0e99aeab3088b3 +github.com/influxdata/config 8ec4638a81500c20be24855812bc8498ebe2dc92 +github.com/influxdata/influxdb 2fe8ed308439a98a9b01943939b44048ed952c90 +github.com/influxdata/toml ad49a5c2936f96b8f5943c3fdba47630ccf45a0d github.com/influxdata/wlog 7c63b0a71ef8300adc255344d275e10e5c3a71ec -github.com/kardianos/osext 29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc -github.com/kardianos/service 5e335590050d6d00f3aa270217d288dda1c94d0a +github.com/jackc/pgx c8080fc4a1bfa44bf90383ad0fdce2f68b7d313c +github.com/kardianos/osext c2c54e542fb797ad986b31721e1baedf214ca413 +github.com/kardianos/service 6d3a0ee7d3425d9d835debc51a0ca1ffa28f4893 github.com/kballard/go-shellquote d8ec1a69a250a17bb0e419c386eac1f3711dc142 -github.com/klauspost/crc32 19b0b332c9e4516a6370a0456e6182c3b5036720 -github.com/matttproud/golang_protobuf_extensions d0c3fe89de86839aecf2e0579c40ba3bb336a453 -github.com/miekg/dns cce6c130cdb92c752850880fd285bea1d64439dd -github.com/mreiferson/go-snappystream 028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504 +github.com/klauspost/crc32 cb6bfca970f6908083f26f39a79009d608efd5cd +github.com/matttproud/golang_protobuf_extensions c12348ce28de40eed0136aa2b644d0ee0650e56c +github.com/miekg/dns 99f84ae56e75126dd77e5de4fae2ea034a468ca1 github.com/naoina/go-stringutil 6b638e95a32d0c1131db0e7fe83775cbea4a0d0b -github.com/nats-io/nats ea8b4fd12ebb823073c0004b9f09ac8748f4f165 -github.com/nats-io/nuid a5152d67cf63cbfb5d992a395458722a45194715 -github.com/nsqio/go-nsq 0b80d6f05e15ca1930e0c5e1d540ed627e299980 -github.com/opencontainers/runc 89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8 -github.com/prometheus/client_golang 18acf9993a863f4c4b40612e19cdd243e7c86831 +github.com/nats-io/go-nats ea9585611a4ab58a205b9b125ebd74c389a6b898 +github.com/nats-io/nats ea9585611a4ab58a205b9b125ebd74c389a6b898 +github.com/nats-io/nuid 289cccf02c178dc782430d534e3c1f5b72af807f +github.com/nsqio/go-nsq a53d495e81424aaf7a7665a9d32a97715c40e953 +github.com/pierrec/lz4 5c9560bfa9ace2bf86080bf40d46b34ae44604df +github.com/pierrec/xxHash 5a004441f897722c627870a981d02b29924215fa +github.com/prometheus/client_golang c317fb74746eac4fc65fe3909195f4cf67c5562a 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 1516eb9ddc5e61ba58874047a98f8b44b5e585e8 -github.com/soniah/gosnmp 3fe3beb30fa9700988893c56a63b1df8e1b68c26 -github.com/streadway/amqp b4f3ceab0337f013208d31348b578d83c0064744 -github.com/stretchr/testify 1f4a1643a57e798696635ea4c126e9127adb7d3c +github.com/prometheus/common dd2f054febf4a6c00f2343686efb775948a8bff4 +github.com/prometheus/procfs 1878d9fbb537119d24b21ca07effd591627cd160 +github.com/rcrowley/go-metrics 1f30fe9094a513ce4c700b9a54458bbb0c96996c +github.com/samuel/go-zookeeper 1d7be4effb13d2d908342d349d71a284a7542693 +github.com/shirou/gopsutil 77b5d0080adb6f028e457906f1944d9fcca34442 +github.com/soniah/gosnmp 5ad50dc75ab389f8a1c9f8a67d3a1cd85f67ed15 +github.com/streadway/amqp 63795daa9a446c920826655f26ba31c81c860fd6 +github.com/stretchr/testify 4d4bfba8f1d1027c4fdbe371823030df51419987 github.com/vjeantet/grok 83bfdfdfd1a8146795b28e547a8e3c8b28a466c2 github.com/wvanbergen/kafka bc265fedb9ff5b5c5d3c0fdcef4a819b3523d3ee -github.com/wvanbergen/kazoo-go 0f768712ae6f76454f987c3356177e138df258f8 -github.com/yuin/gopher-lua bf3808abd44b1e55143a2d7f08571aaa80db1808 +github.com/wvanbergen/kazoo-go 968957352185472eacb69215fa3dbfcfdbac1096 +github.com/yuin/gopher-lua 66c871e454fcf10251c61bf8eff02d0978cae75a github.com/zensqlmonitor/go-mssqldb ffe5510c6fa5e15e6d983210ab501c815b56b363 -golang.org/x/crypto c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6 -golang.org/x/net 6acef71eb69611914f7a30939ea9f6e194c78172 -golang.org/x/text a71fd10341b064c10f4a81ceac72bcf70f26ea34 -gopkg.in/dancannon/gorethink.v1 7d1af5be49cb5ecc7b177bf387d232050299d6ef -gopkg.in/fatih/pool.v2 cba550ebf9bce999a02e963296d4bc7a486cb715 -gopkg.in/mgo.v2 d90005c5262a3463800497ea5a89aed5fe22c886 -gopkg.in/yaml.v2 a83829b6f1293c91addabc89d0571c246397bbf4 -github.com/jackc/pgx bb73d8427902891bbad7b949b9c60b32949d935f +golang.org/x/crypto dc137beb6cce2043eb6b5f223ab8bf51c32459f4 +golang.org/x/net f2499483f923065a842d38eb4c7f1927e6fc6e6d +golang.org/x/text 506f9d5c962f284575e88337e7d9296d27e729d3 +gopkg.in/dancannon/gorethink.v1 edc7a6a68e2d8015f5ffe1b2560eed989f8a45be +gopkg.in/fatih/pool.v2 6e328e67893eb46323ad06f0e92cb9536babbabc +gopkg.in/mgo.v2 3f83fa5005286a7fe593b055f0d7771a7dce4655 +gopkg.in/yaml.v2 4c78c975fe7c825c6d1466c42be594d1d6f3aba6 diff --git a/metric/metric_test.go b/metric/metric_test.go index f209dc3e4..65b4b0fba 100644 --- a/metric/metric_test.go +++ b/metric/metric_test.go @@ -608,9 +608,10 @@ func TestNewMetricPoint(t *testing.T) { assert.NoError(t, err) p := m.Point() + pfields, _ := p.Fields() assert.Equal(t, fields, m.Fields()) - assert.Equal(t, fields, p.Fields()) + assert.Equal(t, fields, pfields) assert.Equal(t, "cpu", p.Name()) } diff --git a/plugins/inputs/docker/docker_test.go b/plugins/inputs/docker/docker_test.go index a60203af5..cc0ada3c4 100644 --- a/plugins/inputs/docker/docker_test.go +++ b/plugins/inputs/docker/docker_test.go @@ -273,7 +273,6 @@ func (d FakeDockerClient) Info(ctx context.Context) (types.Info, error) { Name: "absol", SwapLimit: false, IPv4Forwarding: true, - ExecutionDriver: "native-0.2", ExperimentalBuild: false, CPUCfsPeriod: true, RegistryConfig: ®istry.ServiceConfig{ diff --git a/plugins/outputs/kafka/kafka.go b/plugins/outputs/kafka/kafka.go index 0bec92812..3815f5726 100644 --- a/plugins/outputs/kafka/kafka.go +++ b/plugins/outputs/kafka/kafka.go @@ -109,6 +109,7 @@ func (k *Kafka) Connect() error { config.Producer.RequiredAcks = sarama.RequiredAcks(k.RequiredAcks) config.Producer.Compression = sarama.CompressionCodec(k.CompressionCodec) config.Producer.Retry.Max = k.MaxRetry + config.Producer.Return.Successes = true // Legacy support ssl config if k.Certificate != "" {