Merge pull request #249 from redBorder/development

Release 4.4.6
redBorder · Nov 12, 2024 · 8745096 · 8745096
2 parents 4723b2f + 4127d34
commit 8745096
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 cookbook-rb-manager CHANGELOG
 ===============
 
+## 4.4.6
+
+  - Miguel Álvarez
+    - [7930ce6] Make same check for logstatter and logstash to configure
+
 ## 4.4.5
 
   - Daniel Castro

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.4.5'
+version          '4.4.6'
 
 depends 'rb-common'
 depends 'chef-server'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -500,7 +500,7 @@
 end
 
 rblogstatter_config 'Configure redborder-logstatter' do
-  if manager_services['rb-logstatter']
+  if manager_services['rb-logstatter'] && manager_services['logstash'] && node.run_state['pipelines'] && !node.run_state['pipelines'].empty?
     action :add
   else
     action :remove