Merge pull request #127 from redBorder/development

Release 1.7.6

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

resources/attributes/default.rb

@@ -211,5 +211,7 @@
 default["redborder"]["druid"]["historical"]["tier"]     = "default"
 default["redborder"]["druid"]["historical"]["maxsize"]  = -1
 
+# Realtime
+default["redborder"]["druid"]["realtime"]["partition_num"] = 0
 
 default["redborder"]["pending_changes"]=0

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'

resources/recipes/configure.rb

@@ -136,6 +136,8 @@
 druid_realtime "Configure Druid Realtime" do
   name node["hostname"]
   ipaddress node["ipaddress_sync"]
+  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

resources/recipes/prepare_system.rb

@@ -108,6 +108,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"]["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
 managers_list = []
 node["redborder"]["cluster_info"].each_key do |mgr|