Merge pull request #666 from bodgit/redis

Install Redis plugin package if needed
voxpupuli · Jul 19, 2017 · c4bb4e3 · c4bb4e3
2 parents 09978f6 + ba1de0c
commit c4bb4e3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/manifests/plugin/redis.pp b/manifests/plugin/redis.pp
@@ -1,25 +1,34 @@
 # https://collectd.org/wiki/index.php/Plugin:Redis
 class collectd::plugin::redis (
-  $ensure      = 'present',
-  $interval    = undef,
-  $nodes       = {
+  Enum['present', 'absent']              $ensure         = 'present',
+  Optional[Integer[0]]                   $interval       = undef,
+  Optional[Boolean]                      $manage_package = undef,
+  Hash[String[1], Collectd::Redis::Node] $nodes          = {
     'redis' => {
       'host'    => 'localhost',
-      'port'    => '6379',
+      'port'    => 6379,
       'timeout' => 2000,
       'queries' => {
-          'dbsize' => {
-              'type'  => 'count',
-              'query' => 'DBSIZE',
-          },
+        'dbsize' => {
+          'type'  => 'count',
+          'query' => 'DBSIZE',
+        },
       },
     },
   },
 ) {
 
   include ::collectd
 
-  validate_hash($nodes)
+  $_manage_package = pick($manage_package, $::collectd::manage_package)
+
+  if $::osfamily == 'RedHat' {
+    if $_manage_package {
+      package { 'collectd-redis':
+        ensure => $ensure,
+      }
+    }
+  }
 
   collectd::plugin { 'redis':
     ensure   => $ensure,

diff --git a/templates/plugin/redis.conf.erb b/templates/plugin/redis.conf.erb
@@ -14,14 +14,14 @@
 <%     if params['password'] -%>
     Password "<%= params['password'] %>"
 <%     end -%>
-<% if params['queries'] -%>
-<%   params['queries'].each do |instance,qparams| -%>
+<%     if params['queries'] -%>
+<%       params['queries'].each do |instance,qparams| -%>
     <Query "<%= qparams['query'] -%>">
       Type "<%= qparams['type'] -%>"
       Instance "<%= instance -%>"
     </Query>
-<%   end -%>
-<%   end -%>
+<%       end -%>
+<%     end -%>
   </Node>
 <%   end -%>
 </Plugin>

diff --git a/types/redis/node.pp b/types/redis/node.pp
@@ -0,0 +1,2 @@
+#
+type Collectd::Redis::Node = Struct[{Optional['host'] => String[1], Optional['port'] => Variant[Integer[0, 65535], String[1]], Optional['password'] => String[1], Optional['timeout'] => Integer[0], Optional['queries'] => Hash[String[1], Hash[String[1], String[1]]]}]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#
		type Collectd::Redis::Node = Struct[{Optional['host'] => String[1], Optional['port'] => Variant[Integer[0, 65535], String[1]], Optional['password'] => String[1], Optional['timeout'] => Integer[0], Optional['queries'] => Hash[String[1], Hash[String[1], String[1]]]}]