Showing with 1,360 additions and 225 deletions.
  1. +92 −0 .github/workflows/cron.yml
  2. +1 −1 .msync.yml
  3. +24 −0 CHANGELOG.md
  4. +2 −2 Gemfile
  5. +335 −9 REFERENCE.md
  6. +2 −2 data/defaults.yaml
  7. +6 −6 lib/facter/alert_manager_running.rb
  8. +19 −7 manifests/alertmanager.pp
  9. +5 −1 manifests/postgres_exporter.pp
  10. +191 −0 manifests/sachet.pp
  11. +1 −1 metadata.json
  12. +3 −0 spec/acceptance/alertmanager_spec.rb
  13. +7 −0 spec/acceptance/apache_exporter_spec.rb
  14. +3 −0 spec/acceptance/bind_exporter_spec.rb
  15. +6 −0 spec/acceptance/blackbox_exporter_spec.rb
  16. +3 −0 spec/acceptance/collectd_exporter_spec.rb
  17. +8 −2 spec/acceptance/consul_exporter_spec.rb
  18. +2 −0 spec/acceptance/dellhw_exporter_spec.rb
  19. +6 −0 spec/acceptance/graphite_exporter_spec.rb
  20. +6 −0 spec/acceptance/haproxy_exporter_spec.rb
  21. +3 −0 spec/acceptance/ipmi_exporter_spec.rb
  22. +5 −0 spec/acceptance/ipsec_exporter_spec.rb
  23. +4 −0 spec/acceptance/mesos_exporter_spec.rb
  24. +7 −0 spec/acceptance/mysqld_exporter_spec.rb
  25. +5 −1 spec/acceptance/nginx_prometheus_exporter_spec.rb
  26. +5 −0 spec/acceptance/nginx_vts_exporter_spec.rb
  27. +5 −0 spec/acceptance/node_exporter_spec.rb
  28. +6 −0 spec/acceptance/openldap_exporter_spec.rb
  29. +2 −0 spec/acceptance/openvpn_exporter_spec.rb
  30. +4 −0 spec/acceptance/postfix_exporter_spec.rb
  31. +7 −0 spec/acceptance/postgres_exporter_spec.rb
  32. +5 −0 spec/acceptance/process_exporter_spec.rb
  33. +5 −2 spec/acceptance/prometheus_exporter_spec.rb
  34. +10 −2 spec/acceptance/prometheus_server_spec.rb
  35. +5 −0 spec/acceptance/pushgateway_spec.rb
  36. +8 −0 spec/acceptance/pushprox_client_spec.rb
  37. +2 −0 spec/acceptance/rabbitmq_exporter_spec.rb
  38. +6 −0 spec/acceptance/redis_exporter_spec.rb
  39. +35 −0 spec/acceptance/sachet_spec.rb
  40. +6 −0 spec/acceptance/snmp_exporter_spec.rb
  41. +3 −0 spec/acceptance/ssh_exporter_spec.rb
  42. +3 −0 spec/acceptance/ssl_exporter_spec.rb
  43. +16 −2 spec/acceptance/statsd_exporter_spec.rb
  44. +6 −0 spec/acceptance/varnish_exporter_spec.rb
  45. +41 −6 spec/classes/alertmanager_spec.rb
  46. +6 −0 spec/classes/apache_exporter_spec.rb
  47. +3 −0 spec/classes/beanstalkd_exporter_spec.rb
  48. +3 −0 spec/classes/bind_exporter_spec.rb
  49. +7 −2 spec/classes/bird_exporter_spec.rb
  50. +4 −1 spec/classes/blackbox_exporter_spec.rb
  51. +2 −0 spec/classes/collectd_exporter_spec.rb
  52. +2 −0 spec/classes/consul_exporter_spec.rb
  53. +3 −0 spec/classes/dellhw_exporter_spec.rb
  54. +2 −0 spec/classes/elasticsearch_exporter_spec.rb
  55. +2 −0 spec/classes/graphite_exporter_spec.rb
  56. +5 −3 spec/classes/grok_exporter_spec.rb
  57. +2 −0 spec/classes/haproxy_exporter_spec.rb
  58. +4 −0 spec/classes/ipmi_exporter_spec.rb
  59. +2 −0 spec/classes/ipsec_exporter_spec.rb
  60. +3 −0 spec/classes/memcached_exporter_spec.rb
  61. +2 −0 spec/classes/mesos_exporter_spec.rb
  62. +2 −0 spec/classes/mongodb_exporter_spec.rb
  63. +2 −0 spec/classes/mysqld_exporter_spec.rb
  64. +6 −0 spec/classes/nginx_prometheus_exporter_spec.rb
  65. +3 −0 spec/classes/nginx_vts_exporter_spec.rb
  66. +4 −1 spec/classes/node_exporter_spec.rb
  67. +2 −0 spec/classes/openldap_exporter_spec.rb
  68. +2 −0 spec/classes/openvpn_exporter_spec.rb
  69. +2 −0 spec/classes/postgres_exporter_spec.rb
  70. +5 −2 spec/classes/process_exporter_spec.rb
  71. +103 −91 spec/classes/prometheus_spec.rb
  72. +3 −0 spec/classes/puppetdb_exporter_spec.rb
  73. +2 −0 spec/classes/pushgateway_spec.rb
  74. +2 −0 spec/classes/rabbitmq_exporter_spec.rb
  75. +4 −0 spec/classes/redis_exporter_spec.rb
  76. +123 −0 spec/classes/sachet_spec.rb
  77. +3 −1 spec/classes/server_spec.rb
  78. +11 −7 spec/classes/snmp_exporter_spec.rb
  79. +4 −1 spec/classes/ssh_exporter_spec.rb
  80. +5 −2 spec/classes/ssl_exporter_spec.rb
  81. +8 −6 spec/classes/statsd_exporter_spec.rb
  82. +2 −0 spec/classes/unbound_exporter_spec.rb
  83. +4 −0 spec/classes/varnish_exporter_spec.rb
  84. +14 −12 spec/defines/alerts_spec.rb
  85. +48 −47 spec/defines/daemon_spec.rb
  86. +5 −5 spec/spec_helper.rb
  87. +2 −0 spec/spec_helper_acceptance.rb
  88. +2 −0 spec/spec_helper_methods.rb
  89. +2 −0 spec/type_aliases/gsuri_spec.rb
  90. +2 −0 spec/type_aliases/s3uri_spec.rb
  91. +2 −0 spec/type_aliases/uri_spec.rb
  92. +3 −0 templates/sachet.yaml.epp
