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

Feature/alerts prometheus2 #127

Merged
merged 6 commits into from
Jan 4, 2018

Conversation

jhooyberghs
Copy link

This PR adds alerts to prometheus 2.0 . I wrote this code because I ran into the same problem as issue #120

This code should be backwards compatible, leaving all < 2.0 installations with the old epp template, and all newer prometheus installations can now use a yaml configuration hash, which gets converted to a YAML configuration file as needed according to the documentation (https://prometheus.io/docs/prometheus/2.0/migration/#recording-rules-and-alerts)

@jhooyberghs jhooyberghs force-pushed the feature/alerts_prometheus2 branch from bbf2792 to deb8216 Compare December 5, 2017 13:36
@bastelfreak
Copy link
Member

Hi @jhooyberghs, thanks for the PR. Are you able to add an acceptance test that installs prometheus 2 with the new hash?

@bastelfreak bastelfreak added enhancement New feature or request needs-tests labels Dec 5, 2017
@vStone vStone force-pushed the feature/alerts_prometheus2 branch from 695cc33 to 5206ab7 Compare December 15, 2017 17:26
@vStone vStone force-pushed the feature/alerts_prometheus2 branch from 5206ab7 to e9fddd1 Compare December 18, 2017 07:27
@vStone
Copy link
Contributor

vStone commented Dec 18, 2017

@bastelfreak: Since the acceptance tests are minimal in general, I've just added spec tests.

@jhooyberghs
Copy link
Author

@bastelfreak are these spec tests sufficient?

@bastelfreak
Copy link
Member

Thanks for the PR @jhooyberghs !

@bastelfreak bastelfreak merged commit f5ef4b1 into voxpupuli:master Jan 4, 2018
cegeka-jenkins pushed a commit to cegeka/puppet-prometheus that referenced this pull request Aug 28, 2019
Rovanion pushed a commit to Rovanion/puppet-prometheus that referenced this pull request May 5, 2021
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.

3 participants