Merge remote-tracking branch 'origin/master' into bugfix/17853_minio_…

…cannot_stop

CHANGELOG.md

@@ -1,16 +1,31 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 2.2.2
+
+  - Miguel Negrón
+    - [10b3f6e] Update get_pipelines.rb
+  - nilsver
+    - [d3e9e40] fix linter
+    - [9fd823c] fix bug mobility pipelines nil
+    - [a97909b] add arubacentral-sensor
+  - Miguel Negron
+    - [abe7d76] Release 2.2.1
+
+## 2.2.1
+
+  - nilsver
+    - [a97909b] add arubacentral-sensor
+
 ## 2.2.0
 
   - nilsver
-    - [c05abf5] [2a1bd7f] [040aeda] fix linter
     - [0186ecc] add pipeline per monitor configuration
     - [b5d56c5] fix check if pipelines are active
     - [e557b19] add helper file
     - [64b9adc] monitor pipelines work with proxy too
   - Miguel Alvarez
-    - [c5d590d] Fix lint issues
+    - [86e6e36] Add memcached hosts to the webui
     - [2be5b59] Fix configure clamscan
     - [2e0b86b] Add clamav
 

resources/libraries/get_pipelines.rb

@@ -19,8 +19,15 @@ def get_pipelines
       logstash_pipelines.push('sflow-pipeline') unless sensors['flow-sensor'].empty?
       logstash_pipelines.push('meraki-pipeline') unless sensors['meraki-sensor'].empty?
       logstash_pipelines.push('monitor-pipeline') unless namespaces.empty?
-      logstash_pipelines.push('location-pipeline') unless sensors['ale-sensor'].empty? && sensors['mse-sensor'].empty? && sensors['flow-sensor'].empty? && sensors['arubacentral-sensor'].empty?
-      logstash_pipelines.push('mobility-pipeline') unless sensors['ale-sensor'].empty? && sensors['mse-sensor'].empty? && sensors['flow-sensor'].empty? && sensors['arubacentral-sensor'].empty?
+
+      if (sensors['ale-sensor'] && !sensors['ale-sensor'].empty?) ||
+         (sensors['mse-sensor'] && !sensors['mse-sensor'].empty?) ||
+         (sensors['flow-sensor'] && !sensors['flow-sensor'].empty?) ||
+         (sensors['arubacentral-sensor'] && !sensors['arubacentral-sensor'].empty?)
+        logstash_pipelines.push('location-pipeline')
+        logstash_pipelines.push('mobility-pipeline')
+      end
+
       if (has_device_sensors && monitor_config.include?('thermal')) || !monitor_sensor_in_proxy_nodes.empty?
         logstash_pipelines.push('redfish-pipeline')
       end

resources/libraries/get_sensors_info.rb

@@ -3,7 +3,7 @@ module Helpers
     def get_sensors_info
       sensors_info = {}
       sensor_types = %w(vault-sensor flow-sensor mse-sensor scanner-sensor meraki-sensor ale-sensor device-sensor
-                        cisco-cloudproxy proxy-sensor
+                        cisco-cloudproxy proxy-sensor arubacentral-sensor
                         ips-sensor ipsv2-sensor ipscp-sensor ipsg-sensor)
       locations = node['redborder']['locations']
       sensor_types.each do |s_type|

resources/metadata.rb

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

resources/recipes/configure.rb

@@ -325,6 +325,7 @@
 
 webui_config 'Configure WebUI' do
   hostname node['hostname']
+  memcached_servers node['redborder']['managers_per_services']['memcached']
   memory_kb node['redborder']['memory_services']['webui']['memory']
   cdomain node['redborder']['cdomain']
   port node['redborder']['webui']['port']