Merge branch 'master' into feature/#18850_add_internal_virtual_ips

CHANGELOG.md

@@ -1,6 +1,24 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.4.4
+
+  - ptorresred
+    - [80dda4a] Redmine #19198: Change vault priority default filter
+
+## 4.4.3
+
+  - Juan Soto
+    - [da722bb] Create and pass split_intrusion variables to logstash config (#216)
+
+## 4.4.2
+
+  - jnavarrorb
+    - [72d2b00] Fix sensors info with all sensors (proxy childs too)
+    - [87628c7] Fix parent_id to real_parent_id
+    - [060f5d9] Fix open kafka port for all IPS
+    - [a9a3efe] check if redborder_parent_id is nil or sensor at redborder_parent_id is not a proxy
+
 ## 4.4.1
 
   - JuanSheba

resources/attributes/default.rb

@@ -222,4 +222,4 @@
 
 # Priority Filter
 default['redborder']['intrusion_incidents_priority_filter'] = 'high'
-default['redborder']['vault_incidents_priority_filter'] = 'high'
+default['redborder']['vault_incidents_priority_filter'] = 'error'

resources/libraries/get_sensors_all_info.rb

@@ -5,10 +5,13 @@ def get_sensors_all_info
       sensor_types = %w(ips-sensor ipsv2-sensor ipscp-sensor ipsg-sensor vault-sensor flow-sensor arubacentral-sensor mse-sensor meraki-sensor cisco-cloudproxy proxy-sensor scanner-sensor mse-sensor meraki-sensor ale-sensor cep-sensor device-sensor)
 
       sensor_types.each do |s_type|
-        sensors = search(:node, "role:#{s_type} AND -redborder_parent_id:*?").sort  # get sensor where parent_id is nil
+        sensors = search(:node, "role:#{s_type}").sort  # get all s_type's sensor
 
         sensors_info[s_type] = []
-        sensors.each { |s| sensors_info[s_type] << s }
+
+        sensors.each do |sensor|
+          sensors_info[s_type] << sensor
+        end
       end
 
       sensors_info

resources/libraries/get_sensors_info.rb

@@ -7,8 +7,8 @@ def get_sensors_info
                         ips-sensor ipsv2-sensor ipscp-sensor ipsg-sensor)
       locations = node['redborder']['locations']
       sensor_types.each do |s_type|
-        # get sensor where parent_id is nil
-        sensors = search(:node, "role:#{s_type} AND -redborder_parent_id:*?").sort
+        # get all s_type's sensor
+        sensors = search(:node, "role:#{s_type}").sort
         sensors_info[s_type] = {}
         sensors.each do |s|
           info = {}
@@ -27,6 +27,7 @@ def get_sensors_info
 
             info['locations'][loc] = s['redborder'][loc]
           end
+
           sensors_info[s_type][s.name] = info
         end
       end

resources/libraries/open_kafka_port.rb

@@ -2,7 +2,7 @@ module RbManager
   module Helpers
     def get_ip_of_manager_ips
       # IPS in manager mode has the role ips-sensor
-      sensors = search(:node, 'role:ips-sensor AND -redborder_parent_id:*?').sort
+      sensors = search(:node, 'role:ips-sensor').sort
       sensors.map { |s| { ipaddress: s['ipaddress'] } }
     end
 

resources/metadata.rb

@@ -5,7 +5,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder manager'
-version          '4.4.1'
+version          '4.4.4'
 
 depends 'rb-common'
 depends 'chef-server'

resources/recipes/configure.rb

@@ -401,6 +401,14 @@
   end
 end
 
+if manager_services['logstash']
+  begin
+    split_intrusion = data_bag_item('rBglobal', 'splitintrusion')['logstash']
+  rescue
+    split_intrusion = false
+  end
+end
+
 logstash_config 'Configure logstash' do
   if manager_services['logstash'] && node.run_state['pipelines'] && !node.run_state['pipelines'].empty?
     cdomain node['redborder']['cdomain']
@@ -414,6 +422,7 @@
     vault_incidents_priority_filter node['redborder']['vault_incidents_priority_filter']
     logstash_pipelines node.run_state['pipelines']
     split_traffic_logstash split_traffic
+    split_intrusion_logstash split_intrusion
     action [:add, :register]
   else
     action [:remove, :deregister]