Merge pull request #137 from redBorder/development

redBorder · May 16, 2024 · 3ffc137 · 3ffc137
2 parents 2ed6621 + 70dd4ac
commit 3ffc137
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 1.7.10
+
+  - nilsver
+    - [f66e148] added conditional check on pipelines
+
 ## 1.7.9
 
   - Miguel Álvarez

diff --git a/resources/metadata.rb b/resources/metadata.rb
@@ -4,7 +4,7 @@
 license          'All rights reserved'
 description      'Installs/Configures redborder manager'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '1.7.9'
+version          '1.7.10'
 
 depends 'chef-server'
 depends 'zookeeper'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -275,15 +275,21 @@
   action (manager_services["pmacct"] ? [:add, :register] : [:remove, :deregister])
 end
 
-logstash_config "Configure logstash" do
-  cdomain node["redborder"]["cdomain"]
-  flow_nodes node["redborder"]["all_flow_sensors_info"]["flow-sensor"]
-  namespaces node["redborder"]["namespaces"]
-  vault_nodes node["redborder"]["sensors_info_all"]["vault-sensor"]
-  scanner_nodes node["redborder"]["sensors_info_all"]["scanner-sensor"]
-  device_nodes node["redborder"]["sensors_info_all"]["device-sensor"]
-  logstash_pipelines node["redborder"]["logstash"]["pipelines"]
-  action (manager_services["logstash"] ? [:add, :register] : [:remove, :deregister])
+if node["redborder"]["logstash"]["pipelines"].nil? || node["redborder"]["logstash"]["pipelines"].empty?
+  service 'logstash' do
+    action [:disable, :stop]
+  end
+else
+  logstash_config "Configure logstash" do
+    cdomain node["redborder"]["cdomain"]
+    flow_nodes node["redborder"]["all_flow_sensors_info"]["flow-sensor"]
+    namespaces node["redborder"]["namespaces"]
+    vault_nodes node["redborder"]["sensors_info_all"]["vault-sensor"]
+    scanner_nodes node["redborder"]["sensors_info_all"]["scanner-sensor"]
+    device_nodes node["redborder"]["sensors_info_all"]["device-sensor"]
+    logstash_pipelines node["redborder"]["logstash"]["pipelines"]
+    action (manager_services["logstash"] ? [:add, :register] : [:remove, :deregister])
+  end
 end
 
 rbdswatcher_config "Configure redborder-dswatcher" do