Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow stdlib 8.0.0 #983

Merged
merged 2 commits into from
Aug 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions manifests/plugin/cuda.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/intel_pmu.pp
Original file line number Diff line number Diff line change
@@ -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,
) {
Expand Down
10 changes: 5 additions & 5 deletions manifests/plugin/iscdhcp.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion manifests/plugin/mcelog.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand Down
8 changes: 4 additions & 4 deletions manifests/plugin/ovs_events.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions manifests/plugin/powerdns.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions manifests/plugin/rrdtool.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion manifests/plugin/snmp/host.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion manifests/plugin/snmp_agent.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion manifests/plugin/tail.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down