Skip to content

Commit

Permalink
Merge pull request voxpupuli#276 from bastelfreak/prometheus_version
Browse files Browse the repository at this point in the history
bump prometheus version: 1.5.2->2.4.3
  • Loading branch information
bastelfreak authored Oct 21, 2018
2 parents e606505 + 2432a34 commit 005de86
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ On the server (for prometheus version >= 2.0.0):

```puppet
class { 'prometheus::server':
version => '2.0.0',
version => '2.4.3',
alerts => { 'groups' => [{ 'name' => 'alert.rules', 'rules' => [{ 'alert' => 'InstanceDown', 'expr' => 'up == 0', 'for' => '5m', 'labels' => { 'severity' => 'page', }, 'annotations' => { 'summary' => 'Instance {{ $labels.instance }} down', 'description' => '{{ $labels.instance }} of job {{ $labels.job }} has been down for more than 5 minutes.' }}]}]},
scrape_configs => [
{ 'job_name' => 'prometheus',
Expand Down
2 changes: 1 addition & 1 deletion data/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ prometheus::manage_group: true
prometheus::purge_config_dir: true
prometheus::manage_user: true
prometheus::bin_dir: '/usr/local/bin'
prometheus::version: '1.5.2'
prometheus::version: '2.4.3'
prometheus::install_method: 'url'
prometheus::manage_prometheus_server: false
prometheus::alert_relabel_config: []
Expand Down
6 changes: 3 additions & 3 deletions spec/acceptance/prometheus_server_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
pp = "package{'iproute2': ensure => present}"
apply_manifest(pp, catch_failures: true)
end
pp = "class{'prometheus': manage_prometheus_server => true }"
pp = "class{'prometheus': manage_prometheus_server => true, version => '1.5.2' }"

# Run it twice and test for idempotency
apply_manifest(pp, catch_failures: true)
Expand Down Expand Up @@ -38,7 +38,7 @@

describe 'prometheus server with options' do
it 'is idempotent' do
pp = "class{'prometheus::server': version => '2.3.2', external_url => '/test'}"
pp = "class{'prometheus::server': version => '2.4.3', external_url => '/test'}"
# Run it twice and test for idempotency
apply_manifest(pp, catch_failures: true)
apply_manifest(pp, catch_changes: true)
Expand All @@ -58,7 +58,7 @@
it 'is idempotent' do
pp = <<-EOS
class { 'prometheus::server':
version => '2.3.2',
version => '2.4.3',
alerts => {
'groups' => [
{
Expand Down

0 comments on commit 005de86

Please sign in to comment.