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

Add prom command line args and validation #377

Merged
merged 1 commit into from
Oct 28, 2019

Conversation

hooten
Copy link

@hooten hooten commented Oct 15, 2019

Pull Request (PR) description

This pull request adds the remaining command-line arguments available to Prometheus v2 (and a few for v1). It also adds validation that will fail the puppet run if arguments are used incorrectly. It continues to expose the extra_options parameter for custom command-line logic. It also adds a number of tests for using command line arguments.

Although it was possible to specify arbitrary command-line arguments previously using extra_options, this PR makes CLI args more discoverable and manages better.

This Pull Request (PR) fixes the following issues

Fixes #52

@bastelfreak
Copy link
Member

Hi @hooten, thanks for the PR. Can you take a look at the failing travis tests?

manifests/init.pp Outdated Show resolved Hide resolved
manifests/init.pp Outdated Show resolved Hide resolved
@bastelfreak bastelfreak added enhancement New feature or request needs-work not ready to merge just yet tests-fail labels Oct 19, 2019
@hooten
Copy link
Author

hooten commented Oct 21, 2019

Thanks for the commends @bastelfreak. This PR is still a WIP. I'm having trouble reproducing the failing tests locally. I will work on it more this week

@hooten hooten changed the title Add prom command line args and validation WIP: Add prom command line args and validation Oct 21, 2019
@hooten hooten changed the title WIP: Add prom command line args and validation Add prom command line args and validation Oct 23, 2019
@hooten hooten requested a review from bastelfreak October 23, 2019 14:56
@hooten
Copy link
Author

hooten commented Oct 23, 2019

Hey @bastelfreak, I made the changes you suggested and fixed the tests. When you get a chance, I'd really appreciate another review. Thanks!

@bastelfreak bastelfreak removed needs-work not ready to merge just yet tests-fail labels Oct 28, 2019
@bastelfreak
Copy link
Member

Thanks for the work!

@bastelfreak bastelfreak merged commit dad3dbb into voxpupuli:master Oct 28, 2019
@hooten
Copy link
Author

hooten commented Oct 28, 2019

Thanks! I'm happy to contribute!

@hooten hooten deleted the prom-cli-args branch October 28, 2019 18:48
cegeka-jenkins pushed a commit to cegeka/puppet-prometheus that referenced this pull request Jan 21, 2021
Add prom command line args and validation
Rovanion pushed a commit to Rovanion/puppet-prometheus that referenced this pull request May 5, 2021
Add prom command line args and validation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change Prometheus port
2 participants