From ae88eb58a992fc9a5bdcfe6e3c7a83e3c2cc7062 Mon Sep 17 00:00:00 2001 From: nilsver Date: Wed, 8 May 2024 14:11:39 +0100 Subject: [PATCH 1/5] fix_logstash_crash --- resources/libraries/get_pipelines.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/libraries/get_pipelines.rb b/resources/libraries/get_pipelines.rb index f078c5d3..c84920d6 100644 --- a/resources/libraries/get_pipelines.rb +++ b/resources/libraries/get_pipelines.rb @@ -23,6 +23,7 @@ def get_pipelines() logstash_pipelines.push("redfish-pipeline") unless sensors["device-sensor"].empty? logstash_pipelines.push("bulkstats-pipeline") unless sensors["device-sensor"].empty? end + logstash_pipelines end # The main logstash is a node where both memcached and logstash are running or the first logstash node (order by name). From 7a399445b6e523e66760499a896f50165467b4c6 Mon Sep 17 00:00:00 2001 From: nilsver Date: Wed, 8 May 2024 14:53:05 +0100 Subject: [PATCH 2/5] Release 1.7.8 --- CHANGELOG.md | 6 ++++++ resources/metadata.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c09bc4f5..f0e6ab9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ cookbook-rb-manager CHANGELOG =============== +## 1.7.8 + + - nilsver + - [dcd6695] Merge pull request #130 from redBorder/bugfix/#17049_logstash_pipeline_crash_fix + - [ae88eb5] fix_logstash_crash + ## 1.7.7 - nilsver diff --git a/resources/metadata.rb b/resources/metadata.rb index 705ed75e..5ee4375d 100644 --- 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.7' +version '1.7.8' depends 'chef-server' depends 'zookeeper' From b4b78b345362693d1821de8c77dd52d15bf53263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Wed, 8 May 2024 14:54:40 +0100 Subject: [PATCH 3/5] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0e6ab9c..8757eda7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,6 @@ cookbook-rb-manager CHANGELOG ## 1.7.8 - nilsver - - [dcd6695] Merge pull request #130 from redBorder/bugfix/#17049_logstash_pipeline_crash_fix - [ae88eb5] fix_logstash_crash ## 1.7.7 From 7c0b5c4e6c06a5cc922589cfbb47d6d5f84be2e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Wed, 8 May 2024 22:17:58 +0100 Subject: [PATCH 4/5] Prevent logstash to be enabled when no pipelines are in the node (#132) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Miguel Negrón <45871721+manegron@users.noreply.github.com> --- resources/recipes/prepare_system.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb index 7619da6a..1a86c6f8 100644 --- a/resources/recipes/prepare_system.rb +++ b/resources/recipes/prepare_system.rb @@ -116,6 +116,12 @@ node.default["redborder"]["druid"]["realtime"]["partition_num"] = node["redborder"]["managers_per_services"]["druid-realtime"].index(node.name) end +if node["redborder"]["logstash"]["pipelines"].empty? and node["redborder"]["services"]["overwrite"].nil? + node.default["redborder"]["services"]["logstash"] = false +else + node.default["redborder"]["services"]["logstash"] = true +end + #get an array of managers managers_list = [] node["redborder"]["cluster_info"].each_key do |mgr| From 13246b85c99dc51c21a44d4f3d825444fcfc91df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Wed, 8 May 2024 23:37:41 +0100 Subject: [PATCH 5/5] Revert "Prevent logstash to be enabled when no pipelines are in the node (#132)" This reverts commit 7c0b5c4e6c06a5cc922589cfbb47d6d5f84be2e7. --- resources/recipes/prepare_system.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb index 1a86c6f8..7619da6a 100644 --- a/resources/recipes/prepare_system.rb +++ b/resources/recipes/prepare_system.rb @@ -116,12 +116,6 @@ node.default["redborder"]["druid"]["realtime"]["partition_num"] = node["redborder"]["managers_per_services"]["druid-realtime"].index(node.name) end -if node["redborder"]["logstash"]["pipelines"].empty? and node["redborder"]["services"]["overwrite"].nil? - node.default["redborder"]["services"]["logstash"] = false -else - node.default["redborder"]["services"]["logstash"] = true -end - #get an array of managers managers_list = [] node["redborder"]["cluster_info"].each_key do |mgr|