Showing with 4,677 additions and 4,032 deletions.
  1. +0 −3 .github/SECURITY.md
  2. +4 −4 .github/workflows/ci.yml
  3. +1 −1 .msync.yml
  4. +25 −0 CHANGELOG.md
  5. +1 −1 Gemfile
  6. +4,168 −3,848 REFERENCE.md
  7. +1 −1 Rakefile
  8. +1 −61 data/defaults.yaml
  9. +12 −2 manifests/alertmanager.pp
  10. +10 −10 manifests/apache_exporter.pp
  11. +1 −1 manifests/beanstalkd_exporter.pp
  12. +1 −1 manifests/bird_exporter.pp
  13. +2 −2 manifests/blackbox_exporter.pp
  14. +10 −10 manifests/collectd_exporter.pp
  15. +1 −1 manifests/consul_exporter.pp
  16. +12 −8 manifests/daemon.pp
  17. +1 −1 manifests/dellhw_exporter.pp
  18. +1 −1 manifests/elasticsearch_exporter.pp
  19. +10 −10 manifests/graphite_exporter.pp
  20. +10 −10 manifests/grok_exporter.pp
  21. +1 −1 manifests/haproxy_exporter.pp
  22. +9 −9 manifests/init.pp
  23. +1 −1 manifests/install.pp
  24. +1 −1 manifests/ipmi_exporter.pp
  25. +1 −1 manifests/ipsec_exporter.pp
  26. +139 −0 manifests/jmx_exporter.pp
  27. +1 −1 manifests/memcached_exporter.pp
  28. +1 −1 manifests/mesos_exporter.pp
  29. +1 −1 manifests/mongodb_exporter.pp
  30. +1 −1 manifests/mysqld_exporter.pp
  31. +1 −1 manifests/nginx_prometheus_exporter.pp
  32. +1 −1 manifests/nginx_vts_exporter.pp
  33. +5 −1 manifests/node_exporter.pp
  34. +1 −1 manifests/openldap_exporter.pp
  35. +1 −1 manifests/openvpn_exporter.pp
  36. +1 −1 manifests/php_fpm_exporter.pp
  37. +1 −1 manifests/postgres_exporter.pp
  38. +1 −1 manifests/process_exporter.pp
  39. +1 −1 manifests/puppetdb_exporter.pp
  40. +1 −1 manifests/pushgateway.pp
  41. +1 −1 manifests/pushprox_client.pp
  42. +1 −1 manifests/rabbitmq_exporter.pp
  43. +1 −1 manifests/redis_exporter.pp
  44. +1 −1 manifests/server.pp
  45. +2 −2 manifests/snmp_exporter.pp
  46. +1 −1 manifests/ssh_exporter.pp
  47. +1 −1 manifests/ssl_exporter.pp
  48. +2 −2 manifests/statsd_exporter.pp
  49. +1 −1 manifests/unbound_exporter.pp
  50. +10 −10 manifests/varnish_exporter.pp
  51. +14 −2 metadata.json
  52. +38 −4 spec/classes/alertmanager_spec.rb
  53. +104 −0 spec/classes/jmx_exporter_spec.rb
  54. +42 −1 spec/classes/node_exporter_spec.rb
  55. +6 −0 spec/setup_acceptance_node.pp
  56. +2 −0 spec/spec_helper.rb
  57. +6 −1 templates/alertmanager.yaml.erb
  58. +2 −0 templates/jmx_exporter.yaml.erb
3 changes: 0 additions & 3 deletions .github/SECURITY.md

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
env:
BUNDLE_WITHOUT: development:system_tests:release
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -45,7 +45,7 @@ jobs:
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -56,7 +56,7 @@ jobs:

acceptance:
needs: setup_matrix
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
env:
BUNDLE_WITHOUT: development:test:release
strategy:
Expand All @@ -65,7 +65,7 @@ jobs:
include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
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: '5.3.0'
modulesync_config_version: '5.4.0'
25 changes: 25 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,31 @@ 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.5.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.5.0) (2023-01-30)

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

**Implemented enhancements:**

- bump puppet/systemd to \< 5.0.0 [\#645](https://github.com/voxpupuli/puppet-prometheus/pull/645) ([jhoblitt](https://github.com/jhoblitt))
- Adapt web.config.file option for node\_exporter versions higher than 1.5.0 [\#644](https://github.com/voxpupuli/puppet-prometheus/pull/644) ([Pigueiras](https://github.com/Pigueiras))
- feat: Support JMX exporter [\#636](https://github.com/voxpupuli/puppet-prometheus/pull/636) ([dploeger](https://github.com/dploeger))
- Support time\_intervals with alertmanager \>= 0.24.0 [\#618](https://github.com/voxpupuli/puppet-prometheus/pull/618) ([treydock](https://github.com/treydock))

**Fixed bugs:**

- Replace $facts\['service\_provider'\] by $prometheus::init\_style \(except init.pp\) [\#642](https://github.com/voxpupuli/puppet-prometheus/pull/642) ([phaedriel](https://github.com/phaedriel))

**Closed issues:**

- Support JMX exporter [\#635](https://github.com/voxpupuli/puppet-prometheus/issues/635)
- Toplevel parameter init\_style ignored [\#629](https://github.com/voxpupuli/puppet-prometheus/issues/629)

**Merged pull requests:**

- Debian OS family: Install apt-transport-https during CI [\#628](https://github.com/voxpupuli/puppet-prometheus/pull/628) ([bastelfreak](https://github.com/bastelfreak))
- prometheus: Move hiera data to class [\#624](https://github.com/voxpupuli/puppet-prometheus/pull/624) ([bastelfreak](https://github.com/bastelfreak))

## [v12.4.0](https://github.com/voxpupuli/puppet-prometheus/tree/v12.4.0) (2022-06-03)

[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v12.3.0...v12.4.0)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ group :test do
gem 'voxpupuli-test', '~> 5.4', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 1.0', :require => false
gem 'puppet_metadata', '~> 2.0', :require => false
end

group :development do
Expand Down
Loading