Code

backport changes to upstream#39

Code

Merged

roidelapluie merged 43 commits intovoxpupuli:mastervoxpupuli/puppet-prometheus:masterfrom bastelfreak:masterCopy head branch name to clipboardJun 21, 2017

+2,250-410

Commits

Commits on Dec 27, 2016

• Updating README.md

  

  brutus333

  authored
  8f9f9bd

Commits on Jan 4, 2017

• modulesync 0.16.7

  bastelfreak

  committed
  aa48f54

Commits on Jan 5, 2017

• Merge pull request #1 from voxpupuli/modulesync

  Show description for f22f9c5
  

  brutus333

  authored
  f22f9c5

• Add Travis CI credentials

  dhoppe

  committed
  62f9329

Commits on Jan 7, 2017

• Merge pull request #4 from dhoppe/modulesync

  Show description for 4b8120b
  dhoppe

  authored
  4b8120b

Commits on Jan 10, 2017

• Build fixes (#3)

  Show description for a1a6481
  

  brutus333

  authored
  a1a6481

Commits on Jan 11, 2017

• Change 'staging' dependency to 'puppet/staging'

  alexjfisher

  committed
  6824b3b

• Merge pull request #6 from alexjfisher/use_puppet_staging

  Show description for 17e2651
  dhoppe

  authored
  17e2651

Commits on Jan 23, 2017

• Fixing forge badges to voxpupuli namespace

  

  james.powis

  committed
  43b7251

• Merge pull request #11 from james-powis/fix_readme_badges

  Show description for dde401f
  juniorsysadmin

  authored
  dde401f

Commits on Jan 31, 2017

• Add a class for the HAProxy exporter (#10)

  

  jghward

  authored and

  brutus333

  committed
  1c39be9

Commits on Feb 4, 2017

• Update based on voxpupuli/modulesync_config 0.19.3 (#15)

  

  dhoppe

  authored and

  brutus333

  committed
  98ee6c3

Commits on Feb 12, 2017

• modulesync 0.20.0

  bastelfreak

  committed
  ffa8a74

• delete unneeded spec.opts file

  bastelfreak

  committed
  8c5cc83

• Merge pull request #18 from voxpupuli/modulesync

  Show description for f3c31e9
  sacres

  authored
  f3c31e9

Commits on Mar 5, 2017

• Add missing license

  dhoppe

  committed
  9560876

• Add missing values

  dhoppe

  committed
  0ac6b92

• Merge pull request #16 from dhoppe/license

  Show description for 1d369a8
  alexjfisher

  authored
  1d369a8

Commits on Mar 11, 2017

• modulesync 0.20.1

  bastelfreak

  committed
  1949521

• Merge pull request #19 from voxpupuli/modulesync

  Show description for 13e94b7
  vinzent

  authored
  13e94b7

Commits on Mar 12, 2017

• Merge pull request #17 from dhoppe/metadata

  Show description for bce4528
  bastelfreak

  authored
  bce4528

• Add sane default values for prometheus::daemon

  Show description for db976b2
  

  Joshua Spence

  authored and

  dhoppe

  committed
  db976b2

Commits on Mar 13, 2017

• process-exporter (#14)

  

  NairolfL

  authored and

  brutus333

  committed
  f996627

• Update metadata.json (#20)

  Show description for f969e4e
  

  brutus333

  authored
  f969e4e

Commits on Mar 26, 2017

• Update to latest available versions

  dhoppe

  committed
  d671842

• Merge pull request #22 from dhoppe/releases

  Show description for f31a445
  bastelfreak

  authored
  f31a445

• Migrate to archive module

  dhoppe

  committed
  f59f529

• Merge pull request #23 from dhoppe/archive

  Show description for 0508940
  bastelfreak

  authored
  0508940

• Bump version

  dhoppe

  committed
  2d07395

• Merge pull request #25 from dhoppe/release

  Show description for 81acb4b
  bastelfreak

  authored
  81acb4b

• Use same namespace for Prometheus and its components

  dhoppe

  committed
  50f8dc4

• Merge pull request #24 from dhoppe/daemon

  Show description for 86ceaa3
  bastelfreak

  authored
  86ceaa3

Commits on Mar 31, 2017

• puppet-lint: fix arrow_on_right_operand_line

  bastelfreak

  committed
  de074ec

• Merge pull request #27 from bastelfreak/puppet_lint

  Show description for 0148d7d
  bastelfreak

  authored
  0148d7d

Commits on Apr 18, 2017

• Reload alertmanager when config file changes

  

  Niko Smeds

  committed
  20e66d9

Commits on May 10, 2017

• Support alerting configuration for prometheus

  steven-aerts

  committed
  3ae81b3

Commits on May 25, 2017

• Reload Prometheus service instead of restarting

  Show description for fef3203
  nikosmeds

  authored
  fef3203

Commits on May 30, 2017

• Add service_name parameter for alertmanager

  martin-koerner

  authored
  566bed3

• Merge pull request #1 from martin-koerner/alertmanager_service_name

  Show description for 076d8ac
  martin-koerner

  authored
  076d8ac

Commits on Jun 21, 2017

• Merge pull request #33 from martin-koerner/master

  Show description for 00328b9
  bastelfreak

  authored
  00328b9

• Merge pull request #31 from byblakout/patch-1

  Show description for cf518a3
  bastelfreak

  authored
  cf518a3

• Merge pull request #30 from steven-aerts/alerting_config

  Show description for b4cbb16
  bastelfreak

  authored
  b4cbb16

• Merge pull request #29 from byblakout/alertmanager-configfile-reload

  Show description for 388cb26
  bastelfreak

  authored
  388cb26