add package for Telegraf #189

wrboyce · 2016-09-16T13:41:54Z

No description provided.

netgate-git-updates · 2016-09-16T13:57:27Z

Before this pull request can be accepted you must first sign a CLA as described at https://www.pfsense.org/about-pfsense/#cla. Please read for more details.

Broker Fix TLS operation with websockets listeners and libwebsockets 2.x. Closes #186. Don.t disconnect client on HUP before reading the pending data. Closes #7. Fix some $SYS messages being incorrectly persisted. Closes #191. Support OpenSSL 1.1.0. Call fsync after persisting data to ensure it is correctly written. Closes #189. Fix persistence saving of subscription QoS on big-endian machines. Fix will retained flag handling on Windows. Closes #222. Broker now displays an error if it is unable to open the log file. Closes #234. Client library Support OpenSSL 1.1.0. Fixed the C++ library not allowing SOCKS support to be used. Closes #198. Fix memory leak when verifying a server certificate with a subjectAltName section. Closes #237. Build Don.t attempt to install docs when WITH_DOCS=no. Closes #184. PR: 213532 Submitted by: ohauer Approved by: maintainer <joe@thrallingpenguin.com> MFH: 2016Q4

rbgarga · 2016-10-19T14:36:43Z

ops, accidentally closed due to upstream commit log

wrboyce · 2016-10-19T14:39:08Z

Is there anything specifically holding this back from being merged?

rbgarga · 2016-12-05T20:46:50Z

net-mgmt/pfSense-pkg-Telegraf/Makefile

@@ -0,0 +1,41 @@
+# $FreeBSD$
+
+PORTNAME=     pfSense-pkg-Telegraf


All variable assignments in this file should be followed by a TAB instead of spaces, otherwise portlint fails:

FATAL: Makefile: [3]: use a tab (not space) after a variable name FATAL: Makefile: [4]: use a tab (not space) after a variable name FATAL: Makefile: [5]: use a tab (not space) after a variable name FATAL: Makefile: [6]: use a tab (not space) after a variable name FATAL: Makefile: [7]: use a tab (not space) after a variable name FATAL: Makefile: [8]: use a tab (not space) after a variable name FATAL: Makefile: [10]: use a tab (not space) after a variable name FATAL: Makefile: [11]: use a tab (not space) after a variable name FATAL: Makefile: [13]: use a tab (not space) after a variable name FATAL: Makefile: [15]: use a tab (not space) after a variable name FATAL: Makefile: [17]: use a tab (not space) after a variable name FATAL: Makefile: [18]: use a tab (not space) after a variable name FATAL: Makefile: [20]: use a tab (not space) after a variable name FATAL: Makefile: [21]: use a tab (not space) after a variable name

rbgarga · 2016-12-05T20:47:12Z

net-mgmt/pfSense-pkg-Telegraf/Makefile

+# $FreeBSD$
+
+PORTNAME=     pfSense-pkg-Telegraf
+PORTVERSION=  0.0.13


Any special reason to start a new package with version 0.0.13? Why not simply 0.1?

rbgarga · 2016-12-05T20:48:30Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.inc

@@ -0,0 +1,78 @@
+<?php
+require_once("globals.inc");


It's missing license text and copyright message here

rbgarga · 2016-12-05T20:49:29Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.xml

+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
+<packagegui>
+    <copyright>...</copyright>


Missing license text and copyright notive

rbgarga · 2016-12-05T20:49:33Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.xml

+
+    <name>telegraf</name>
+    <title>Services: Telegraf</title>
+    <description>...</description>


Missing description

rbgarga · 2016-12-05T20:49:52Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.xml

+    <description>...</description>
+    <category>Network Management</category>
+    <include_file>/usr/local/pkg/telegraf.inc</include_file>
+


Please do not leave blank lines inside XML file

rbgarga · 2016-12-05T20:50:06Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.xml

+        <name>telegraf</name>
+        <rcfile>telegraf</rcfile>
+        <executable>telegraf</executable>
+        <description>...</description>


