Merge pull request #87 from redBorder/development

Release 4.1.8

Author: rgomezborder

CHANGELOG.md

@@ -1,6 +1,14 @@
 cookbook-rb-proxy CHANGELOG
 ===============
 
+## 4.1.8
+
+  - ljblancoredborder
+    - [8abdcab] fix passing params to new resource for proxy to cookbook monitor
+    - [ec30d64] adaptation of get_nodes function, explaining current data strcuture
+    - [12766df] adding alternative funtion for monitor
+    - [6140d36] retrieving monitor categories from node info instead of role info
+
 ## 4.1.7
 
   - jnavarrorb

resources/libraries/get_nodes.rb

@@ -0,0 +1,12 @@
+module RbProxy
+  module Helpers
+    # Format of nodes differs from roles, in this case, we extract the info in node format
+    def get_nodes(sensor_types = ['flow-sensor'])
+      proxy_id = node['redborder']['sensor_id']
+      sensor_types.each_with_object({}) do |s_type, sensors_info|
+        sensors = search(:node, "role:#{s_type} AND redborder_parent_id:#{proxy_id}").sort
+        sensors_info[s_type] = sensors
+      end
+    end
+  end
+end

resources/metadata.rb

@@ -5,7 +5,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder proxy'
-version          '4.1.7'
+version          '4.1.8'
 
 depends 'rb-common'
 depends 'rb-selinux'

resources/recipes/configure.rb

@@ -80,7 +80,7 @@
 rbmonitor_config 'Configure redborder-monitor' do
   name node['hostname']
   device_nodes node.run_state['sensors_info_all']['device-sensor']
-  flow_nodes node.run_state['sensors_info_all']['flow-sensor']
+  proxy_flow_nodes node.run_state['proxy_flow_nodes']
   if proxy_services['redborder-monitor']
     action :add
   else

resources/recipes/prepare_system.rb

@@ -56,6 +56,9 @@
 # get flow sensors in proxy info
 node.run_state['sensors_info_all']['flow-sensor'] = get_flow_sensors_info('flow')
 
+# Custom node extration for monitor
+node.run_state['proxy_flow_nodes'] = get_nodes()['flow-sensor']
+
 # get namespaces
 node.run_state['namespaces'] = get_namespaces