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

telegraf.conf: add SSL support and short hostname #506

Merged
merged 4 commits into from
Apr 26, 2019

Conversation

skdst
Copy link
Contributor

@skdst skdst commented Mar 21, 2018

added checkboxes in web gui for telegraf.conf options
hostname (Use short hostname instead of FQDN)
insecure_skip_verify (Use SSL but skip chain and host verification)
added support for setting CA certificate in telegraf.conf

…kip_verify, hostname

add certificate path in telegraf.conf, certificate export from config
@rbgarga rbgarga requested a review from jim-p March 26, 2018 16:27
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


$ca_pem_file = "/usr/local/etc/telegraf.ca";
$a_ca=$config['ca'];
if (!is_array($a_ca)) $a_ca=array();
Copy link
Contributor

Choose a reason for hiding this comment

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

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.

foreach ($a_ca as $ca) {
$ca_pem .= base64_decode($ca['crt']);
}
file_put_contents($ca_pem_file, $ca_pem);
Copy link
Contributor

Choose a reason for hiding this comment

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

Remove the extra space here before file_put_contents.

@skdst
Copy link
Contributor Author

skdst commented Mar 29, 2018

@rbgarga @jim-p thanks for your reviews, please verify again.

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

Please resolve the conflicts noted above

@skdst
Copy link
Contributor Author

skdst commented May 22, 2018

Please review again

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.

Also please bump PORTVERSION or PORTREVISION on Makefile to make builders to produce a new binary package

}

$ca_pem_file = "/usr/local/etc/telegraf.ca";
$a_ca = $config['ca'];
Copy link
Member

Choose a reason for hiding this comment

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

There is no need to make a copy of $config['ca'] just to use it on below foreach(). It's better to just use it instead

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rbgarga rbgarga removed the Conflicts label May 23, 2018
@skdst
Copy link
Contributor Author

skdst commented May 25, 2018

Please review again

@rbgarga
Copy link
Member

rbgarga commented Jul 17, 2018

@skdst changes are now approved. Please rebase your fork to resolve conflicts and we will get it merged

@netgate-git-updates netgate-git-updates merged commit cef7cad into pfsense:devel Apr 26, 2019
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants