Skip to content

Commit 2190a9e

Browse files
author
txaj
committed
Make plugins passing the $interval parameter
only for those using collectd::plugin
1 parent 3fae4b2 commit 2190a9e

46 files changed

Lines changed: 206 additions & 110 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎manifests/plugin/amqp.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
$amqppersistent = true,
1212
$graphiteprefix = 'collectd.',
1313
$escapecharacter = '_',
14+
$interval = undef,
1415
) {
1516

1617
validate_bool($amqppersistent)
1718

1819
collectd::plugin {'amqp':
19-
ensure => $ensure,
20-
content => template('collectd/plugin/amqp.conf.erb'),
20+
ensure => $ensure,
21+
content => template('collectd/plugin/amqp.conf.erb'),
22+
interval => $interval,
2123
}
2224
}

‎manifests/plugin/apache.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
class collectd::plugin::apache (
33
$ensure = present,
44
$instances = { 'localhost' => { 'url' => 'http://localhost/mod_status?auto' } },
5+
$interval = undef,
56
) {
67

78
validate_hash($instances)
@@ -13,7 +14,8 @@
1314
}
1415

1516
collectd::plugin {'apache':
16-
ensure => $ensure,
17-
content => template('collectd/plugin/apache.conf.erb'),
17+
ensure => $ensure,
18+
content => template('collectd/plugin/apache.conf.erb'),
19+
interval => $interval,
1820
}
1921
}

‎manifests/plugin/bind.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
$serverstats = true,
1111
$zonemaintstats = true,
1212
$views = [],
13+
$interval = undef,
1314
) {
1415

1516
validate_bool(
@@ -24,7 +25,8 @@
2425
validate_array($views)
2526

2627
collectd::plugin {'bind':
27-
ensure => $ensure,
28-
content => template('collectd/plugin/bind.conf.erb'),
28+
ensure => $ensure,
29+
content => template('collectd/plugin/bind.conf.erb'),
30+
interval => $interval,
2931
}
3032
}

‎manifests/plugin/contextswitch.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# https://collectd.org/wiki/index.php/Plugin:ContextSwitch
22
class collectd::plugin::contextswitch (
3-
$ensure = present,
3+
$ensure = present,
4+
$interval = undef,
45
) {
56
collectd::plugin {'contextswitch':
6-
ensure => $ensure
7+
ensure => $ensure,
8+
interval => $interval,
79
}
810
}

‎manifests/plugin/cpu.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# https://collectd.org/wiki/index.php/Plugin:CPU
22
class collectd::plugin::cpu (
3-
$ensure = present,
3+
$ensure = present,
4+
$interval = undef,
45
) {
56
collectd::plugin {'cpu':
6-
ensure => $ensure
7+
ensure => $ensure,
8+
interval => $interval,
79
}
810
}

‎manifests/plugin/csv.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
class collectd::plugin::csv (
33
$ensure = present,
44
$datadir = '/etc/collectd/var/lib/collectd/csv',
5+
$interval = undef,
56
$storerates = false
67
) {
78

89
collectd::plugin {'csv':
9-
ensure => $ensure,
10-
content => template('collectd/plugin/csv.conf.erb'),
10+
ensure => $ensure,
11+
content => template('collectd/plugin/csv.conf.erb'),
12+
interval => $interval,
1113
}
1214
}

‎manifests/plugin/curl.pp‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
#
22
class collectd::plugin::curl (
3-
$ensure = present,
4-
$pages = { },
3+
$ensure = present,
4+
$interval = undef,
5+
$pages = { },
56
) {
67
collectd::plugin {'curl':
7-
ensure => $ensure,
8+
ensure => $ensure,
9+
interval => $interval,
810
}
911
$defaults = {
1012
'ensure' => $ensure

‎manifests/plugin/df.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
$ensure = present,
44
$fstypes = [],
55
$ignoreselected = false,
6+
$interval = undef,
67
$mountpoints = [],
78
$reportbydevice = false,
89
$reportinodes = true,
@@ -25,7 +26,8 @@
2526
)
2627

2728
collectd::plugin {'df':
28-
ensure => $ensure,
29-
content => template('collectd/plugin/df.conf.erb'),
29+
ensure => $ensure,
30+
content => template('collectd/plugin/df.conf.erb'),
31+
interval => $interval,
3032
}
3133
}

‎manifests/plugin/disk.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
$ensure = present,
44
$disks = [],
55
$ignoreselected = false,
6+
$interval = undef,
67
) {
78

89
validate_array($disks)
910
validate_bool($ignoreselected)
1011

1112
collectd::plugin {'disk':
12-
ensure => $ensure,
13-
content => template('collectd/plugin/disk.conf.erb'),
13+
ensure => $ensure,
14+
content => template('collectd/plugin/disk.conf.erb'),
15+
interval => $interval,
1416
}
1517
}

‎manifests/plugin/entropy.pp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
# https://collectd.org/wiki/index.php/Plugin:Entropy
22
class collectd::plugin::entropy (
3-
$ensure = present,
3+
$ensure = present,
4+
$interval = undef,
45
) {
56

67
collectd::plugin {'entropy':
7-
ensure => $ensure,
8+
ensure => $ensure,
9+
interval => $interval,
810
}
911
}

0 commit comments

Comments
 (0)