Merge branch 'master' into improvement/#15954_configure_journalctl

packaging/rpm/cookbook-rb-manager.spec

@@ -45,6 +45,14 @@ esac
 %doc
 
 %changelog
+* Thu Dec 21 2023 Nils Verschaeve <[email protected]> - 1.6.5-1
+- Pass correct kafka brokers to pmacctd
+* Mon Dec 18 2023 Miguel Álvarez <[email protected]> - 1.6.4-1
+- Add rb-logstatter
+* Mon Dec 18 2023 Vicente Mesa <[email protected]> - 1.6.3-1
+- Fix kafka configuration on http2k service
+* Fri Dec 15 2023 David Vanhoucke <[email protected]> - 1.6.2-1
+- Add sync ip support for zookeeper, druid, memcached and postgresql
 * Fri Dec 01 2023 Miguel Negrón <[email protected]> - 1.6.1-1
 - Add sync ip support
 * Fri Dec 01 2023 David Vanhoucke <[email protected]> - 1.6.0-1

resources/attributes/default.rb

@@ -84,6 +84,7 @@
 default["redborder"]["memory_services"]["hadoop-resourcemanager"] = {"count" => 10, "memory" => 0}
 default["redborder"]["memory_services"]["snmp"] = {"count" => 5, "memory" => 0, "max_limit" => 10000 }
 default["redborder"]["memory_services"]["redborder-monitor"] = {"count" => 5, "memory" => 0, "max_limit" => 20000 }
+default["redborder"]["memory_services"]["rb-logstatter"] = {"count" => 5, "memory" => 0, "max_limit" => 20000 }
 default["redborder"]["memory_services"]["webui"] = {"count" => 40, "memory" => 0 }
 default["redborder"]["memory_services"]["f2k"] = { "count" => 40, "memory" => 0 }
 default["redborder"]["memory_services"]["redborder-nmsp"] = {"count" => 10, "memory" => 0 }
@@ -146,6 +147,7 @@
 default["redborder"]["services"]["nginx"]                     = false
 default["redborder"]["services"]["redborder-cep"]             = false
 default["redborder"]["services"]["rb-aioutliers"]             = false
+default["redborder"]["services"]["rb-logstatter"]             = true
 default["redborder"]["services"]["memcached"]                 = true
 default["redborder"]["services"]["rb-monitor"]                = false
 default["redborder"]["services"]["secor"]                     = false
@@ -183,6 +185,7 @@
 default["redborder"]["systemdservices"]["nginx"]                  = ["nginx"]
 default["redborder"]["systemdservices"]["redborder-cep"]          = ["redborder-cep"]
 default["redborder"]["systemdservices"]["rb-aioutliers"]          = ["rb-aioutliers"]
+default["redborder"]["systemdservices"]["rb-logstatter"]          = ["rb-logstatter"]
 default["redborder"]["systemdservices"]["memcached"]              = ["memcached"]
 default["redborder"]["systemdservices"]["s3"]                     = ["minio"]
 default["redborder"]["systemdservices"]["mongodb"]                = ["mongod"]

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.6.1'
+version          '1.6.5'
 
 depends 'chef-server'
 depends 'zookeeper'
@@ -40,3 +40,4 @@
 depends 'rb-selinux'
 #depends 'rbaioutliers'
 depends 'rbcgroup'
+depends 'rblogstatter'

resources/recipes/configure.rb

@@ -49,6 +49,7 @@
   port node["zookeeper"]["port"]
   memory node["redborder"]["memory_services"]["zookeeper"]["memory"]
   hosts node["redborder"]["managers_per_services"]["zookeeper"]
+  ipaddress node["ipaddress_sync"]
   action (manager_services["zookeeper"] ? [:add, :register] : [:remove, :deregister])
 end
 
@@ -99,43 +100,50 @@
 
 druid_coordinator "Configure Druid Coordinator" do
   name node["hostname"]
