Feature/multiple rules files #166
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bastelfreak
reviewed
Feb 23, 2018
manifests/init.pp
Outdated
| @@ -158,6 +158,7 @@ | |||
| Array $remote_read_configs = $::prometheus::params::remote_read_configs, | |||
| Array $remote_write_configs = $::prometheus::params::remote_write_configs, | |||
| $alerts = $::prometheus::params::alerts, | |||
| $extra_alerts = {}, | |||
There was a problem hiding this comment.
Please add a datatype for this new parmeter and documentation in the header.
bastelfreak
reviewed
Feb 23, 2018
manifests/alerts.pp
Outdated
| @@ -11,29 +11,32 @@ | |||
| # [*alertfile_name*] | |||
| # Filename to use when storing the alerts file | |||
| # | |||
| class prometheus::alerts ( | |||
| String $location, | |||
| define prometheus::alerts ( | |||
There was a problem hiding this comment.
can you please write a spec file with unit tests for this new defined resource?
bastelfreak
reviewed
Feb 23, 2018
manifests/alerts.pp
Outdated
| Variant[Array,Hash] $alerts, | ||
| String $alertfile_name = $prometheus::params::alertfile_name, | ||
| ) inherits prometheus::params { | ||
| String $location = "$::prometheus::config_dir/rules", |
There was a problem hiding this comment.
please adjust the documenation in the header
|
Hi @zipkid , thanks for the PR. I added some inline comments. |
zipkid
force-pushed
the
feature/multiple_rules_files
branch
from
e241bb1
to
0446853
Compare
|
@bastelfreak Comments handled and spec test added. |
bastelfreak
reviewed
Feb 26, 2018
| ) inherits prometheus::params { | ||
| if ( versioncmp($::prometheus::version, '2.0.0') < 0 ){ | ||
| file { "${location}/${alertfile_name}": | ||
| String $location = "${::prometheus::config_dir}/rules", |
|
This looks good to me. @tuxmea can you review this as well? |
bastelfreak
approved these changes
Feb 26, 2018
|
Needs a major version bump as interface changes from class to define. |
tuxmea
approved these changes
Feb 26, 2018
|
I am willing to bump the version but unsure about the actions / steps to do it.... |
|
@zipkid, don't worry. We will deal with this in our release workflow. |
Rovanion
pushed a commit
to Rovanion/puppet-prometheus
that referenced
this pull request
May 5, 2021
…iles Feature/multiple rules files
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Allow the use of multiple alert rules files.