Merge remote-tracking branch 'upstream/master' into blackbox_exporter

bramblek1 · Oct 18, 2017 · aca062d · aca062d
2 parents 61605b3 + 85ff0c8
commit aca062d
Show file tree

Hide file tree

Showing 27 changed files with 973 additions and 108 deletions.
diff --git a/.msync.yml b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.21.3'
+modulesync_config_version: '1.1.0'
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -51,7 +51,7 @@ Lint/AmbiguousOperator:
 Lint/AssignmentInCondition:
   Enabled: True
 
-Style/SpaceBeforeComment:
+Layout/SpaceBeforeComment:
   Enabled: True
 
 Style/AndOr:
@@ -119,7 +119,7 @@ Lint/UselessAssignment:
 Lint/Void:
   Enabled: True
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   Enabled: True
 
 Style/AccessorMethodName:
@@ -128,13 +128,13 @@ Style/AccessorMethodName:
 Style/Alias:
   Enabled: True
 
-Style/AlignArray:
+Layout/AlignArray:
   Enabled: True
 
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: True
 
-Style/AlignParameters:
+Layout/AlignParameters:
   Enabled: True
 
 Metrics/BlockNesting:
@@ -152,7 +152,7 @@ Style/BracesAroundHashParameters:
 Style/CaseEquality:
   Enabled: True
 
-Style/CaseIndentation:
+Layout/CaseIndentation:
   Enabled: True
 
 Style/CharacterLiteral:
@@ -186,64 +186,64 @@ Style/WordArray:
 Style/UnneededPercentQ:
   Enabled: True
 
-Style/Tab:
+Layout/Tab:
   Enabled: True
 
-Style/SpaceBeforeSemicolon:
+Layout/SpaceBeforeSemicolon:
   Enabled: True
 
-Style/TrailingBlankLines:
+Layout/TrailingBlankLines:
   Enabled: True
 
-Style/SpaceInsideBlockBraces:
+Layout/SpaceInsideBlockBraces:
   Enabled: True
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
   Enabled: True
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: True
 
-Style/SpaceInsideParens:
+Layout/SpaceInsideParens:
   Enabled: True
 
-Style/LeadingCommentSpace:
+Layout/LeadingCommentSpace:
   Enabled: True
 
-Style/SpaceBeforeFirstArg:
+Layout/SpaceBeforeFirstArg:
   Enabled: True
 
-Style/SpaceAfterColon:
+Layout/SpaceAfterColon:
   Enabled: True
 
-Style/SpaceAfterComma:
+Layout/SpaceAfterComma:
   Enabled: True
 
-Style/SpaceAfterMethodName:
+Layout/SpaceAfterMethodName:
   Enabled: True
 
-Style/SpaceAfterNot:
+Layout/SpaceAfterNot:
   Enabled: True
 
-Style/SpaceAfterSemicolon:
+Layout/SpaceAfterSemicolon:
   Enabled: True
 
-Style/SpaceAroundEqualsInParameterDefault:
+Layout/SpaceAroundEqualsInParameterDefault:
   Enabled: True
 
-Style/SpaceAroundOperators:
+Layout/SpaceAroundOperators:
   Enabled: True
 
-Style/SpaceBeforeBlockBraces:
+Layout/SpaceBeforeBlockBraces:
   Enabled: True
 
-Style/SpaceBeforeComma:
+Layout/SpaceBeforeComma:
   Enabled: True
 
 Style/CollectionMethods:
   Enabled: True
 
-Style/CommentIndentation:
+Layout/CommentIndentation:
   Enabled: True
 
 Style/ColonMethodCall:
@@ -268,7 +268,7 @@ Style/DefWithParentheses:
 Style/PreferredHashMethods:
   Enabled: True
 
-Style/DotPosition:
+Layout/DotPosition:
   EnforcedStyle: trailing
 
 Style/DoubleNegation:
@@ -277,25 +277,25 @@ Style/DoubleNegation:
 Style/EachWithObject:
   Enabled: True
 
-Style/EmptyLineBetweenDefs:
+Layout/EmptyLineBetweenDefs:
   Enabled: True
 
