Merge pull request #167 from redBorder/development

Release 2.2.2

CHANGELOG.md

@@ -1,6 +1,17 @@
 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

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/metadata.rb

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