Release 1.3.0

.rubocop.yml

@@ -4,7 +4,8 @@ require:
 - rubocop-i18n
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.1'
+  TargetRubyVersion: '2.7'
+  NewCops: enable
   Include:
   - "./**/*.rb"
   Exclude:
@@ -21,9 +22,9 @@ AllCops:
 Metrics/LineLength:
   Description: People have wide screens, use them.
   Max: 200
-GetText:
+I18n/GetText:
   Enabled: false
-GetText/DecorateString:
+I18n/GetText/DecorateString:
   Description: We don't want to decorate test output.
   Exclude:
   - spec/**/*
@@ -68,7 +69,7 @@ Style/TrailingCommaInArguments:
   Description: Prefer always trailing comma on multiline argument lists. This makes
     diffs, and re-ordering nicer.
   EnforcedStyleForMultiline: comma
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
   Description: Prefer always trailing comma on multiline literals. This makes diffs,
     and re-ordering nicer.
   EnforcedStyleForMultiline: comma
@@ -89,15 +90,15 @@ Style/MethodCalledOnDoEndBlock:
   Enabled: true
 Style/StringMethods:
   Enabled: true
-GetText/DecorateFunctionMessage:
+I18n/GetText/DecorateFunctionMessage:
   Enabled: false
-GetText/DecorateStringFormattingUsingInterpolation:
+I18n/RailsI18n/DecorateStringFormattingUsingInterpolation:
   Enabled: false
-GetText/DecorateStringFormattingUsingPercent:
+I18n/GetText/DecorateStringFormattingUsingPercent:
   Enabled: false
 Layout/EndOfLine:
   Enabled: false
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false

.travis.yml

@@ -10,7 +10,7 @@ before_install:
 script:
 - bundle exec rake $CHECK
 rvm:
-- 2.5.3
+- 2.7.0
 stages:
 - static
 - spec
@@ -22,14 +22,14 @@ jobs:
   include:
   - stage: static
     bundler_args: "--without system_tests"
-    env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
+    env: CHECK="validate lint check rubocop"
 
   - stage: spec
     bundler_args: "--without system_tests"
-    env: PUPPET_GEM_VERSION="~> 6.0" CHECK="parallel_spec spec/classes spec/defines"
+    env: PUPPET_GEM_VERSION="~> 7.0" CHECK="parallel_spec spec/classes spec/defines"
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=centos7-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=centos7-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
@@ -38,7 +38,7 @@ jobs:
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=centos8-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=centos8-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
@@ -47,7 +47,7 @@ jobs:
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=debian9-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=debian9-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
@@ -56,7 +56,7 @@ jobs:
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=debian10-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=debian10-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
@@ -65,16 +65,21 @@ jobs:
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=fedora29-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=debian11-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
+  - stage: acceptance
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet6" BEAKER_setfile=debian11-64
+      BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
+    services: docker
+
   - stage: acceptance
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet6" BEAKER_setfile=fedora29-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=fedora30-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=fedora30-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
@@ -83,7 +88,7 @@ jobs:
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=fedora31-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=fedora31-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
@@ -92,13 +97,18 @@ jobs:
     services: docker
 
   - stage: acceptance
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet5" BEAKER_setfile=ubuntu1804-64
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=ubuntu1804-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
   - stage: acceptance
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet6" BEAKER_setfile=ubuntu1804-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
     services: docker
+
+  - stage: acceptance
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet7" BEAKER_setfile=ubuntu2004-64
+      BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"
+    services: docker
   - stage: acceptance
     env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION="puppet6" BEAKER_setfile=ubuntu2004-64
       BEAKER_debug=true BEAKER_HYPERVISOR=docker CHECK="beaker"

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file.
 
+## Release 1.3.0
+
+**Features**
+
+- Support Thanos version 0.26.0
+
+**Bug Fixes**
+
+- Fix : systemctl daemon-reload after service file changed
+
 ## Release 1.2.0
 
 **Features**

Gemfile

@@ -17,21 +17,19 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "fast_gettext", '1.1.0',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
-  gem "fast_gettext",                                            require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
-  gem "json_pure", '<= 2.0.1',                                   require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
-  gem "json", '= 1.8.1',                                         require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
   gem "json", '= 2.0.4',                                         require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
   gem "json", '= 2.1.0',                                         require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
-  gem "rb-readline", '= 0.5.5',                                  require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-posix-default-r#{minor_version}", '~> 0.3', require: false, platforms: [:ruby]
-  gem "puppet-module-posix-dev-r#{minor_version}", '~> 0.3',     require: false, platforms: [:ruby]
-  gem "puppet-module-win-default-r#{minor_version}", '~> 0.3',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "puppet-module-win-dev-r#{minor_version}", '~> 0.3',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "json", '= 2.3.0',                                         require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
+  gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
+  gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false
+  gem 'rubocop-i18n',                                            require: false
 end
-
 group :system_tests do
-  gem 'winrm',                              :require => false
+  gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
+  gem "puppet-module-win-system-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   else
@@ -42,6 +40,7 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
+  gem 'rubocop-i18n',                       :require => false
   gem 'serverspec',                         :require => false
   gem 'beaker-hostgenerator', '>= 1.1.22',  :require => false
   gem 'beaker-docker',                      :require => false
@@ -53,10 +52,7 @@ group :system_tests do
   gem 'rbnacl-libsodium',                   :require => false
   gem 'bcrypt_pbkdf',                       :require => false
   gem 'ed25519',                            :require => false
-end
-
-group :build do
-  gem 'pdk', '1.16.0'
+  gem 'net-telnet',                         :require => false
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']
@@ -73,16 +69,6 @@ gems['puppet'] = location_for(puppet_version)
 gems['facter'] = location_for(facter_version) if facter_version
 gems['hiera'] = location_for(hiera_version) if hiera_version
 
-if Gem.win_platform? && puppet_version =~ %r{^(file:///|git://)}
-  # If we're using a Puppet gem on Windows which handles its own win32-xxx gem
-  # dependencies (>= 3.5.0), set the maximum versions (see PUP-6445).
-  gems['win32-dir'] =      ['<= 0.4.9', require: false]
-  gems['win32-eventlog'] = ['<= 0.6.5', require: false]
-  gems['win32-process'] =  ['<= 0.7.5', require: false]
-  gems['win32-security'] = ['<= 0.2.5', require: false]
-  gems['win32-service'] =  ['0.8.8', require: false]
-end
-
 gems.each do |gem_name, gem_params|
   gem gem_name, *gem_params
 end

README.md

@@ -259,8 +259,8 @@ This project contains tests for [rspec-puppet](http://rspec-puppet.com/).
 
 Quickstart to run all linter and unit tests:
 ```bash
-bundle install --path .vendor/
-bundle exec rake test
+bundle install
+bundle exec rake validate
 ```
 Or
 ```bash

REFERENCE.md

@@ -58,7 +58,7 @@ The following parameters are available in the `thanos` class:
 * [`manage_rule`](#manage_rule)
 * [`manage_store`](#manage_store)
 * [`manage_compact`](#manage_compact)
-* [`manage_receiver`](#manage_receiver)
+* [`manage_receive`](#manage_receive)
 * [`manage_tools_bucket_web`](#manage_tools_bucket_web)
 * [`install_method`](#install_method)
 * [`package_ensure`](#package_ensure)
@@ -87,7 +87,6 @@ The following parameters are available in the `thanos` class:
 * [`manage_index_cache_config`](#manage_index_cache_config)
 * [`index_cache_config_file`](#index_cache_config_file)
 * [`index_cache_config`](#index_cache_config)
-* [`manage_receive`](#manage_receive)
 
 ##### <a name="version"></a>`version`
 
@@ -151,10 +150,14 @@ Whether to create a service to run Compact.
 
 Default value: ``false``
 
-##### <a name="manage_receiver"></a>`manage_receiver`
+##### <a name="manage_receive"></a>`manage_receive`
+
+Data type: `Boolean`
 
 Whether to create a service to run Receiver.
 
+Default value: ``false``
+
 ##### <a name="manage_tools_bucket_web"></a>`manage_tools_bucket_web`
 
 Data type: `Boolean`
@@ -385,14 +388,6 @@ Index cache configuration.
 
 Default value: `{}`
 
-##### <a name="manage_receive"></a>`manage_receive`
-
-Data type: `Boolean`
-
-
-
-Default value: ``false``
-
 ### <a name="thanoscompact"></a>`thanos::compact`
 
 This class install Compact as service to continuously compacts blocks in an object store bucket.
@@ -2977,8 +2972,8 @@ The following parameters are available in the `thanos::tools::bucket_web` class:
 * [`refresh`](#refresh)
 * [`timeout`](#timeout)
 * [`label`](#label)
-* [`extra_params`](#extra_params)
 * [`max_open_files`](#max_open_files)
+* [`extra_params`](#extra_params)
 
 ##### <a name="ensure"></a>`ensure`
 
@@ -3062,17 +3057,17 @@ Default value: `'2m'`
 
 ##### <a name="web_external_prefix"></a>`web_external_prefix`
 
-Data type: `String`
+Data type: `Optional[String]`
 
 Static prefix for all HTML links and redirect URLs in the bucket web UI interface.
 Actual endpoints are still served on / or the web.route-prefix.
 This allows thanos bucket web UI to be served behind a reverse proxy that strips a URL sub-path.
 
-Default value: `''`
+Default value: ``undef``
 
 ##### <a name="web_prefix_header"></a>`web_prefix_header`
 
-Data type: `String`
+Data type: `Optional[String]`
 
 Name of HTTP request header used for dynamic prefixing of UI links and redirects.
 This option is ignored if web.external-prefix argument is set.
@@ -3081,7 +3076,7 @@ The --web.prefix-header=X-Forwarded-Prefix option can be useful, for example, if
   reverse proxy with PathPrefixStrip option enabled, which sends the stripped prefix value in X-Forwarded-Prefix header.
 This allows thanos UI to be served on a sub-path.
 
-Default value: `''`
+Default value: ``undef``
 
 ##### <a name="refresh"></a>`refresh`
 
@@ -3101,27 +3096,28 @@ Default value: `'5m'`
 
 ##### <a name="label"></a>`label`
 
-Data type: `String`
+Data type: `Optional[String]`
 
 Prometheus label to use as timeline title
 
-Default value: `''`
-
-##### <a name="extra_params"></a>`extra_params`
+Default value: ``undef``
 
-Data type: `Hash`
+##### <a name="max_open_files"></a>`max_open_files`
 
-Parameters passed to the binary, ressently released in latest version of Thanos.
+Data type: `Optional[Integer]`
 
-Default value: `{}`
+Define how many open files the service is able to use
+In some cases, the default value (1024) needs to be increased
 
-##### <a name="max_open_files"></a>`max_open_files`
+Default value: ``undef``
 
-Data type: `Optional[Integer]`
+##### <a name="extra_params"></a>`extra_params`
 
+Data type: `Hash`
 
+Parameters passed to the binary, ressently released in latest version of Thanos.
 
-Default value: ``undef``
+Default value: `{}`
 
 ## Defined types
 

appveyor.yml

@@ -16,8 +16,8 @@ init:
 environment:
   matrix:
     -
-      RUBY_VERSION: 24-x64
-      CHECK: syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+      RUBY_VERSION: 25-x64
+      CHECK: validate lint check rubocop
     -
       PUPPET_GEM_VERSION: ~> 6.0
       RUBY_VERSION: 25