92 changes: 92 additions & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: CI

on:
schedule:
- cron: '4 4 * * *'

concurrency:
group: ${{ github.ref_name }}
cancel-in-progress: true

jobs:
setup_matrix:
name: 'Setup Test Matrix'
runs-on: ubuntu-latest
timeout-minutes: 40
outputs:
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
env:
BUNDLE_WITHOUT: development:system_tests:release
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
bundler-cache: true
- name: Run static validations
run: bundle exec rake validate lint check
- name: Run rake rubocop
run: bundle exec rake rubocop
- name: Setup Test Matrix
id: get-outputs
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false

unit:
needs: setup_matrix
runs-on: ubuntu-latest
timeout-minutes: 40
strategy:
fail-fast: false
matrix:
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
env:
BUNDLE_WITHOUT: development:system_tests:release
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- name: Run tests
run: bundle exec rake parallel_spec

acceptance:
needs: setup_matrix
runs-on: ubuntu-latest
env:
BUNDLE_WITHOUT: development:test:release
strategy:
fail-fast: false
matrix:
include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
steps:
- uses: actions/checkout@v2
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
bundler-cache: true
- name: Run tests
run: bundle exec rake beaker
env:
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
BEAKER_setfile: ${{ matrix.setfile.value }}

tests:
needs:
- unit
- acceptance
runs-on: ubuntu-latest
name: Test suite
steps:
- run: echo Test suite completed
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '4.2.0'
modulesync_config_version: '5.0.1'
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,30 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v12.3.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.3.0) (2021-11-17)

[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.2.0...v12.3.0)

**Implemented enhancements:**

- Add a parameter to validate alertmanager config [\#593](https://github.com/voxpupuli/puppet-prometheus/pull/593) ([roidelapluie](https://github.com/roidelapluie))
- Add sachet webhook receiver [\#590](https://github.com/voxpupuli/puppet-prometheus/pull/590) ([BDelacour](https://github.com/BDelacour))

**Fixed bugs:**

- fix download url for new asset url schema [\#591](https://github.com/voxpupuli/puppet-prometheus/pull/591) ([reini-1](https://github.com/reini-1))

**Closed issues:**

- Alertmanager configuration is not checked when installed from RPM [\#592](https://github.com/voxpupuli/puppet-prometheus/issues/592)
- postgres\_exporter 0.10.0 cannot be downloaded [\#584](https://github.com/voxpupuli/puppet-prometheus/issues/584)
- found multiple scrape configs with job name `x` [\#573](https://github.com/voxpupuli/puppet-prometheus/issues/573)

**Merged pull requests:**

- Update prometheus version from 2.20.1 to 2.30.3 [\#587](https://github.com/voxpupuli/puppet-prometheus/pull/587) ([saz](https://github.com/saz))
- Run CI nightly [\#586](https://github.com/voxpupuli/puppet-prometheus/pull/586) ([bastelfreak](https://github.com/bastelfreak))

## [v12.2.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.2.0) (2021-10-04)

[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.1.1...v12.2.0)
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :test do
gem 'voxpupuli-test', '~> 2.5', :require => false
gem 'voxpupuli-test', '~> 4.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 1.0', :require => false
Expand All @@ -21,7 +21,7 @@ end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false if RUBY_VERSION >= '2.5'
gem 'voxpupuli-release', '>= 1.0.2', :require => false
gem 'voxpupuli-release', '>= 1.2.0', :require => false
gem 'puppet-strings', '>= 2.2', :require => false
end

Expand Down
Loading