Browse code

telegraf, wavefront-proxy: Update to latest versions

Change-Id: I154674419db9ac140b2581fd3ef3253e07c38a5f
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6867
Tested-by: michellew <michellew@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>

Keerthana K authored on 2019/03/14 21:04:06
Showing 2 changed files
... ...
@@ -2,15 +2,17 @@
2 2
 
3 3
 Summary:        agent for collecting, processing, aggregating, and writing metrics.
4 4
 Name:           telegraf
5
-Version:        1.7.4
5
+Version:        1.10.0
6 6
 Release:        1%{?dist}
7 7
 License:        MIT
8 8
 URL:            https://github.com/influxdata/telegraf
9 9
 Source0:        https://github.com/influxdata/telegraf/archive/%{name}-%{version}.tar.gz
10
-%define sha1    telegraf=f6ecf299a5147bb592d779affff4efd236970831
10
+%define sha1    telegraf=e02d4c1319099f4111ab06a4fa6c4e47b8e70742
11 11
 Source1:        https://github.com/wavefrontHQ/telegraf/archive/telegraf-plugin-1.4.0.zip
12 12
 %define sha1    telegraf-plugin=51d2bedf6b7892dbe079e7dd948d60c31a2fc436
13 13
 Source2:        https://raw.githubusercontent.com/wavefrontHQ/integrations/master/telegraf/telegraf.conf
14
+Source3:       golang-dep-0.5.0.tar.gz
15
+%define sha1 golang-dep-0.5.0=b8bb441fe3a4445e6cd4fa263dd2112e8566a734
14 16
 Group:          Development/Tools
15 17
 Vendor:         VMware, Inc.
16 18
 Distribution:   Photon
... ...
@@ -32,6 +34,10 @@ Postgres, or Redis) and third party APIs (like Mailchimp, AWS CloudWatch, or Goo
32 32
 
33 33
 %prep
34 34
 %setup
35
+mkdir -p ${GOPATH}/src/github.com/golang/dep
36
+tar xf %{SOURCE3} --no-same-owner --strip-components 1 -C ${GOPATH}/src/github.com/golang/dep/
37
+mkdir -p ${GOPATH}/src/github.com/influxdata/telegraf
38
+tar xf %{SOURCE0} --no-same-owner --strip-components 1 -C ${GOPATH}/src/github.com/influxdata/telegraf
35 39
 cat << EOF >>%{SOURCE2}
36 40
 [[outputs.wavefront]]
37 41
 host = "localhost"
... ...
@@ -47,8 +53,9 @@ unzip %{SOURCE1}
47 47
 popd
48 48
 
49 49
 %build
50
-mkdir -p ${GOPATH}/src/github.com/influxdata/telegraf
51
-cp -r * ${GOPATH}/src/github.com/influxdata/telegraf
50
+pushd ${GOPATH}/src/github.com/golang/dep
51
+CGO_ENABLED=0 GOOS=linux go build -v -ldflags "-s -w" -o ${GOPATH}/bin/dep ./cmd/dep/
52
+popd
52 53
 mkdir -p ${GOPATH}/src/github.com/wavefronthq/telegraf/plugins/outputs/wavefront
53 54
 pushd ../telegraf-1.4.0
54 55
 cp -r *  ${GOPATH}/src/github.com/wavefronthq/telegraf/
... ...
@@ -97,6 +104,8 @@ fi
97 97
 %config(noreplace) %{_sysconfdir}/%{name}/telegraf.conf
98 98
 
99 99
 %changelog
100
+*   Thu Mar 14 2019 Keerthana K <keerthanak@vmware.com> 1.10.0-1
101
+-   Update to version 1.10.0
100 102
 *   Fri Sep 07 2018 Michelle Wang <michellew@vmware.com> 1.7.4-1
101 103
 -   Update version to 1.7.4 and its plugin version to 1.4.0.
102 104
 *   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.32
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=216c16125c6308debcffc1d6bd3969b9ea5013eb
8
+%define sha1    wavefront=9e1f35557cf1f80248997464247f4974f31c2afa
9 9
 Group:          Development/Tools
10 10
 Vendor:         VMware, Inc.
11 11
 Distribution:   Photon
... ...
@@ -108,6 +108,8 @@ rm -rf %{buildroot}/*
108 108
 %{_unitdir}/wavefront-proxy.service
109 109
 
110 110
 %changelog
111
+* Thu Mar 14 2019 Keerthana K <keerthanak@vmware.com> 4.36-1
112
+- Updated to 4.36
111 113
 * Thu Dec 06 2018 Ankit Jain <ankitja@vmware.com> 4.32-1
112 114
 - updated to 4.32
113 115
 * Tue Nov 20 2018 Ajay Kaher <akaher@vmware.com> 4.28-4