-Style/IndentArray:
+Layout/IndentArray:
   Enabled: True
 
-Style/IndentHash:
+Layout/IndentHash:
   Enabled: True
 
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   Enabled: True
 
-Style/IndentationWidth:
+Layout/IndentationWidth:
   Enabled: True
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: True
 
-Style/EmptyLinesAroundAccessModifier:
+Layout/EmptyLinesAroundAccessModifier:
   Enabled: True
 
 Style/EmptyLiteral:
@@ -314,7 +314,7 @@ Style/MethodDefParentheses:
 Style/LineEndConcatenation:
   Enabled: True
 
-Style/TrailingWhitespace:
+Layout/TrailingWhitespace:
   Enabled: True
 
 Style/StringLiterals:
@@ -466,9 +466,6 @@ Metrics/ParameterLists:
 Lint/RequireParentheses:
   Enabled: True
 
-Style/SpaceBeforeFirstArg:
-  Enabled: True
-
 Style/ModuleFunction:
   Enabled: True
 
@@ -484,7 +481,7 @@ Style/Encoding:
 Style/BlockDelimiters:
   Enabled: True
 
-Style/MultilineBlockLayout:
+Layout/MultilineBlockLayout:
   Enabled: True
 
 # 'Complexity' is very relative
@@ -498,7 +495,7 @@ Metrics/PerceivedComplexity:
 Lint/UselessAssignment:
   Enabled: True
 
-Style/ClosingParenthesisIndentation:
+Layout/ClosingParenthesisIndentation:
   Enabled: True
 
 # RSpec
@@ -527,7 +524,7 @@ RSpec/NestedGroups:
   Enabled: False
 
 # this is broken on ruby1.9
-Style/IndentHeredoc:
+Layout/IndentHeredoc:
   Enabled: False
 
 # disable Yaml safe_load. This is needed to support ruby2.0.0 development envs

diff --git a/.travis.yml b/.travis.yml
@@ -18,21 +18,15 @@ matrix:
   - rvm: 2.1.9
     bundler_args: --without system_tests development
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.2.7
-    bundler_args: --without system_tests development
-    env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.3.4
-    bundler_args: --without system_tests development
-    env: PUPPET_VERSION="~> 4.0" CHECK=test
   - rvm: 2.4.1
     bundler_args: --without system_tests development
-    env: PUPPET_VERSION="~> 4.0" CHECK=test
+    env: PUPPET_VERSION="~> 5.0" CHECK=test
   - rvm: 2.4.1
     bundler_args: --without system_tests development
-    env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
+    env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
   - rvm: 2.4.1
     bundler_args: --without system_tests development
