Changed casing to be standard snake_case for collectd::plugin::snmp

voxpupuli · Dec 20, 2016 · 1bc0d36 · 1bc0d36
1 parent 82bf96c
commit 1bc0d36
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -1468,21 +1468,21 @@ class { '::collectd::plugin::smart':
 class {'collectd::plugin::snmp':
   data  =>  {
     amavis_incoming_messages => {
-      'Type'        => 'counter',
-      'Table'       => false,
-      'Instance'    => 'amavis.inMsgs',
-      'Values'      => ['AMAVIS-MIB::inMsgs.0'],
-      'Ignore'      => [ '00:00', '*IgnoreString' ],
-      'InvertMatch' => false,
+      'type'         => 'counter',
+      'table'        => false,
+      'instance'     => 'amavis.inMsgs',
+      'values'       => ['AMAVIS-MIB::inMsgs.0'],
+      'ignore'       => [ '00:00', '*IgnoreString' ],
+      'invert_match' => false,
     }
   },
   hosts => {
     debianvm => {
-      'Address'   => '127.0.0.1',
-      'Version'   => 2,
-      'Community' => 'public',
-      'Collect'   => ['amavis_incoming_messages'],
-      'Interval'  => 10
+      'address'   => '127.0.0.1',
+      'version'   => 2,
+      'community' => 'public',
+      'collect'   => ['amavis_incoming_messages'],
+      'interval'  => 10
     }
   },
 }

diff --git a/examples/plugins/snmp.pp b/examples/plugins/snmp.pp
@@ -3,19 +3,19 @@
 class {'::collectd::plugin::snmp':
   data  =>  {
     amavis_incoming_messages => {
-      'Type'     => 'counter',
-      'Table'    => false,
-      'Instance' => 'amavis.inMsgs',
-      'Values'   => ['AMAVIS-MIB::inMsgs.0'],
+      'type'     => 'counter',
+      'table'    => false,
+      'instance' => 'amavis.inMsgs',
+      'values'   => ['AMAVIS-MIB::inMsgs.0'],
     },
   },
   hosts => {
     scan04 => {
-      'Address'   => '127.0.0.1',
-      'Version'   => 2,
-      'Community' => 'public',
-      'Collect'   => ['amavis_incoming_messages'],
-      'Interval'  => 10,
+      'address'   => '127.0.0.1',
+      'version'   => 2,
+      'community' => 'public',
+      'collect'   => ['amavis_incoming_messages'],
+      'interval'  => 10,
     },
   },
 }

diff --git a/spec/classes/collectd_plugin_snmp_spec.rb b/spec/classes/collectd_plugin_snmp_spec.rb
@@ -19,19 +19,19 @@
       {
         data: {
           'amavis_incoming_messages' => {
-            'Type'     => 'counter',
-            'Table'    => false,
-            'Instance' => 'amavis.inMsgs',
-            'Values'   => ['AMAVIS-MIB::inMsgs.0']
+            'type'     => 'counter',
+            'table'    => false,
+            'instance' => 'amavis.inMsgs',
+            'values'   => ['AMAVIS-MIB::inMsgs.0']
           }
         },
         hosts: {
           'scan04' => {
-            'Address'   => '127.0.0.1',
-            'Version'   => 2,
-            'Community' => 'public',
-            'Collect'   => ['amavis_incoming_messages'],
-            'Interval'  => 10
+            'address'   => '127.0.0.1',
+            'version'   => 2,
+            'community' => 'public',
+            'collect'   => ['amavis_incoming_messages'],
+            'interval'  => 10
           }
         }
       }
@@ -49,19 +49,19 @@
         ensure: 'absent',
         data: {
           'amavis_incoming_messages' => {
-            'Type'     => 'counter',
-            'Table'    => false,
-            'Instance' => 'amavis.inMsgs',
-            'Values'   => ['AMAVIS-MIB::inMsgs.0']
+            'type'     => 'counter',
+            'table'    => false,
+            'instance' => 'amavis.inMsgs',
+            'values'   => ['AMAVIS-MIB::inMsgs.0']
           }
         },
         hosts: {
           'scan04' => {
-            'Address'   => '127.0.0.1',
-            'Version'   => 2,
-            'Community' => 'public',
-            'Collect'   => ['amavis_incoming_messages'],
-            'Interval'  => 10
+            'address'   => '127.0.0.1',
+            'version'   => 2,
+            'community' => 'public',
+            'collect'   => ['amavis_incoming_messages'],
+            'interval'  => 10
           }
         }
       }

diff --git a/templates/plugin/snmp.conf.erb b/templates/plugin/snmp.conf.erb
@@ -2,39 +2,39 @@
 <Plugin snmp>
 <% @data.sort_by {|k,v| k}.each do |key,val| -%>
   <Data "<%=key %>">
-    Type "<%= val['Type'] %>"
-<% if val['Table'] -%>
-    Table <%= val['Table'] %>
+    Type "<%= val['type'] %>"
+<% if val['table'] -%>
+    Table <%= val['table'] %>
 <% end -%>
-<% if val['Instance'] -%>
-    Instance "<%= val['Instance'] %>"
+<% if val['instance'] -%>
+    Instance "<%= val['instance'] %>"
 <% end -%>
-<% if val['InstancePrefix'] -%>
-    InstancePrefix "<%= val['InstancePrefix'] %>"
+<% if val['instance_prefix'] -%>
+    InstancePrefix "<%= val['instance_prefix'] %>"
 <% end -%>
-    Values <% Array(val['Values']).each do |x| -%>"<%= x %>" <% end %>
-<% if val['Scale'] -%>
-    Scale <%= val['Scale'] %>
+    Values <% Array(val['values']).each do |x| -%>"<%= x %>" <% end %>
+<% if val['scale'] -%>
+    Scale <%= val['scale'] %>
 <% end -%>
-<% if val['Shift'] -%>
-    Shift <%= val['Shift'] %>
+<% if val['shift'] -%>
+    Shift <%= val['shift'] %>
 <% end -%>
-<% if val['Ignore'] -%>
-    Ignore <% Array(val['Ignore']).each do |x| -%>"<%= x %>" <% end %>
+<% if val['ignore'] -%>
+    Ignore <% Array(val['ignore']).each do |x| -%>"<%= x %>" <% end %>
 <% end -%>
-<% if val['InvertMatch'] -%>
-    InvertMatch <%= val['InvertMatch'] %>
+<% if val['invert_match'] -%>
+    InvertMatch <%= val['invert_match'] %>
 <% end -%>
   </Data>
 
 <% end -%>
 <% @hosts.sort_by {|k,v| k}.each do |key,val| -%>
   <Host "<%=key %>">
-    Address "<%= val['Address'] %>"
-    Version <%= val['Version'] %>
-    Community "<%= val['Community'] %>"
-    Collect <% Array(val['Collect']).sort.each do |x| -%>"<%= x -%>" <% end %>
-    Interval <%= val['Interval'] %>
+    Address "<%= val['address'] %>"
+    Version <%= val['version'] %>
+    Community "<%= val['community'] %>"
+    Collect <% Array(val['collect']).sort.each do |x| -%>"<%= x -%>" <% end %>
+    Interval <%= val['interval'] %>
   </Host>
 <% end -%>
 </Plugin>