From dec171814f0d2968ae8e362957b30c83a7b4e28ac2d700b61bc538cb56218cf8 Mon Sep 17 00:00:00 2001 From: Nick Singer Date: Mon, 9 Sep 2019 10:00:07 +0000 Subject: [PATCH] Accepting request 729378 from home:coolo:branches:openSUSE:Factory - disable pie on power as it seems to cause problems on go - Update to release 1.12 OBS-URL: https://build.opensuse.org/request/show/729378 OBS-URL: https://build.opensuse.org/package/show/devel:languages:go/telegraf?expand=0&rev=13 --- ...neric-SQL-output-plugin-for-Telegraf.patch | 48 ++++---- telegraf-1.12.0.tar.gz | 3 + telegraf-1.8.3.tar.gz | 3 - telegraf-deps.tar.xz | 4 +- telegraf.changes | 115 ++++++++++++++++++ telegraf.spec | 19 +-- 6 files changed, 158 insertions(+), 34 deletions(-) create mode 100644 telegraf-1.12.0.tar.gz delete mode 100644 telegraf-1.8.3.tar.gz diff --git a/0001-Generic-SQL-output-plugin-for-Telegraf.patch b/0001-Generic-SQL-output-plugin-for-Telegraf.patch index 90725d1..a5198f5 100644 --- a/0001-Generic-SQL-output-plugin-for-Telegraf.patch +++ b/0001-Generic-SQL-output-plugin-for-Telegraf.patch @@ -1,16 +1,17 @@ -diff -urN telegraf-1.8.3/plugins/outputs/all/all.go telegraf-1.8.3-patch/plugins/outputs/all/all.go ---- telegraf-1.8.3/plugins/outputs/all/all.go 2018-10-30 23:13:52.000000000 +0200 -+++ telegraf-1.8.3-patch/plugins/outputs/all/all.go 2018-11-01 10:00:53.949179483 +0200 -@@ -28,5 +28,6 @@ - _ "github.com/influxdata/telegraf/plugins/outputs/riemann" - _ "github.com/influxdata/telegraf/plugins/outputs/riemann_legacy" - _ "github.com/influxdata/telegraf/plugins/outputs/socket_writer" -+ _ "github.com/influxdata/telegraf/plugins/outputs/sql" +Index: telegraf-1.12.0/plugins/outputs/all/all.go +=================================================================== +--- telegraf-1.12.0.orig/plugins/outputs/all/all.go ++++ telegraf-1.12.0/plugins/outputs/all/all.go +@@ -34,4 +34,5 @@ import ( + _ "github.com/influxdata/telegraf/plugins/outputs/stackdriver" + _ "github.com/influxdata/telegraf/plugins/outputs/syslog" _ "github.com/influxdata/telegraf/plugins/outputs/wavefront" ++ _ "github.com/influxdata/telegraf/plugins/outputs/sql" ) -diff -urN telegraf-1.8.3/plugins/outputs/sql/README.md telegraf-1.8.3-patch/plugins/outputs/sql/README.md ---- telegraf-1.8.3/plugins/outputs/sql/README.md 1970-01-01 02:00:00.000000000 +0200 -+++ telegraf-1.8.3-patch/plugins/outputs/sql/README.md 2018-11-01 09:59:15.296965030 +0200 +Index: telegraf-1.12.0/plugins/outputs/sql/README.md +=================================================================== +--- /dev/null ++++ telegraf-1.12.0/plugins/outputs/sql/README.md @@ -0,0 +1,73 @@ +# SQL plugin + @@ -85,9 +86,10 @@ diff -urN telegraf-1.8.3/plugins/outputs/sql/README.md telegraf-1.8.3-patch/plug +## TODO +1) Test with other databases +2) More sane testing -diff -urN telegraf-1.8.3/plugins/outputs/sql/sql.go telegraf-1.8.3-patch/plugins/outputs/sql/sql.go ---- telegraf-1.8.3/plugins/outputs/sql/sql.go 1970-01-01 02:00:00.000000000 +0200 -+++ telegraf-1.8.3-patch/plugins/outputs/sql/sql.go 2018-11-01 09:59:15.300965038 +0200 +Index: telegraf-1.12.0/plugins/outputs/sql/sql.go +=================================================================== +--- /dev/null ++++ telegraf-1.12.0/plugins/outputs/sql/sql.go @@ -0,0 +1,256 @@ +package sql + @@ -345,9 +347,10 @@ diff -urN telegraf-1.8.3/plugins/outputs/sql/sql.go telegraf-1.8.3-patch/plugins + TagTableSuffix: "_tag", + } +} -diff -urN telegraf-1.8.3/plugins/outputs/sql/sql_test.go telegraf-1.8.3-patch/plugins/outputs/sql/sql_test.go ---- telegraf-1.8.3/plugins/outputs/sql/sql_test.go 1970-01-01 02:00:00.000000000 +0200 -+++ telegraf-1.8.3-patch/plugins/outputs/sql/sql_test.go 2018-11-01 09:59:15.300965038 +0200 +Index: telegraf-1.12.0/plugins/outputs/sql/sql_test.go +=================================================================== +--- /dev/null ++++ telegraf-1.12.0/plugins/outputs/sql/sql_test.go @@ -0,0 +1,29 @@ +package sql + @@ -378,14 +381,15 @@ diff -urN telegraf-1.8.3/plugins/outputs/sql/sql_test.go telegraf-1.8.3-patch/pl + t.Skip("Skipping integration test in short mode") + } +} -diff -urN telegraf-1.8.3/README.md telegraf-1.8.3-patch/README.md ---- telegraf-1.8.3/README.md 2018-10-30 23:13:52.000000000 +0200 -+++ telegraf-1.8.3-patch/README.md 2018-11-01 10:00:11.129086395 +0200 -@@ -237,6 +237,7 @@ +Index: telegraf-1.12.0/README.md +=================================================================== +--- telegraf-1.12.0.orig/README.md ++++ telegraf-1.12.0/README.md +@@ -272,6 +272,7 @@ For documentation on the latest developm * [snmp](./plugins/inputs/snmp) * [socket_listener](./plugins/inputs/socket_listener) * [solr](./plugins/inputs/solr) +* [sql](./plugins/outputs/sql) (sql generic output) * [sql server](./plugins/inputs/sqlserver) (microsoft) + * [stackdriver](./plugins/inputs/stackdriver) * [statsd](./plugins/inputs/statsd) - * [swap](./plugins/inputs/swap) diff --git a/telegraf-1.12.0.tar.gz b/telegraf-1.12.0.tar.gz new file mode 100644 index 0000000..20b7075 --- /dev/null +++ b/telegraf-1.12.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d975ce01fc9cdc02d4f3369f20b8a761933065a2261ad39f340a062d4744b8bc +size 1560930 diff --git a/telegraf-1.8.3.tar.gz b/telegraf-1.8.3.tar.gz deleted file mode 100644 index 920e9d2..0000000 --- a/telegraf-1.8.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a8157a7093f29878ba5851abed62966c97d017c127eab915e235842aeafe7e88 -size 1205303 diff --git a/telegraf-deps.tar.xz b/telegraf-deps.tar.xz index e448ff3..4f435f0 100644 --- a/telegraf-deps.tar.xz +++ b/telegraf-deps.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ba7819e0e5e3c234506027ec720614d1f483da02e4caa20d40597a5f832bd3a -size 39517468 +oid sha256:3f5409f0b38c8686dfac8b44750dd510f2aa4a04398739d5b9cfeecaed082bd9 +size 96785916 diff --git a/telegraf.changes b/telegraf.changes index 62c861e..c3c039e 100644 --- a/telegraf.changes +++ b/telegraf.changes @@ -1,3 +1,118 @@ +------------------------------------------------------------------- +Mon Sep 9 09:37:19 UTC 2019 - Stephan Kulow + +- disable pie on power as it seems to cause problems on go + +------------------------------------------------------------------- +Mon Sep 9 06:13:23 UTC 2019 - Stephan Kulow + +- Update to release 1.12 + +Release Notes + The cluster health related fields in the elasticsearch input have been split + out from the elasticsearch_indices mesasurement into the new + elasticsearch_cluster_health_indices measurement as they were originally + combined by error. + +New Inputs + apcupsd - Contributed by @jonaz + docker_log - Contributed by @prashanthjbabu + fireboard - Contributed by @ronnocol + logstash - Contributed by @lkmcs @dmitryilyin @arkady-emelyanov + marklogic - Contributed by @influxdata + openntpd - Contributed by @aromeyer + uwsgi - Contributed by @blaggacao + +New Parsers + form_urlencoded - Contributed by @byonchev + +New Processors + date - Contributed by @influxdata + pivot - Contributed by @influxdata + tag_limit - Contributed by @memory + unpivot - Contributed by @influxdata + +New Outputs + exec - Contributed by @Jaeyo + +- Update to release 1.11 + +Release Notes + The uptime_format field in the system input has been deprecated, use the + uptime field instead. + The cloudwatch input has been updated to use a more efficient API, it now + requires GetMetricData permissions instead of GetMetricStatistics. The + units tag is not available from this API and is no longer collected. + +New Inputs + + bind - Contributed by @dswarbrick & @danielllek + cisco_telemetry_gnmi - Contributed by @sbyx + cisco_telemetry_mdt - Contributed by @sbyx + ecs - Contributed by @rbtr + github - Contributed by @influxdata + openweathermap - Contributed by @regel + powerdns_recursor - Contributed by @dupondje + +New Aggregators + final - Contributed by @oplehto + +New Outputs + syslog - Contributed by @javicrespo + health - Contributed by @influxdata + +New Serializers + wavefront - Contributed by @puckpuck + +- Update to release 1.10 + +New Inputs + cloud_pubsub - Contributed by @emilymye + cloud_pubsub_push - Contributed by @influxdata + kinesis_consumer - Contributed by @influxdata + kube_inventory - Contributed by @influxdata + neptune_apex - Contributed by @MaxRenaud + nginx_upstream_check - Contributed by @dmitryilyin + multifile - Contributed by @martin2250 + stackdriver - Contributed by @WuHan0608 + +New Outputs + cloud_pubsub - Contributed by @emilymye + +New Serializers + nowmetric - Contributed by @JefMuller + carbon2 - Contributed by @frankreno + +- Update to release 1.9 + +Release Notes + The http_listener input plugin has been renamed to influxdb_listener and + use of the original name is deprecated. The new name better describes the + intended use of the plugin as a InfluxDB relay. For general purpose + transfer of metrics in any format via HTTP, it is recommended to use + http_listener_v2 instead. + + Input plugins are no longer limited from adding metrics when the output is + writing, and new metrics will move into the metric buffer as needed. This + will provide more robust degradation and recovery when writing to a slow + output at high throughput. + + To avoid over consumption when reading from queue consumers: kafka_consumer, + amqp_consumer, mqtt_consumer, nats_consumer, and nsq_consumer use + the new option max_undelivered_messages to limit the number of outstanding + unwritten metrics. + +New Inputs + http_listener_v2 - Contributed by @jul1u5 + ipvs - Contributed by @amoghe + jenkins - Contributed by @influxdata & @lpic10 + nginx_plus_api - Contributed by @Bugagazavr + nginx_vts - Contributed by @monder + wireless - Contributed by @jamesmaidment + +New Outputs + stackdriver - Contributed by @jamesmaidment + ------------------------------------------------------------------- Wed Mar 27 11:32:56 UTC 2019 - Jan Engelhardt diff --git a/telegraf.spec b/telegraf.spec index 0f39c77..d0bc37b 100644 --- a/telegraf.spec +++ b/telegraf.spec @@ -1,7 +1,7 @@ # # spec file for package telegraf # -# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,19 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: telegraf -Version: 1.8.3 +Version: 1.12.0 Release: 0 -License: MIT Summary: The plugin-driven server agent for collecting & reporting metrics -Url: https://github.com/influxdata/telegraf +License: MIT Group: System/Monitoring +Url: https://github.com/influxdata/telegraf Source: %{name}-%{version}.tar.gz +# run dep ensure --vendor-only (in a container) Source1: %{name}-deps.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: git-core BuildRequires: go >= 1.7 BuildRequires: golang-packaging BuildRequires: systemd-rpm-macros @@ -48,18 +51,20 @@ easily add support for collecting metrics from local or remote services. %prep mkdir -p %{_influxdata_dir} -tar -C %{_builddir}/src -xJf %{SOURCE1} tar -C %{_influxdata_dir} -xzf %{SOURCE0} cd %{_influxdata_dir} # If there is allready telegraf then remove it rm -rf %{name} ln -sf %{name}-%{version} %{name} cd %{name} +tar -xJf %{SOURCE1} %patch0 -p1 %build -export GOPATH="%{_builddir}:$GOPATH" +%ifnarch ppc64 ppc64le export LDFLAGS="-buildmode=pie" +%endif +export GOPATH="%{_builddir}:$GOPATH" cd %{_telegraf_dir} make %{name}