From 17142d4ea8292524f84de34f0d1940c8000e6c9c Mon Sep 17 00:00:00 2001 From: malvads Date: Sun, 28 Apr 2024 18:19:23 +0100 Subject: [PATCH 1/5] Use zookeeper.service instead of hardcoded localhost --- resources/recipes/configure.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 7f118d36..2716bb3f 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -136,6 +136,7 @@ druid_realtime "Configure Druid Realtime" do name node["hostname"] ipaddress node["ipaddress_sync"] + zookeeper_hosts node["redborder"]["zookeeper"]["zk_hosts"] memory_kb node["redborder"]["memory_services"]["druid-realtime"]["memory"] action (manager_services["druid-realtime"] ? [:add, :register] : [:remove, :deregister]) end From 10301b648fd8e8f3f11ce0012d42069013a794d2 Mon Sep 17 00:00:00 2001 From: malvads Date: Tue, 30 Apr 2024 00:29:15 +0100 Subject: [PATCH 2/5] Add parition id for druid realtime --- resources/recipes/configure.rb | 1 + resources/recipes/prepare_system.rb | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 7f118d36..0cdeb50d 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -136,6 +136,7 @@ druid_realtime "Configure Druid Realtime" do name node["hostname"] ipaddress node["ipaddress_sync"] + partition_num node["redborder"]["druid_realtime"]["partition_num"] memory_kb node["redborder"]["memory_services"]["druid-realtime"]["memory"] action (manager_services["druid-realtime"] ? [:add, :register] : [:remove, :deregister]) end diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb index a9b9d2d7..1c0affb3 100644 --- a/resources/recipes/prepare_system.rb +++ b/resources/recipes/prepare_system.rb @@ -107,6 +107,11 @@ node.default["redborder"]["kafka"]["host_index"] = node["redborder"]["managers_per_services"]["kafka"].index(node.name) end +#set druid realtime partition id (its needed in cluster mode for druid brokers) +if node["redborder"]["manager_per_services"]["druid_realtime"].include?(node.name) + node.default["redborder"]["druid_realtime"]["partition_num"] = node["redborder"]["manager_per_services"]["druid_realtime"].index(node.name) +end + #get an array of managers managers_list = [] node["redborder"]["cluster_info"].each_key do |mgr| From 7db2099384973eb022e0ef29c5da6e11deba979b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Tue, 30 Apr 2024 01:25:31 +0100 Subject: [PATCH 3/5] this line bigger than the bottom one makes me TOC --- resources/recipes/configure.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 4594857d..68d46547 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -136,8 +136,8 @@ druid_realtime "Configure Druid Realtime" do name node["hostname"] ipaddress node["ipaddress_sync"] - partition_num node["redborder"]["druid"]["realtime"]["partition_num"] zookeeper_hosts node["redborder"]["zookeeper"]["zk_hosts"] + partition_num node["redborder"]["druid"]["realtime"]["partition_num"] memory_kb node["redborder"]["memory_services"]["druid-realtime"]["memory"] action (manager_services["druid-realtime"] ? [:add, :register] : [:remove, :deregister]) end From 374d25d86fe25c03075970b0ef04e3d8fd3fff59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Tue, 30 Apr 2024 10:31:20 +0100 Subject: [PATCH 4/5] Fix typos --- resources/recipes/prepare_system.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/recipes/prepare_system.rb b/resources/recipes/prepare_system.rb index 05158dbc..b28f4802 100644 --- a/resources/recipes/prepare_system.rb +++ b/resources/recipes/prepare_system.rb @@ -108,8 +108,8 @@ end #set druid realtime partition id (its needed in cluster mode for druid brokers) -if node["redborder"]["manager_per_services"]["druid_realtime"].include?(node.name) - node.default["redborder"]["druid"]["realtime"]["partition_num"] = node["redborder"]["manager_per_services"]["druid_realtime"].index(node.name) +if node["redborder"]["managers_per_services"]["druid-realtime"].include?(node.name) + node.default["redborder"]["druid"]["realtime"]["partition_num"] = node["redborder"]["managers_per_services"]["druid-realtime"].index(node.name) end #get an array of managers From 4a23974dbd25177daad83dab00b4646d44524565 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Tue, 30 Apr 2024 15:13:54 +0100 Subject: [PATCH 5/5] Release 1.7.6 --- CHANGELOG.md | 6 ++++++ resources/metadata.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 77ca7d13..390cf090 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ cookbook-rb-manager CHANGELOG =============== +## 1.7.6 + + - Miguel Álvarez + - [10301b6] Add parition id for druid realtime + - [17142d4] Use zookeeper.service instead of hardcoded localhost + ## 1.7.5 - Miguel Negron diff --git a/resources/metadata.rb b/resources/metadata.rb index a387f8cb..40c3ca2c 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.5' +version '1.7.6' depends 'chef-server' depends 'zookeeper'