Missing description

rbgarga · 2016-12-05T20:50:35Z

net-mgmt/pfSense-pkg-Telegraf/pkg-plist

+pkg/telegraf.inc
+/etc/inc/priv/telegraf.priv.inc
+%%DATADIR%%/info.xml
+@dir /etc/inc/priv


Missing @dir /etc/inc

- Add missing include, sort includes - Honor $g['varrun_path'] and $g['varlog_path'] - Try to make the config creation code readable - Other cleanups

doktornotor · 2017-01-21T22:20:42Z

@wrboyce - Did a PR for the review comments here, kindly merge.

rbgarga · 2017-02-22T11:27:20Z

@wrboyce can you please merge @doktornotor Pull Request to your fork to bring in all fixes he did?

Add package for Telegraf (PR pfsense#189) - review fixes

wrboyce · 2017-03-15T14:44:26Z

@rbgarga merged, apologies for the delay!

@doktornotor thanks again.

doktornotor · 2017-03-15T19:57:34Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/share/pfSense-pkg-Telegraf/info.xml

+<pfsensepkgs>
+	<package>
+		<name>Telegraf</name>
+		<descr><![CDATA[...]]></descr>


Still missing description

doktornotor · 2017-03-15T19:57:44Z

net-mgmt/pfSense-pkg-Telegraf/pkg-descr

@@ -0,0 +1 @@
+...


Still missing description

wrboyce · 2017-04-02T18:25:42Z

@doktornotor @rbgarga I believe all review concerns are addressed now.

I'll review again

rbgarga · 2017-04-12T12:12:09Z

net-mgmt/pfSense-pkg-Telegraf/pkg-descr

@@ -0,0 +1 @@
+Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.


pkg-descr cannot contain lines > 80 columns

rbgarga · 2017-04-12T12:13:02Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.inc

+	write_rcfile(array(
+		"file" => "telegraf.sh",
+		"start" => "/usr/sbin/daemon -crP {$pidfile} /usr/local/bin/telegraf -config={$conffile} 2>> {$logfile}",
+		"stop" => "/bin/kill `/bin/cat {$pidfile}`"


What is going to happen if telegraf.log become a huge file? There are no processes taking care of it. Doesn't it support syslog?

Doesn't it support syslog?

It appears not. What is the preferred solution?

I've updated to use 2> for now, while perhaps not ideal it at least mitigates any possible disk-fill issues.

jim-p

Looks OK in general, but could benefit from input validation.

Also consider making the "interval" parameter a GUI field.

jim-p · 2017-04-12T13:35:00Z

net-mgmt/pfSense-pkg-Telegraf/files/usr/local/pkg/telegraf.inc

+		$cfg .= "\tusername = \"" . $telegraf_conf['influx_user'] . "\"\n";
+	}
+	if (!empty($telegraf_conf['influx_pass'])) {
+		$cfg .= "\tpassword = \"" . $telegraf_conf['influx_pass'] . "\"\n";


This looks like it would fail if the password contains a ". This should probably use addslashes() or similar to allow that to work.

This should be fixed now.

wrboyce · 2017-04-12T14:11:11Z

I've added some rudimentary escaping of input values, and added interval as a GUI exposed option as requested.

rbgarga · 2017-05-09T00:17:19Z

I'll merge it on 2.3.5-devel and 2.4.0-devel snapshots first, after it's well tested I'll cherry-pick it to 2.3.4-RELEASE

Feature request #86: Change meaning of "RequiredHeaders" such that header validity is always checked, but messages are only rejected on that basis when the flag is set. Based on a patch from Andreas Schulze. Feature request #127: Log SPF results when rejecting. Requested by Patrick Wagner; patch from Andreas Schulze, follow-up patch from Juri Haberland. Feature request #138: Inculde policy and disposition information in an Authentication-Results comment. Based on a patch from Juri Haberland. Feature request #139: Include the client host name if known in failure reports. Suggested by Roland Turner; patch by Andreas Schulze. Fix bug #95: Assume IPv6 for SPF operations. Patch from Juri Haberland. Fix bug #120: Fix control logic around the SPF result. Reported by Christophe Wolfhugel; patch from Andreas Schulze. Fix bug #122: Don't skip the HELO milter phase when SPF is enabled. Reported by Christophe Wolfhugel. Fix bug #157: Fix logging of implicit authserv-ids. Reported by Andreas Schulze; patch from Juri Haberland. Fix bug #158: Log ignored connections. Patch from Andreas Schulze. Fix bug #160: Fix "SyslogFacility" handling. Patch from Juri Haberland. Fix bug #163: Use a larger buffer for the raw MAIL FROM value. Based on a patch from Andreas Schulze. Fix bug #174: Trim "!" suffixes from reporting addresses. Problem noted by Juri Haberland. Fix bug #186: When reloading the configuration file, the public suffix list was read in with the wrong comment indicator. Patch from Federico Omoto. LIBOPENDMARC: Fix bug #115: Fix type mismatch. Patch from Sebastian A. Siewior via Scott Kitterman. LIBOPENDMARC: Fix bug #121: Fix IPv6 CIDR matching in SPF code. Patch from Christophe Wolfhugel. LIBOPENDMARC: Fix bug #125: Compile time IPv6 fix. Reported by Christophe Wolfhugel. LIBOPENDMARC: Fix bug #131: Fix alignment bug. Patch from Andreas Schulze. LIBOPENDMARC: Fix bug #147: Fix stripping of whitespace from DMARC DNS records. Based on a patch from Job Noorman. LIBOPENDMARC: Fix bug #149: Apply "sp" setting, if present and applicable. Patch from Petr Novak. LIBOPENDMARC: Fix bug #154: Fix "rf" and "fo" processing logic. LIBOPENDMARC: Fix bug #156: Fix variable name. Patch by Andreas Schulze. LIBOPENDMARC: Fix bug #165: Fix logic in checking which SPF identifier was used. Patches from Marco Favero and Juri Haberland. LIBOPENDMARC: Fix bug #167: Don't return "fail" when we should return "none". Patch from Marco Favero. REPORTS: Fix bug #134: Handle SMTP errors correctly. Patch from Andreas Schulze. REPORTS: Fix bug #141: Set the HELO parameter correctly. Reported by Alan Smith; patch from Andreas Schulze. REPORTS: Fix bug #143: Fix logic in table truncation. Reported by Wayne Andersen; patch from Juri Haberland. REPORTS: Fix bug #162: Always report "sp" in aggregate reports. Patch from Juri Haberland. REPORTS: Fix bug #166: Fix report start/end time logic. Patch from Juri Haberland. REPORTS: Fix bug #188: Don't delete inputs too early in opendmarc-reports. Patch from Juri Haberland. TOOLS: Fix bug #161: "Forensic" reports were renamed "Failure" reports. Patch from Andreas Schulze. TOOLS: Fix bug #164: Handle IPv6 test addresses. Reported by Andreas Schulze; patch from Juri Haberland. DOCS: Patch #189: Replace the DMARC RFC with an HTML page referencing the relevant specs, since Debian doesn't consider RFCs to be "free". Patch from Scott Kitterman via Juri Haberland. PR: 220902 Submitted by: Dan Mahoney <freebsd@gushi.org> (maintainer), Lukasz Wasikowski <lukasz@wasikowski.net>

add package for Telegraf

8f3a5b7

netgate-git-updates added missing CLA and removed missing CLA labels Sep 16, 2016

netgate-git-updates closed this in f1f719b Oct 19, 2016

rbgarga reopened this Oct 19, 2016

rbgarga previously requested changes Dec 5, 2016

View reviewed changes

rbgarga added the Changes requested label Dec 5, 2016

rbgarga self-assigned this Dec 5, 2016

netgate-git-updates closed this in 9131324 Dec 6, 2016

rbgarga reopened this Dec 6, 2016

doktornotor added 5 commits January 21, 2017 22:35

Fix tabs for portlint, sanitize initial version

5cb0810

Add missing copyright and license header

39cadb5

Add missing copyright and license header, nuke useless tags, fix service

78dc8a8

Add missing @dir

e1ba53c

Various improvement

d263b18

- Add missing include, sort includes - Honor $g['varrun_path'] and $g['varlog_path'] - Try to make the config creation code readable - Other cleanups

doktornotor added 2 commits January 21, 2017 23:23

Fix pidfile is stop command

09b5acb

Remove duplicate config options

e5bd5c2

doktornotor and others added 2 commits February 22, 2017 12:29

Fix filename in header

16b4062

Merge pull request #1 from doktornotor/patch-2

9a21ce1

Add package for Telegraf (PR pfsense#189) - review fixes

doktornotor reviewed Mar 15, 2017

View reviewed changes

net-mgmt/pfSense-pkg-Telegraf/pkg-descr Outdated

@@ -0,0 +1 @@

...

Copy link

Contributor

doktornotor Mar 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still missing description

add descriptions to Telegraf package and sort plist

62c2617

wrboyce force-pushed the pkg-telegraf branch from 74d880f to 62c2617 Compare April 2, 2017 18:24

rbgarga removed the Changes requested label Apr 12, 2017

rbgarga requested a review from jim-p April 12, 2017 11:59

rbgarga self-requested a review April 12, 2017 11:59

rbgarga requested changes Apr 12, 2017

View reviewed changes

fix Telegraf pkg-descr max line len

4ff1e8a

jim-p requested changes Apr 12, 2017

View reviewed changes

wrboyce added 2 commits April 12, 2017 15:04

escape input values before writing config

c38a41d

add interval configuration option

0010ff9

truncate error log every restart

6845460

rbgarga requested review from rbgarga and jim-p May 2, 2017 10:29

jim-p approved these changes May 2, 2017

View reviewed changes

rbgarga approved these changes May 9, 2017

View reviewed changes

netgate-git-updates merged commit 6845460 into pfsense:devel May 9, 2017

netgate-git-updates pushed a commit that referenced this pull request May 9, 2017

Merge pull request #189 from wrboyce/pkg-telegraf

270e09e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add package for Telegraf #189

add package for Telegraf #189

wrboyce commented Sep 16, 2016

netgate-git-updates commented Sep 16, 2016

rbgarga commented Oct 19, 2016

wrboyce commented Oct 19, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

rbgarga Dec 5, 2016

doktornotor commented Jan 21, 2017

rbgarga commented Feb 22, 2017

wrboyce commented Mar 15, 2017

doktornotor Mar 15, 2017

doktornotor Mar 15, 2017

wrboyce commented Apr 2, 2017

rbgarga Apr 12, 2017

wrboyce Apr 12, 2017

rbgarga Apr 12, 2017

wrboyce Apr 12, 2017

wrboyce Apr 12, 2017

jim-p left a comment

jim-p Apr 12, 2017

wrboyce Apr 12, 2017

wrboyce commented Apr 12, 2017

rbgarga commented May 9, 2017

		@@ -0,0 +1 @@
		Telegraf is an agent written in Go for collecting, processing, aggregating, and writing metrics.

		@@ -0,0 +1,78 @@
		<?php
		require_once("globals.inc");

add package for Telegraf #189

add package for Telegraf #189

Conversation

wrboyce commented Sep 16, 2016

netgate-git-updates commented Sep 16, 2016

rbgarga commented Oct 19, 2016

wrboyce commented Oct 19, 2016

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

doktornotor commented Jan 21, 2017

rbgarga commented Feb 22, 2017

wrboyce commented Mar 15, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wrboyce commented Apr 2, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jim-p left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wrboyce commented Apr 12, 2017

rbgarga commented May 9, 2017