Browse code
telegraf, wavefront-proxy: Update to latest versions
Change-Id: Ia92d65e880ec7fcaa016ceed8098955e0cd0b670
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6866
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Tapas Kundu <tkundu@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Keerthana K authored on 2019/03/14 20:13:59Showing 2 changed files
| ... | ... |
@@ -1,12 +1,16 @@ |
| 1 | 1 |
Summary: agent for collecting, processing, aggregating, and writing metrics. |
| 2 | 2 |
Name: telegraf |
| 3 |
-Version: 1.5.3 |
|
| 3 |
+Version: 1.10.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: MIT |
| 6 | 6 |
URL: https://github.com/influxdata/telegraf |
| 7 | 7 |
Source0: https://github.com/influxdata/telegraf/archive/%{name}-%{version}.tar.gz
|
| 8 |
-%define sha1 telegraf=ff9860f1491cedb965283e1ffd5bd6870c473f77 |
|
| 9 |
-Source1: https://raw.githubusercontent.com/wavefrontHQ/integrations/master/telegraf/telegraf.conf |
|
| 8 |
+%define sha1 telegraf=e02d4c1319099f4111ab06a4fa6c4e47b8e70742 |
|
| 9 |
+Source1: https://github.com/wavefrontHQ/telegraf/archive/telegraf-plugin-1.4.0.zip |
|
| 10 |
+%define sha1 telegraf-plugin=51d2bedf6b7892dbe079e7dd948d60c31a2fc436 |
|
| 11 |
+Source2: https://raw.githubusercontent.com/wavefrontHQ/integrations/master/telegraf/telegraf.conf |
|
| 12 |
+Source3: golang-dep-0.5.0.tar.gz |
|
| 13 |
+%define sha1 golang-dep-0.5.0=b8bb441fe3a4445e6cd4fa263dd2112e8566a734 |
|
| 10 | 14 |
Group: Development/Tools |
| 11 | 15 |
Vendor: VMware, Inc. |
| 12 | 16 |
Distribution: Photon |
| ... | ... |
@@ -29,11 +33,36 @@ Postgres, or Redis) and third party APIs (like Mailchimp, AWS CloudWatch, or Goo |
| 29 | 29 |
|
| 30 | 30 |
%prep |
| 31 | 31 |
%setup |
| 32 |
+mkdir -p ${GOPATH}/src/github.com/golang/dep
|
|
| 33 |
+tar xf %{SOURCE3} --no-same-owner --strip-components 1 -C ${GOPATH}/src/github.com/golang/dep/
|
|
| 34 |
+mkdir -p ${GOPATH}/src/github.com/influxdata/telegraf
|
|
| 35 |
+tar xf %{SOURCE0} --no-same-owner --strip-components 1 -C ${GOPATH}/src/github.com/influxdata/telegraf
|
|
| 36 |
+cat << EOF >>%{SOURCE2}
|
|
| 37 |
+[[outputs.wavefront]] |
|
| 38 |
+host = "localhost" |
|
| 39 |
+port = 2878 |
|
| 40 |
+metric_separator = "." |
|
| 41 |
+source_override = ["hostname", "snmp_host", "node_host"] |
|
| 42 |
+convert_paths = true |
|
| 43 |
+use_regex = false |
|
| 44 |
+EOF |
|
| 45 |
+ |
|
| 46 |
+pushd .. |
|
| 47 |
+unzip %{SOURCE1}
|
|
| 48 |
+popd |
|
| 32 | 49 |
|
| 33 | 50 |
%build |
| 34 |
-mkdir -p ${GOPATH}/src/github.com/influxdata/telegraf
|
|
| 35 |
-cp -r * ${GOPATH}/src/github.com/influxdata/telegraf
|
|
| 51 |
+pushd ${GOPATH}/src/github.com/golang/dep
|
|
| 52 |
+CGO_ENABLED=0 GOOS=linux go build -v -ldflags "-s -w" -o ${GOPATH}/bin/dep ./cmd/dep/
|
|
| 53 |
+popd |
|
| 54 |
+mkdir -p ${GOPATH}/src/github.com/wavefronthq/telegraf/plugins/outputs/wavefront
|
|
| 55 |
+pushd ../telegraf-1.4.0 |
|
| 56 |
+cp -r * ${GOPATH}/src/github.com/wavefronthq/telegraf/
|
|
| 57 |
+popd |
|
| 36 | 58 |
pushd ${GOPATH}/src/github.com/influxdata/telegraf
|
| 59 |
+sed -i '/import (/ a \\t_ "github.com/wavefronthq/telegraf/plugins/outputs/wavefront"' ${GOPATH}/src/github.com/influxdata/telegraf/plugins/outputs/all/all.go
|
|
| 60 |
+sed -i 's/m.UnixNano()/m.Time().UnixNano()/g' ${GOPATH}/src/github.com/wavefronthq/telegraf/plugins/outputs/wavefront/wavefront.go
|
|
| 61 |
+sed -i 's/github.com\/golang\/lint\/golint/golang.org\/x\/lint\/golint/g' ${GOPATH}/src/github.com/influxdata/telegraf/Makefile
|
|
| 37 | 62 |
make |
| 38 | 63 |
popd |
| 39 | 64 |
|
| ... | ... |
@@ -74,6 +103,8 @@ fi |
| 74 | 74 |
%config(noreplace) %{_sysconfdir}/%{name}/telegraf.conf
|
| 75 | 75 |
|
| 76 | 76 |
%changelog |
| 77 |
+* Thu Mar 14 2019 Keerthana K <keerthanak@vmware.com> 1.10.0-1 |
|
| 78 |
+- Update to 1.10.0 and its plugin version to 1.4.0. |
|
| 77 | 79 |
* Fri Apr 20 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.5.3-1 |
| 78 | 80 |
- upgrade to 1.5.3 |
| 79 | 81 |
* Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.4-2 |
| ... | ... |
@@ -1,11 +1,11 @@ |
| 1 | 1 |
Summary: lightweight java application to send metrics to. |
| 2 | 2 |
Name: wavefront-proxy |
| 3 |
-Version: 4.26 |
|
| 3 |
+Version: 4.36 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: Apache 2.0 |
| 6 | 6 |
URL: https://github.com/wavefrontHQ/java |
| 7 | 7 |
Source0: https://github.com/wavefrontHQ/java/archive/wavefront-%{version}.tar.gz
|
| 8 |
-%define sha1 wavefront=07a1006c4c47dcda48b2cca8464075283f8f457d |
|
| 8 |
+%define sha1 wavefront=9e1f35557cf1f80248997464247f4974f31c2afa |
|
| 9 | 9 |
Group: Development/Tools |
| 10 | 10 |
Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| ... | ... |
@@ -104,6 +104,8 @@ rm -rf %{buildroot}/*
|
| 104 | 104 |
%{_unitdir}/wavefront-proxy.service
|
| 105 | 105 |
|
| 106 | 106 |
%changelog |
| 107 |
+* Thu Mar 14 2019 Keerthana K <keerthanak@vmware.com> 4.36-1 |
|
| 108 |
+- Update to version 4.36 |
|
| 107 | 109 |
* Fri Apr 20 2018 Dheeraj Shetty <dheerajs@vmware.com> 4.26-1 |
| 108 | 110 |
- upgrade to 4.26 |
| 109 | 111 |
* Mon Oct 08 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-4 |