@@ -29,7 +29,7 @@

   interval = "60s"

   ## Rounds collection interval to 'interval'

   ## ie, if interval="10s" then always collect on :00, :10, :20, etc.

-  round_interval = true

+  round_interval = false

   ## Telegraf will send metrics to outputs in batches of at

   ## most metric_batch_size metrics.

@@ -72,6 +72,43 @@

 #                            OUTPUT PLUGINS                                   #

 ###############################################################################

+ [[outputs.wavefront]]

+          ## DNS name of the wavefront proxy server

+          host = "localhost"

+

+          ## Port that the Wavefront proxy server listens on

+          port = 2878

+

+          ## prefix for metrics keys

+          #prefix = "my.specific.prefix."

+

+          ## wether to use "value" for name of simple fields. default is false

+          simple_fields = false

+

+          ## character to use between metric and field name. default is . (dot)

+          metric_separator = "."

+

+          ## Convert metric name paths to use metricSeperator character

+          ## When true will convert all _ (underscore) chartacters in final metric name. default is true

+          convert_paths = true

+

+          ## Use Regex to sanitize metric and tag names from invalid characters

+          ## Regex is more thorough, but significantly slower. default is false

+          use_regex = false

+

+          ## point tags to use as the source name for Wavefront (if none found, host will be used)

+          source_override = ["hostname", "snmp_host", "node_host"]

+

+          ## whether to convert boolean values to numeric values, with false -> 0.0 and true -> 1.0. default is true

+          convert_bool = true

+

+          ## Define a mapping, namespaced by metric prefix, from string values to numeric values

+          ## The example below maps "green" -> 1.0, "yellow" -> 0.5, "red" -> 0.0 for

+          ## any metrics beginning with "elasticsearch"

+          #[[outputs.wavefront.string_to_number.elasticsearch]]

+          #  green = 1.0

+          #  yellow = 0.5

+          #  red = 0.0

 ###############################################################################

@@ -1,14 +1,12 @@

 Summary:        agent for collecting, processing, aggregating, and writing metrics.

 Name:           telegraf

-Version:        1.3.4

-Release:        2%{?dist}

+Version:        1.5.3

+Release:        1%{?dist}

 License:        MIT

 URL:            https://github.com/influxdata/telegraf

 Source0:        https://github.com/influxdata/telegraf/archive/%{name}-%{version}.tar.gz

-%define sha1    telegraf=b9613ff3960ab791ec992426067b99c02b8797c7

-Source1:        https://github.com/wavefrontHQ/telegraf/archive/telegraf-plugin.zip

-%define sha1    telegraf-plugin=6cc53faee7ae4df01f7bc5c6dcd46d94a5db5ece 

-Source2:        https://raw.githubusercontent.com/wavefrontHQ/integrations/master/telegraf/telegraf.conf

+%define sha1    telegraf=ff9860f1491cedb965283e1ffd5bd6870c473f77

+Source1:        https://raw.githubusercontent.com/wavefrontHQ/integrations/master/telegraf/telegraf.conf

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -16,6 +14,7 @@ BuildRequires:  go

 BuildRequires:  git

 BuildRequires:  systemd-devel

 BuildRequires:  unzip

+BuildRequires:  elfutils

 Requires:       systemd

 Requires:       logrotate

 Requires(pre):  /usr/sbin/useradd /usr/sbin/groupadd

@@ -30,37 +29,19 @@ Postgres, or Redis) and third party APIs (like Mailchimp, AWS CloudWatch, or Goo

 %prep

 %setup

-cat << EOF >>%{SOURCE2}

-[[outputs.wavefront]]

-host = "localhost"

-port = 2878

-metric_separator = "."

-source_override = ["hostname", "snmp_host", "node_host"]

-convert_paths = true

-use_regex = false

-EOF

-

-pushd ..

-unzip %{SOURCE1}

-popd

 %build

 mkdir -p ${GOPATH}/src/github.com/influxdata/telegraf

 cp -r * ${GOPATH}/src/github.com/influxdata/telegraf

-mkdir -p ${GOPATH}/src/github.com/wavefronthq/telegraf/plugins/outputs/wavefront

-pushd ../telegraf-master

-cp -r *  ${GOPATH}/src/github.com/wavefronthq/telegraf/

-popd

 pushd ${GOPATH}/src/github.com/influxdata/telegraf

-sed -i '/import (/ a \\t_ "github.com/wavefronthq/telegraf/plugins/outputs/wavefront"' ${GOPATH}/src/github.com/influxdata/telegraf/plugins/outputs/all/all.go

 make

 popd

 %install

-install -m 755 -D ${GOPATH}/bin/telegraf %{buildroot}%{_bindir}/telegraf

+install -m 755 -D ${GOPATH}/src/github.com/influxdata/telegraf/telegraf %{buildroot}%{_bindir}/telegraf

 install -m 755 -D ${GOPATH}/src/github.com/influxdata/telegraf/scripts/telegraf.service %{buildroot}%{_unitdir}/telegraf.service

 install -m 755 -D ${GOPATH}/src/github.com/influxdata/telegraf/etc/logrotate.d/%{name} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}

-install -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/telegraf.conf

+install -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/telegraf.conf

 %clean

 rm -rf %{buildroot}/*

@@ -93,6 +74,8 @@ fi

 %config(noreplace) %{_sysconfdir}/%{name}/telegraf.conf

 %changelog

+*   Fri Apr 20 2018 Dheeraj Shetty <dheerajs@vmware.com> 1.5.3-1

+-   upgrade to 1.5.3

 *   Mon Sep 18 2017 Alexey Makhalov <amakhalov@vmware.com> 1.3.4-2

 -   Remove shadow from requires and use explicit tools for post actions

 *   Tue Jul 18 2017 Dheeraj Shetty <dheerajs@vmware.com> 1.3.4-1

@@ -1,12 +1,11 @@

 Summary:        lightweight java application to send metrics to.

 Name:           wavefront-proxy

-Version:        4.16

-Release:        4%{?dist}

+Version:        4.26

+Release:        1%{?dist}

 License:        Apache 2.0

 URL:            https://github.com/wavefrontHQ/java

 Source0:        https://github.com/wavefrontHQ/java/archive/wavefront-%{version}.tar.gz 

-%define sha1    wavefront=ff6ff22118e69c9df8de1427aa67659ebeb3341f

-Patch0:         CVE-2017-9735.patch

+%define sha1    wavefront=07a1006c4c47dcda48b2cca8464075283f8f457d

 Group:          Development/Tools

 Vendor:         VMware, Inc.

 Distribution:   Photon

@@ -27,7 +26,6 @@ It handles authentication and the transmission of your metrics to your Wavefront

 %prep

 %setup -n java-wavefront-%{version} 

-%patch0 -p1

 cat << EOF >>wavefront-proxy.service

 [Unit]

@@ -106,6 +104,8 @@ rm -rf %{buildroot}/*

 %{_unitdir}/wavefront-proxy.service

 %changelog

+* Fri Apr 20 2018 Dheeraj Shetty <dheerajs@vmware.com> 4.26-1

+- upgrade to 4.26

 * Mon Oct 08 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-4

 - Add Docker related files to the package

 * Tue Oct 03 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.16-3