-    env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
+    env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
 branches:
   only:
   - master

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,94 @@
+# Changelog
+
+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.
+
+## [v2.0.0](https://github.com/voxpupuli/puppet-prometheus/tree/v2.0.0) (2017-10-12)
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v1.0.0...v2.0.0)
+
+**Implemented enhancements:**
+
+- Bump versions for archive and puppet dependency/support puppet5 [\#65](https://github.com/voxpupuli/puppet-prometheus/pull/65) ([bastelfreak](https://github.com/bastelfreak))
+- Add tests for elasticsearch\_exporter and update a bit [\#64](https://github.com/voxpupuli/puppet-prometheus/pull/64) ([salekseev](https://github.com/salekseev))
+- Allow uncompressed daemons [\#53](https://github.com/voxpupuli/puppet-prometheus/pull/53) ([sathieu](https://github.com/sathieu))
+- Add elasticsearch exporter [\#51](https://github.com/voxpupuli/puppet-prometheus/pull/51) ([rbestbmj](https://github.com/rbestbmj))
+- Add mongodb\_exporter [\#46](https://github.com/voxpupuli/puppet-prometheus/pull/46) ([salekseev](https://github.com/salekseev))
+
+**Fixed bugs:**
+
+- $DAEMON info is only available for the prometheus daemon [\#50](https://github.com/voxpupuli/puppet-prometheus/pull/50) ([sathieu](https://github.com/sathieu))
+
+**Closed issues:**
+
+- Upgrade to Puppet4? [\#34](https://github.com/voxpupuli/puppet-prometheus/issues/34)
+
+**Merged pull requests:**
+
+- release 2.0.0 [\#66](https://github.com/voxpupuli/puppet-prometheus/pull/66) ([bastelfreak](https://github.com/bastelfreak))
+- Remove systemd module dependency and fix missing path for a exec [\#58](https://github.com/voxpupuli/puppet-prometheus/pull/58) ([juliantaylor](https://github.com/juliantaylor))
+- Update README.md [\#56](https://github.com/voxpupuli/puppet-prometheus/pull/56) ([steinbrueckri](https://github.com/steinbrueckri))
+- Use default collectors if "collectors" param is empty [\#49](https://github.com/voxpupuli/puppet-prometheus/pull/49) ([sathieu](https://github.com/sathieu))
+- Feature/cleanup and document [\#44](https://github.com/voxpupuli/puppet-prometheus/pull/44) ([jhooyberghs](https://github.com/jhooyberghs))
+- Reload config [\#43](https://github.com/voxpupuli/puppet-prometheus/pull/43) ([vide](https://github.com/vide))
+- Add param service\_name to node\_exporter class [\#40](https://github.com/voxpupuli/puppet-prometheus/pull/40) ([bastelfreak](https://github.com/bastelfreak))
+- backport changes to upstream [\#39](https://github.com/voxpupuli/puppet-prometheus/pull/39) ([bastelfreak](https://github.com/bastelfreak))
+
+## [v1.0.0](https://github.com/voxpupuli/puppet-prometheus/tree/v1.0.0) (2017-03-26)
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v0.2.0...v1.0.0)
+
+**Closed issues:**
+
+- alertmanager systemd service doesnt start [\#28](https://github.com/voxpupuli/puppet-prometheus/issues/28)
+
+**Merged pull requests:**
+
+- node-exporter have a 'v' in the release name since 0.13.0 [\#29](https://github.com/voxpupuli/puppet-prometheus/pull/29) ([NairolfL](https://github.com/NairolfL))
+
+## [v0.2.0](https://github.com/voxpupuli/puppet-prometheus/tree/v0.2.0) (2016-12-27)
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v0.1.14...v0.2.0)
+
+**Closed issues:**
+
+- Allow to configure scrape options by file [\#17](https://github.com/voxpupuli/puppet-prometheus/issues/17)
+- Generate tag. [\#12](https://github.com/voxpupuli/puppet-prometheus/issues/12)
+- Extend Readme [\#7](https://github.com/voxpupuli/puppet-prometheus/issues/7)
+- Prometheus Rule Files [\#6](https://github.com/voxpupuli/puppet-prometheus/issues/6)
+- Prometheus Logging to file [\#5](https://github.com/voxpupuli/puppet-prometheus/issues/5)
+
+**Merged pull requests:**
+
+- Add Statsd Exporter, Mysqld Exporter, make exporters generic [\#27](https://github.com/voxpupuli/puppet-prometheus/pull/27) ([lswith](https://github.com/lswith))
+- adding class to create alerts [\#24](https://github.com/voxpupuli/puppet-prometheus/pull/24) ([snubba](https://github.com/snubba))
+
+## [v0.1.14](https://github.com/voxpupuli/puppet-prometheus/tree/v0.1.14) (2016-11-11)
+[Full Changelog](https://github.com/voxpupuli/puppet-prometheus/compare/v0.1.13...v0.1.14)
+
+**Closed issues:**
+
+- Issue when install prometheus and alertmanager  [\#23](https://github.com/voxpupuli/puppet-prometheus/issues/23)
+
+**Merged pull requests:**
+
+- allow specification of a custom template [\#25](https://github.com/voxpupuli/puppet-prometheus/pull/25) ([lobeck](https://github.com/lobeck))
+- Allow overriding shared\_dir [\#22](https://github.com/voxpupuli/puppet-prometheus/pull/22) ([roidelapluie](https://github.com/roidelapluie))
+- Remove extra blank spaces at the end of lines [\#21](https://github.com/voxpupuli/puppet-prometheus/pull/21) ([roidelapluie](https://github.com/roidelapluie))
+- Fix AlertManager Class [\#20](https://github.com/voxpupuli/puppet-prometheus/pull/20) ([lswith](https://github.com/lswith))
+
+## [v0.1.13](https://github.com/voxpupuli/puppet-prometheus/tree/v0.1.13) (2016-09-14)
+**Closed issues:**
+
+- Update forge version [\#10](https://github.com/voxpupuli/puppet-prometheus/issues/10)
+
+**Merged pull requests:**
+
+- Add console support [\#15](https://github.com/voxpupuli/puppet-prometheus/pull/15) ([mspaulding06](https://github.com/mspaulding06))
+- Add missing quotes to params file [\#14](https://github.com/voxpupuli/puppet-prometheus/pull/14) ([mspaulding06](https://github.com/mspaulding06))
+- Get rid of leading whitespace in generated configs [\#13](https://github.com/voxpupuli/puppet-prometheus/pull/13) ([mspaulding06](https://github.com/mspaulding06))
+- Bunch of changes to work against the latest prom releases [\#11](https://github.com/voxpupuli/puppet-prometheus/pull/11) ([brutus333](https://github.com/brutus333))
+- add support for newer releases of node\_exporter [\#4](https://github.com/voxpupuli/puppet-prometheus/pull/4) ([patdowney](https://github.com/patdowney))
+- Systemd does not see all shutdowns as failures [\#3](https://github.com/voxpupuli/puppet-prometheus/pull/3) ([tarjei](https://github.com/tarjei))
+
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
diff --git a/Gemfile b/Gemfile
@@ -11,11 +11,10 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'puppetlabs_spec_helper', '~> 2.1.1',                         :require => false
+  gem 'puppetlabs_spec_helper', '~> 2.2.0',                         :require => false
   gem 'rspec-puppet', '~> 2.5',                                     :require => false
   gem 'rspec-puppet-facts',                                         :require => false
   gem 'rspec-puppet-utils',                                         :require => false
-  gem 'puppet-lint-absolute_classname-check',                       :require => false
   gem 'puppet-lint-leading_zero-check',                             :require => false
   gem 'puppet-lint-trailing_comma-check',                           :require => false
   gem 'puppet-lint-version_comparison-check',                       :require => false
@@ -24,10 +23,10 @@ group :test do
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
   gem 'metadata-json-lint',                                         :require => false
   gem 'puppet-blacksmith',                                          :require => false
-  gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
+  gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
   gem 'puppet-strings', '~> 1.0',                                   :require => false
   gem 'redcarpet',                                                  :require => false
-  gem 'rubocop', '~> 0.48.0',                                       :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'rubocop', '~> 0.49.1',                                       :require => false if RUBY_VERSION >= '2.3.0'
   gem 'rubocop-rspec', '~> 1.15.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
   gem 'mocha', '>= 1.2.1',                                          :require => false
   gem 'coveralls',                                                  :require => false
@@ -42,7 +41,7 @@ group :development do
   gem 'travis',                   :require => false
   gem 'travis-lint',              :require => false
   gem 'guard-rake',               :require => false
-  gem 'overcommit', '~> 0.39.1',  :require => false
+  gem 'overcommit', '>= 0.39.1',  :require => false
 end
 
 group :system_tests do
@@ -63,10 +62,10 @@ end
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
 else
-  gem 'facter', :require => false, :groups => [:test]
+gem 'facter', :require => false, :groups => [:test]
 end
 
-ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
+ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 5.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
 gem 'puppet', puppetversion, :require => false, :groups => [:test]
 
 # vim: syntax=ruby
diff --git a/README.md b/README.md
@@ -83,7 +83,7 @@ On the monitored nodes:
 
 ```puppet
 class { '::prometheus::node_exporter':
-  collectors => ['diskstats','filesystem','loadavg','meminfo','netdev','stat,time']
+  collectors => ['diskstats','filesystem','loadavg','meminfo','netdev','stat','time']
 }
 ```
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		modulesync_config_version: '0.21.3'
		modulesync_config_version: '1.1.0'