Merge branch 'master' into feature/#18850_add_internal_virtual_ips

redBorder · Jan 2, 2025 · 42f58f0 · 42f58f0
2 parents 5bc008e + ea60d1d
commit 42f58f0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.7.1
+
+  - Miguel Negrón
+    - [7a34132] Fix lint
+
+## 4.7.0
+
+  - Miguel Negrón
+    - [bc1f5b4] Always enable vault pipeline for the alarms
+
 ## 4.6.4
 
   - Miguel Alvarez

diff --git a/resources/libraries/get_pipelines.rb b/resources/libraries/get_pipelines.rb
@@ -6,7 +6,6 @@ def get_pipelines
       namespaces = get_namespaces()
       main_logstash = determine_main_logstash_node()
       monitor_sensor_in_proxy_nodes = find_sensor_in_proxy_nodes('device')
-      vault_sensor_in_proxy_nodes = find_sensor_in_proxy_nodes('vault')
       flow_sensor_in_proxy_nodes = find_sensor_in_proxy_nodes('flow')
       monitor_config = get_monitor_configuration()
       has_device_sensors = !sensors['device-sensor'].nil? && !sensors['device-sensor'].empty?
@@ -30,7 +29,7 @@ def get_pipelines
         logstash_pipelines.push('mobility-pipeline')
       end
 
-      logstash_pipelines.push('vault-pipeline') unless vault_sensor_in_proxy_nodes.empty? && sensors['vault-sensor'].empty?
+      logstash_pipelines.push('vault-pipeline')
 
       if (has_device_sensors && monitor_config.include?('thermal')) || !monitor_sensor_in_proxy_nodes.empty?
         logstash_pipelines.push('redfish-pipeline')

diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -5,7 +5,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder manager'
-version          '4.6.4'
+version          '4.7.1'
 
 depends 'rb-common'
 depends 'chef-server'