+  ipaddress node["ipaddress_sync"]
   memory_kb node["redborder"]["memory_services"]["druid-coordinator"]["memory"]
   action (manager_services["druid-coordinator"] ? [:add, :register] : [:remove, :deregister])
 end
 
 druid_overlord "Configure Druid Overlord" do
   name node["hostname"]
+  ipaddress node["ipaddress_sync"]
   memory_kb node["redborder"]["memory_services"]["druid-overlord"]["memory"]
   action (manager_services["druid-overlord"] ? [:add, :register] : [:remove, :deregister])
 end
 
 druid_broker "Configure Druid Broker" do
   name node["hostname"]
+  ipaddress node["ipaddress_sync"]
   memory_kb node["redborder"]["memory_services"]["druid-broker"]["memory"]
   action (manager_services["druid-broker"] ? [:add, :register] : [:remove, :deregister])
 end
 
 druid_middlemanager "Configure Druid MiddleManager" do
   name node["hostname"]
+  ipaddress node["ipaddress_sync"]
   memory_kb node["redborder"]["memory_services"]["druid-middlemanager"]["memory"]
   action (manager_services["druid-middlemanager"] ? [:add, :register] : [:remove, :deregister])
 end
 
 druid_historical "Configure Druid Historical" do
   name node["hostname"]
+  ipaddress node["ipaddress_sync"]
   memory_kb node["redborder"]["memory_services"]["druid-historical"]["memory"]
   tier node["redborder"]["druid"]["historical"]["tier"]
   action (manager_services["druid-historical"] ? [:add, :register] : [:remove, :deregister])
 end
 
 druid_realtime "Configure Druid Realtime" do
   name node["hostname"]
+  ipaddress node["ipaddress_sync"]
   memory_kb node["redborder"]["memory_services"]["druid-realtime"]["memory"]
   action (manager_services["druid-realtime"] ? [:add, :register] : [:remove, :deregister])
 end
 
 memcached_config "Configure Memcached" do
   memory node["redborder"]["memory_services"]["memcached"]["memory"]
+  ipaddress node["ipaddress_sync"]
   action (manager_services["memcached"] ? [:add, :register] : [:remove, :deregister])
 end
 
@@ -229,6 +237,7 @@
 
 http2k_config "Configure Http2k" do
   domain node["redborder"]["cdomain"]
+  kafka_hosts node["redborder"]["managers_per_services"]["kafka"]
   memory node["redborder"]["memory_services"]["http2k"]["memory"]
   port node["redborder"]["http2k"]["port"]
   proxy_nodes node["redborder"]["sensors_info"]["proxy-sensor"]
@@ -253,6 +262,7 @@
 
 pmacct_config "Configure pmacct" do
   sensors node["redborder"]["sensors_info"]["flow-sensor"]
+  kafka_hosts node["redborder"]["managers_per_services"]["kafka"]
   action (manager_services["pmacct"] ? [:add, :register] : [:remove, :deregister])
 end
 
@@ -303,6 +313,10 @@
   action (node["redborder"]["services"]["redborder-ale"] ? [:add, :register] : [:remove, :deregister])
 end
 
+rblogstatter_config "Configure redborder-logstatter" do
+  action (node["redborder"]["services"]["rb-logstatter"] ? :add : :remove)
+end
+
 #freeradius_config "Configure radiusd" do
 #  flow_nodes node["redborder"]["sensors_info_all"]["flow-sensor"]
 #  action (node["redborder"]["services"]["radiusd"] ? [:config_common, :config_manager, :register] : [:remove, :deregister])
@@ -329,6 +343,7 @@
 
 postgresql_config "Configure postgresql" do
   cdomain node["redborder"]["cdomain"]
+  ipaddress node["ipaddress_sync"]
   action (manager_services["postgresql"] and external_services["postgresql"] == "onpremise" ? [:add, :register] : [:remove, :deregister])
 end