Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support graphite backend for telegraf in config-gui #507

Merged
merged 5 commits into from
Jul 5, 2018

Conversation

thomasDOTwtf
Copy link
Contributor

As telegraf supports graphite as backend pfsense should support configuration too.

Copy link
Member

@rbgarga rbgarga left a comment

Choose a reason for hiding this comment

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

Please bump PORTVERSION or PORTREVISION on Makefile to make sure a new package version will be built

@rbgarga rbgarga requested a review from jim-p March 26, 2018 16:26
Copy link
Contributor

@jim-p jim-p left a comment

Choose a reason for hiding this comment

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

Looks like it needs some more validation. If the user selects graphite but leaves other options blank, it may result in an invalid configuration.

@thomasDOTwtf
Copy link
Contributor Author

added the requested validation and raised PORTVERSION
didn't found PORTREVISION in Makefile

} else
{
$cfg .= "\ttimeout = 2\n";
}
Copy link
Member

Choose a reason for hiding this comment

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

Please adjust style moving { to the same line of if or else statements

@rbgarga rbgarga requested a review from jim-p March 30, 2018 13:47
Copy link
Contributor

@jim-p jim-p left a comment

Choose a reason for hiding this comment

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

I have the same comment that @rbgarga had about the braces. Please use K&R, BSD KNF variant style, even for simple statements, to keep them consistent and easy to read, and be careful to use matching and proper indentation.

@thomasDOTwtf
Copy link
Contributor Author

adjusted braces as requested. please merge.

@thomasDOTwtf
Copy link
Contributor Author

any update?

@@ -103,6 +103,20 @@ EOD;
$cfg .= "\toverwrite_template = false\n";
$cfg .= "\ttemplate_name = \"telegraf\"\n";
$cfg .= "\turls = [\"" . $telegraf_conf['elasticsearch_server'] . "\"]\n";
} else if ((is_array($telegraf_conf['telegraf_output']) && in_array("graphite", $telegraf_conf['telegraf_output'])) || $telegraf_conf['telegraf_output'] == "graphite") {
$cfg .= "[[outputs.graphite]]\n";
$cfg .= "\tservers = [\"" . $telegraf_conf['graphite_server'] . "\"]\n";
Copy link
Contributor

Choose a reason for hiding this comment

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

Would this not still be a problem if they failed to enter a server name? Or would graphite ignore that since it would be empty ([""])? If graphite will ignore the empty server rather than fail, it may be OK as-is.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not deep into php development. I've aligned my proposal to the existing options.
It will behave the same as an empty inluxdb- server or an empty elastic-server server.

Copy link
Contributor

@W0CHP W0CHP May 2, 2018

Choose a reason for hiding this comment

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

@jim-p Hi Jim,

I helped out with the v1.6.1 Telegraf release recently: #517.
Telegraf will ignore [[outputs]] stanza configuration keys with no value (no errors/no bailing).

@thomasDOTde's changes work fine on my dev. instance, both with a Graphite host defined and not undefined.

Copy link

@PhilippWendler PhilippWendler Jun 29, 2018

Choose a reason for hiding this comment

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

So I think this can be considered resolved? Is there anything else left to do?

@PhilippWendler
Copy link

Is there any progress on this? I would really like to use this, too.

@thomasDOTwtf
Copy link
Contributor Author

What's the problem here?
Merge please.

@thomasDOTwtf
Copy link
Contributor Author

Hey @jim-p
Hey @rbgarga

This PR is now hanging for 3 months.
How is this going to be handled?
@W0CHP confirmed the solution.
@PhilippWendler requested merge as well

If possible I'd like to get a response.

@jim-p jim-p requested a review from rbgarga July 5, 2018 19:11
@sbeaver-netgate sbeaver-netgate removed the request for review from rbgarga July 5, 2018 19:30
@netgate-git-updates netgate-git-updates merged commit d79def4 into pfsense:devel Jul 5, 2018
@PhilippWendler
Copy link

Is it possible to make this available in the package repository for 2.4.3-RELEASE-p1?

netgate-git-updates pushed a commit that referenced this pull request Feb 4, 2023
Changes since 1.1.0:

v1.3.0

This release contains some features and enhancements + upgrades all
dependencies.

- feat: Allow to set reporter on issue create by @ankitpokhrel in #539
- feat: Use single char ellipsis instead of triple dot by @ankitpokhrel in #540
- ehc: Make assignee operation atomic on create by @ankitpokhrel in #531
- ehc: Auto fallback to plain output on notty by @ankitpokhrel in #538
- ehc: Add warning for invalid custom field by @ankitpokhrel in #528 (Original work by @martinpovolny on #525)
- fix(build): Invalid commit hash in docker image by @ankitpokhrel in #535

- dep: Upgrade all packages by @ankitpokhrel in #532
- dep: Upgrade golang to v1.19 by @ankitpokhrel in #534
- ci: Upgrade golangci-lint to v1.50.1 by @ankitpokhrel in #536

Full Changelog: ankitpokhrel/jira-cli@v1.2.0...v1.3.0

v1.2.0

This release adds support for Jira v9, a serverinfo command to quickly check
your Jira server build info, lets you set resolution, assignee and comment on
issue move, and many more.

- feat: Add serverinfo command by @ankitpokhrel in #440
- feat: Support for Jira v9 by @ankitpokhrel in #447
- feat: Allow to set start datetime on worklog add by @ankitpokhrel in #453
- feat: Make date time input in worklog flexible by @ankitpokhrel in #465
- feat: Add support for project datatype in custom fields by @oveaurs in #482
- feat: Add weblink to issue (#446) by @Syd7 in #483
- feat: Resolution, assignee & comment on issue move by @ankitpokhrel in #492
- feat: Filter issues by the absence of label(s) by @martinpovolny in #505
- feat: Add labels to the issue listing by @martinpovolny in #506
- feat: Allow setting of fixed columns in the list of issues, epics and sprints
  by @martinpovolny in #509

- fix: Option to show issues from all projects in sprint list by @ankitpokhrel
  in #475
- fix: Discrepancy in --insecure flag by @ankitpokhrel in #507
- fix: Make board selection optional by @ankitpokhrel in #502
- fix: Improve support for pager by @ankitpokhrel in #503
- fix: Respect editor env vars in Windows by @ankitpokhrel in #524

- ci: Multi-arch docker image by @ankitpokhrel in #508
- doc: Add link to project in help by @ankitpokhrel in #456
- doc: Add Nix package by @bryanasdev000 in #458
- doc: Update help for completion cmd by @ankitpokhrel in #491
- doc: Add scoop installation process by @alkuzad in #497

- @bryanasdev000 made their first contribution in #458
- @oveaurs made their first contribution in #482
- @Syd7 made their first contribution in #483
- @alkuzad made their first contribution in #497
- @martinpovolny made their first contribution in #505

Full Changelog: ankitpokhrel/jira-cli@v1.1.0...v1.2.0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants