Merge d41a46f into 3daaf69

voxpupuli · Jul 24, 2020 · 05ea6d3 · 05ea6d3
2 parents 3daaf69 + d41a46f
commit 05ea6d3
Show file tree

Hide file tree

Showing 161 changed files with 177 additions and 336 deletions.
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
@@ -0,0 +1,3 @@
+# Vox Pupuli Security Policy
+
+Our vulnerabilities reporting process is at https://voxpupuli.org/security/
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -528,6 +528,9 @@ RSpec/RepeatedDescription:
 RSpec/NestedGroups:
   Enabled: False
 
+RSpec/MultipleExpectations:
+  Enabled: false
+
 # this is broken on ruby1.9
 Layout/IndentHeredoc:
   Enabled: False

diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 ---
+os: linux
 dist: bionic
 language: ruby
 cache: bundler
@@ -7,7 +8,7 @@ before_install:
   - bundle --version
 script:
   - 'bundle exec rake $CHECK'
-matrix:
+jobs:
   fast_finish: true
   include:
   - rvm: 2.4.4
@@ -92,7 +93,7 @@ notifications:
       - "chat.freenode.org#voxpupuli-notifications"
 deploy:
   provider: puppetforge
-  user: puppet
+  username: puppet
   password:
     secure: "FAK3Izs5bSZyblGvcFnGWm0exZV5+v9pbwfRDD2oihWxX3U3pArGW+3XcwcJfLQgrUYBsOTmHC8yPjlgTBYeIt/5pvg9X+3jwNgeto6kozpI/nvAq4NtcHhzxRejuPELhFYeXZ3hEw0w+v/ZRo2cNLwI0LLpiWEDvCMZN1CJ2RY="
   on:

diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ def location_for(place, fake_version = nil)
 end
 
 group :test do
-  gem 'voxpupuli-test', '>= 1.0.0',  :require => false
+  gem 'voxpupuli-test', '>= 2.0.0',  :require => false
   gem 'coveralls',                   :require => false
   gem 'simplecov-console',           :require => false
 end

diff --git a/examples/plugins/ceph.pp b/examples/plugins/ceph.pp
@@ -1,7 +1,5 @@
 include collectd
 
 class { 'collectd::plugin::ceph':
-  osds          => [ 'osd.0', 'osd.1', 'osd.2'],
+  osds          => ['osd.0', 'osd.1', 'osd.2'],
 }
-
-
diff --git a/examples/plugins/filecount.pp b/examples/plugins/filecount.pp
@@ -7,11 +7,11 @@
   },
 }
 
-collectd::plugin::filecount::directory {'foodir':
+collectd::plugin::filecount::directory { 'foodir':
   path => '/path/to/dir',
 }
 
-collectd::plugin::filecount::directory {'aborted-uploads':
+collectd::plugin::filecount::directory { 'aborted-uploads':
   path          => '/var/spool/foo/upload',
   pattern       => '.part.*',
   mtime         => '5m',

diff --git a/examples/plugins/memcached.pp b/examples/plugins/memcached.pp
@@ -1,11 +1,11 @@
 include collectd
 
 class { 'collectd::plugin::memcached':
-    instances => {
-        'default' => {
-            'host'    => 'localhost',
-            'address' => '127.0.0.1',
-            'port'    => '11211',
+  instances => {
+    'default' => {
+      'host'    => 'localhost',
+      'address' => '127.0.0.1',
+      'port'    => '11211',
     },
   },
 }
diff --git a/examples/plugins/perl.pp b/examples/plugins/perl.pp
@@ -17,14 +17,14 @@
   order       => 99,
   config      => {
     'foo' => 'bar',
-    'key' => [ 'val1', 'val2' ],
+    'key' => ['val1', 'val2'],
   },
 }
 
 collectd::plugin::perl::plugin { 'bar':
   module          => 'B',
   enable_debugger => 'DProf',
-  include_dir     => ['/tmp', '/tmp/lib' ],
+  include_dir     => ['/tmp', '/tmp/lib'],
 }
 
 #collectd::plugin::perl {
@@ -44,10 +44,10 @@
       'foo'  => 'bar',
       'more' => {
         'complex' => 'structure',
-        'no'      => [ 'a', 'b' ],
+        'no'      => ['a', 'b'],
         'yes'     => {
           'last' => 'level',
-          'and'  => [ 'array' , 'thing' ],
+          'and'  => ['array' , 'thing'],
         },
       },
     },

diff --git a/examples/plugins/processes.pp b/examples/plugins/processes.pp
@@ -1,9 +1,9 @@
 include collectd
 
 class { 'collectd::plugin::processes':
-  processes       => [ 'process1', 'process2' ],
+  processes       => ['process1', 'process2'],
   process_matches => [
-    { name  => 'process-all',
-      regex => 'process[0-9]' },
+    { name => 'process-all',
+    regex  => 'process[0-9]' },
   ],
 }
diff --git a/examples/plugins/snmp.pp b/examples/plugins/snmp.pp
@@ -1,7 +1,7 @@
 include collectd
 
-class {'collectd::plugin::snmp':
-  data  =>  {
+class { 'collectd::plugin::snmp':
+  data  => {
     amavis_incoming_messages => {
       'type'     => 'counter',
       'table'    => false,
@@ -19,4 +19,3 @@
     },
   },
 }
-
diff --git a/examples/purge_config.pp b/examples/purge_config.pp
@@ -4,7 +4,6 @@
   purge_config => true,
 }
 
-
 collectd::plugin { 'battery': }
 collectd::plugin { 'cpu': }
 collectd::plugin { 'df': }
@@ -18,4 +17,3 @@
 collectd::plugin { 'processes': }
 collectd::plugin { 'swap': }
 collectd::plugin { 'users': }
-
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -1,6 +1,5 @@
 # private
 class collectd::config inherits collectd {
-
   assert_private()
 
   $_conf_content = $collectd::purge_config ? {
@@ -42,5 +41,4 @@
   }
 
   File['collectd.d'] -> Concat <| tag == 'collectd' |>
-
 }
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -44,7 +44,6 @@
   Integer[1] $write_threads                            = $collectd::params::write_threads,
   Boolean    $utils                                    = $collectd::params::utils,
 ) inherits collectd::params {
-
   $collectd_version_real = pick_default($facts['collectd_version'], $minimum_version)
 
   contain collectd::repo

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -1,7 +1,6 @@
 # @summary installs collectd
 # @api private
 class collectd::install {
-
   assert_private()
 
   if $collectd::manage_package {
@@ -12,11 +11,9 @@
     }
   }
 
-  if $collectd::utils and  ( $facts['os']['family'] == 'Debian' or
-    ( $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'],'8') >= 0 )) {
-    package{'collectd-utils':
+  if $collectd::utils and  ( $facts['os']['family'] == 'Debian' or ( $facts['os']['family'] == 'RedHat' and versioncmp($facts['os']['release']['major'],'8') >= 0 )) {
+    package { 'collectd-utils':
       ensure => $collectd::package_ensure,
     }
   }
-
 }
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -1,6 +1,5 @@
 #
 class collectd::params {
-
   $autoloadplugin            = false
   $fqdnlookup                = true
   $collectd_hostname         = $facts['networking']['hostname']
@@ -16,7 +15,7 @@
   $read_threads              = 5
   $write_threads             = 5
   $timeout                   = 2
-  $typesdb                   = [ '/usr/share/collectd/types.db' ]
+  $typesdb                   = ['/usr/share/collectd/types.db']
   $write_queue_limit_high    = undef
   $write_queue_limit_low     = undef
   $package_ensure            = 'present'
@@ -38,7 +37,7 @@
 
   case $facts['os']['family'] {
     'Debian': {
-      $package_name       = [ 'collectd', 'collectd-core' ]
+      $package_name       = ['collectd', 'collectd-core']
       $package_provider   = 'apt'
       $collectd_dir       = '/etc/collectd'
       $plugin_conf_dir    = "${collectd_dir}/conf.d"

diff --git a/manifests/plugin.pp b/manifests/plugin.pp
@@ -8,7 +8,6 @@
   $plugin   = $name,
   Optional[Integer] $flushinterval = undef,
 ) {
-
   include collectd
 
   $conf_dir = $collectd::plugin_conf_dir

diff --git a/manifests/plugin/aggregation.pp b/manifests/plugin/aggregation.pp
@@ -4,7 +4,6 @@
   Optional[Integer[1]] $interval    = undef,
   Hash $aggregators                 = {},
 ) {
-
   include collectd
 
   collectd::plugin { 'aggregation':

diff --git a/manifests/plugin/aggregation/aggregator.pp b/manifests/plugin/aggregation/aggregator.pp
@@ -18,7 +18,6 @@
   Optional[Boolean] $calculatemaximum     = undef,
   Optional[Boolean] $calculatestddev      = undef,
 ) {
-
   include collectd
   include collectd::plugin::aggregation
 

diff --git a/manifests/plugin/amqp.pp b/manifests/plugin/amqp.pp
@@ -18,7 +18,6 @@
   Boolean $graphiteseparateinstances = false,
   Boolean $graphitealwaysappendds    = false,
 ) {
-
   include collectd
 
   if $facts['os']['family'] == 'RedHat' {

diff --git a/manifests/plugin/amqp1.pp b/manifests/plugin/amqp1.pp
@@ -112,7 +112,6 @@
   Optional[Integer] $retry_delay     = undef,
   Optional[Integer] $interval        = undef,
 ) {
-
   include collectd
 
   if $facts['os']['family'] == 'RedHat' {

diff --git a/manifests/plugin/apache.pp b/manifests/plugin/apache.pp
@@ -6,7 +6,6 @@
   Optional[Integer[1]] $interval           = undef,
   Optional[Array] $package_install_options = $collectd::package_install_options,
 ) {
-
   include collectd
 
   if $facts['os']['family'] == 'RedHat' {

diff --git a/manifests/plugin/battery.pp b/manifests/plugin/battery.pp
@@ -40,7 +40,6 @@
   Boolean $report_degraded            = false,
   Boolean $query_state_fs             = false,
 ) {
-
   include collectd
 
   collectd::plugin { 'battery':

diff --git a/manifests/plugin/bind.pp b/manifests/plugin/bind.pp
@@ -13,7 +13,6 @@
   Array[Collectd::Bind::View] $views = [],
   Optional[Integer[1]] $interval     = undef,
 ) {
-
   include collectd
 
   if $facts['os']['family'] == 'RedHat' {

diff --git a/manifests/plugin/ceph.pp b/manifests/plugin/ceph.pp
@@ -41,7 +41,6 @@
   Boolean $manage_package            = $collectd::manage_package,
   String $package_name               = 'collectd-ceph'
 ) {
-
   include collectd
 
   if $manage_package {

diff --git a/manifests/plugin/cgroups.pp b/manifests/plugin/cgroups.pp
@@ -5,7 +5,6 @@
   Boolean $ignore_selected          = false,
   Optional[Integer[1]] $interval    = undef,
 ) {
-
   include collectd
 
   collectd::plugin { 'cgroups':

diff --git a/manifests/plugin/chain.pp b/manifests/plugin/chain.pp
@@ -5,7 +5,6 @@
   Collectd::Filter::Target $defaulttarget = 'write',
   Array $rules                            = []
 ) {
-
   include collectd
 
   $conf_dir = $collectd::plugin_conf_dir

diff --git a/manifests/plugin/connectivity.pp b/manifests/plugin/connectivity.pp
@@ -24,7 +24,6 @@
   Boolean $manage_package           = $collectd::manage_package,
   Array[String[1]] $interfaces      = [],
 ) {
-
   include collectd
 
   if $manage_package and $facts['os']['family'] == 'RedHat' {

diff --git a/manifests/plugin/conntrack.pp b/manifests/plugin/conntrack.pp
@@ -2,7 +2,6 @@
 class collectd::plugin::conntrack (
   Enum['present', 'absent'] $ensure = 'present',
 ) {
-
   include collectd
 
   collectd::plugin { 'conntrack':

diff --git a/manifests/plugin/contextswitch.pp b/manifests/plugin/contextswitch.pp
@@ -3,7 +3,6 @@
   Enum['present', 'absent'] $ensure   = 'present',
   Optional[Integer[1]] $interval      = undef,
 ) {
-
   include collectd
 
   collectd::plugin { 'contextswitch':

diff --git a/manifests/plugin/cpu.pp b/manifests/plugin/cpu.pp
@@ -9,7 +9,6 @@
   Boolean $subtractgueststate       = true,
   Optional[Integer[1]] $interval    = undef,
 ) {
-
   include collectd
 
   collectd::plugin { 'cpu':

diff --git a/manifests/plugin/cpufreq.pp b/manifests/plugin/cpufreq.pp
@@ -2,7 +2,6 @@
 class collectd::plugin::cpufreq (
   Enum['present', 'absent'] $ensure = 'present',
 ) {
-
   include collectd
 
   collectd::plugin { 'cpufreq':

diff --git a/manifests/plugin/csv.pp b/manifests/plugin/csv.pp
@@ -5,7 +5,6 @@
   $interval   = undef,
   $storerates = false
 ) {
-
   include collectd
 
   collectd::plugin { 'csv':

diff --git a/manifests/plugin/cuda.pp b/manifests/plugin/cuda.pp
@@ -59,7 +59,7 @@
   }
 
   if ($_manage_package) and ($provider_proxy) {
-    $install_options = [{'--proxy' => $provider_proxy}]
+    $install_options = [{ '--proxy' => $provider_proxy }]
   } else {
     $install_options = undef
   }

diff --git a/manifests/plugin/curl.pp b/manifests/plugin/curl.pp
@@ -3,9 +3,8 @@
   $ensure         = 'present',
   $manage_package = undef,
   $interval       = undef,
-  $pages          = { },
+  $pages          = {},
 ) {
-
   include collectd
 
   $_manage_package = pick($manage_package, $collectd::manage_package)

diff --git a/manifests/plugin/curl/page.pp b/manifests/plugin/curl/page.pp
@@ -13,7 +13,6 @@
   Optional[Array[Hash]] $matches         = undef,
   String $plugininstance                 = $name, # You can have multiple <Page> with the same name.
 ) {
-
   include collectd
   include collectd::plugin::curl
 

diff --git a/manifests/plugin/curl_json.pp b/manifests/plugin/curl_json.pp
@@ -18,7 +18,6 @@
   $order          = '10',
   $manage_package = undef,
 ) {
-
   include collectd
 
   $_manage_package = pick($manage_package, $collectd::manage_package)