From 7ec247e2e01aeed76edaf27d631d206a70dcef5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 25 Aug 2021 07:40:17 -1000 Subject: [PATCH 1/2] Allow stdlib 8.0.0 --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index f3dad7b2..126a606d 100644 --- a/metadata.json +++ b/metadata.json @@ -18,7 +18,7 @@ }, { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.25.0 < 8.0.0" + "version_requirement": ">= 4.25.0 < 9.0.0" }, { "name": "puppet-epel", From dbe03009c90a59d0e0bc8bb8e7090a54721ce391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Wed, 25 Aug 2021 09:37:43 -1000 Subject: [PATCH 2/2] Pet puppet-lint The version of puppet-lint used in this module does not currently fail an error, and a bunch of issues have slept in. A future modulesync update should fix this issue and allow a better checking of the manifests style. --- manifests/plugin/cuda.pp | 10 +++++----- manifests/plugin/intel_pmu.pp | 6 +++--- manifests/plugin/iscdhcp.pp | 10 +++++----- manifests/plugin/mcelog.pp | 2 +- manifests/plugin/ovs_events.pp | 8 ++++---- manifests/plugin/powerdns.pp | 6 +++--- manifests/plugin/rrdtool.pp | 10 +++++----- manifests/plugin/snmp/host.pp | 2 +- manifests/plugin/snmp_agent.pp | 2 +- manifests/plugin/tail.pp | 2 +- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/manifests/plugin/cuda.pp b/manifests/plugin/cuda.pp index ed99ec6f..0c1090cf 100644 --- a/manifests/plugin/cuda.pp +++ b/manifests/plugin/cuda.pp @@ -11,11 +11,11 @@ # @param package_provider Optional[String] Passed to package resource. Default: pip # @param provider_proxy Optional[String] Proxy for provider. Default: undef class collectd::plugin::cuda ( - Optional[String] $ensure = 'present', - Optional[Boolean] $manage_package = undef, - Optional[String] $package_name = 'collectd-cuda', - Optional[String] $package_provider = undef, - Optional[String] $provider_proxy = undef, + Enum['present', 'absent'] $ensure = 'present', + Optional[Boolean] $manage_package = undef, + String[1] $package_name = 'collectd-cuda', + Optional[String[1]] $package_provider = undef, + Optional[String[1]] $provider_proxy = undef, ) { include collectd diff --git a/manifests/plugin/intel_pmu.pp b/manifests/plugin/intel_pmu.pp index ed387366..1a78f3af 100644 --- a/manifests/plugin/intel_pmu.pp +++ b/manifests/plugin/intel_pmu.pp @@ -1,9 +1,9 @@ # https://collectd.org/documentation/manpages/collectd.conf.5.shtml#plugin_intel_pmu class collectd::plugin::intel_pmu ( Enum['present', 'absent'] $ensure = 'present', - Optional[Boolean] $report_hardware_cache_events = false, - Optional[Boolean] $report_kernel_pmu_events = false, - Optional[Boolean] $report_software_events = false, + Boolean $report_hardware_cache_events = false, + Boolean $report_kernel_pmu_events = false, + Boolean $report_software_events = false, Optional[String] $event_list = undef, Optional[Array[String]] $hardware_events = undef, ) { diff --git a/manifests/plugin/iscdhcp.pp b/manifests/plugin/iscdhcp.pp index 6cb2f2b2..14ccb6d3 100644 --- a/manifests/plugin/iscdhcp.pp +++ b/manifests/plugin/iscdhcp.pp @@ -10,11 +10,11 @@ # @param package_provider Optional[String] Passed to package resource. Default: pip # @param provider_proxy Optional[String] Proxy for provider. Default: undef class collectd::plugin::iscdhcp ( - Optional[String] $ensure = 'present', - Optional[Boolean] $manage_package = undef, - Optional[String] $package_name = 'collectd-iscdhcp', - Optional[String] $package_provider = undef, - Optional[String] $provider_proxy = undef, + Enum['present', 'absent'] $ensure = 'present', + Optional[Boolean] $manage_package = undef, + String[1] $package_name = 'collectd-iscdhcp', + Optional[String[1]] $package_provider = undef, + Optional[String[1]] $provider_proxy = undef, ) { include collectd diff --git a/manifests/plugin/mcelog.pp b/manifests/plugin/mcelog.pp index 088ff379..6eaf1fdc 100644 --- a/manifests/plugin/mcelog.pp +++ b/manifests/plugin/mcelog.pp @@ -5,7 +5,7 @@ Optional[Array] $package_install_options = $collectd::package_install_options, # Log file option and memory option are mutualy exclusive. Optional[String] $mceloglogfile = undef, - Optional[Collectd::MCELOG::Memory] $memory = { + Collectd::MCELOG::Memory $memory = { 'mcelogclientsocket' => '/var/run/mcelog-client', 'persistentnotification' => false, } diff --git a/manifests/plugin/ovs_events.pp b/manifests/plugin/ovs_events.pp index 60680d34..45f070c0 100644 --- a/manifests/plugin/ovs_events.pp +++ b/manifests/plugin/ovs_events.pp @@ -45,13 +45,13 @@ class collectd::plugin::ovs_events ( Optional[Stdlib::Host] $address = undef, Optional[Boolean] $dispatch = undef, - String $ensure = 'present', - Optional[Array] $interfaces = [], + Enum['present', 'absent'] $ensure = 'present', + Array $interfaces = [], Boolean $manage_package = true, Optional[Boolean] $send_notification = undef, - String $package_name = 'collectd-ovs-events', + String[1] $package_name = 'collectd-ovs-events', Optional[Stdlib::Port] $port = undef, - Optional[String] $socket = undef, + Optional[String[1]] $socket = undef, ) { include collectd diff --git a/manifests/plugin/powerdns.pp b/manifests/plugin/powerdns.pp index 7acd2def..ab06451d 100644 --- a/manifests/plugin/powerdns.pp +++ b/manifests/plugin/powerdns.pp @@ -3,9 +3,9 @@ Enum['present', 'absent'] $ensure = 'present', Integer $order = 10, Optional[Numeric] $interval = undef, - Optional[Hash[String, Hash]] $servers = {}, - Optional[Hash[String, Hash]] $recursors = {}, - Optional[String] $local_socket = undef, + Hash[String, Hash] $servers = {}, + Hash[String, Hash] $recursors = {}, + Optional[String[1]] $local_socket = undef, ) { include collectd diff --git a/manifests/plugin/rrdtool.pp b/manifests/plugin/rrdtool.pp index 5f45bde0..2e7d6416 100644 --- a/manifests/plugin/rrdtool.pp +++ b/manifests/plugin/rrdtool.pp @@ -5,12 +5,12 @@ Stdlib::Absolutepath $datadir = '/var/lib/collectd/rrd', Boolean $createfilesasync = false, $interval = undef, - Optional[Integer] $rrarows = 1200, + Integer $rrarows = 1200, Array[Integer] $rratimespan = [3600, 86400, 604800, 2678400, 31622400], - Optional[Float] $xff = 0.1, - Optional[Integer] $cacheflush = 900, - Optional[Integer] $cachetimeout = 120, - Optional[Integer] $writespersecond = 50 + Float $xff = 0.1, + Integer $cacheflush = 900, + Integer $cachetimeout = 120, + Integer $writespersecond = 50 ) { include collectd diff --git a/manifests/plugin/snmp/host.pp b/manifests/plugin/snmp/host.pp index f5abc4bb..4f489435 100644 --- a/manifests/plugin/snmp/host.pp +++ b/manifests/plugin/snmp/host.pp @@ -6,7 +6,7 @@ Collectd::SNMP::Version $version = '1', Optional[Integer[0]] $interval = undef, # SNMPv1/2c - Optional[String[1]] $community = 'public', + String[1] $community = 'public', # SNMPv3 Optional[String[1]] $username = undef, Optional[Collectd::SNMP::SecurityLevel] $security_level = undef, diff --git a/manifests/plugin/snmp_agent.pp b/manifests/plugin/snmp_agent.pp index 522f6e84..78df1056 100644 --- a/manifests/plugin/snmp_agent.pp +++ b/manifests/plugin/snmp_agent.pp @@ -9,7 +9,7 @@ # @param table Hash[String[1], Collectd::SNMP_AGENT::Table] Defines a table consisting of several Data blocks being its columns class collectd::plugin::snmp_agent ( Enum['present', 'absent'] $ensure = 'present', - Optional[Hash[String[1],Collectd::SNMP_AGENT::Data]] $data = { + Hash[String[1],Collectd::SNMP_AGENT::Data] $data = { 'memAvailReal' => { 'oids' => '1.3.6.1.4.1.2021.4.6.0', 'plugin' => 'memory', diff --git a/manifests/plugin/tail.pp b/manifests/plugin/tail.pp index 5bb17f62..99c17a70 100644 --- a/manifests/plugin/tail.pp +++ b/manifests/plugin/tail.pp @@ -2,7 +2,7 @@ # https://collectd.org/wiki/index.php/Plugin:Tail class collectd::plugin::tail ( $interval = undef, - Optional[Hash] $files = {}, + Hash $files = {}, ) { collectd::plugin { 'tail': interval => $interval,