From 33c612695eb6319d9261a46fcb5f5e1f1462610f Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Tue, 5 Dec 2023 09:41:42 +0000 Subject: [PATCH 1/8] add internal services for sync network --- resources/recipes/configure.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 32ca6a21..880f0458 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -51,6 +51,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 @@ -101,30 +102,35 @@ 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]) @@ -132,12 +138,14 @@ 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 @@ -331,6 +339,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 From 98813d093dcec92ef36e1aaa2987d487a0ffc8d8 Mon Sep 17 00:00:00 2001 From: vimesa Date: Thu, 14 Dec 2023 12:59:40 +0000 Subject: [PATCH 2/8] Add kafka_hosts for http2k --- resources/recipes/configure.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 32ca6a21..cbae3999 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -231,6 +231,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"] From e416947af6959b225bd3304e50d0b7cd30db39b0 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Fri, 15 Dec 2023 14:02:58 +0000 Subject: [PATCH 3/8] Release 1.6.2 --- packaging/rpm/cookbook-rb-manager.spec | 2 ++ resources/metadata.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/rpm/cookbook-rb-manager.spec b/packaging/rpm/cookbook-rb-manager.spec index 7978ffa5..1d979bc5 100644 --- a/packaging/rpm/cookbook-rb-manager.spec +++ b/packaging/rpm/cookbook-rb-manager.spec @@ -45,6 +45,8 @@ esac %doc %changelog +* Fri Dec 15 2023 David Vanhoucke - 1.6.2-1 +- Add sync ip support for zookeeper, druid, memcached and postgresql * Fri Dec 01 2023 Miguel Negrón - 1.6.1-1 - Add sync ip support * Fri Dec 01 2023 David Vanhoucke - 1.6.0-1 diff --git a/resources/metadata.rb b/resources/metadata.rb index b63d1bf0..f2472ad6 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.6.1' +version '1.6.2' depends 'chef-server' depends 'zookeeper' From d7dc10ba3fc0ecc0cb300aae7c635160eb4397f8 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Mon, 18 Dec 2023 11:12:15 +0000 Subject: [PATCH 4/8] Release 1.6.3 --- packaging/rpm/cookbook-rb-manager.spec | 2 ++ resources/metadata.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/rpm/cookbook-rb-manager.spec b/packaging/rpm/cookbook-rb-manager.spec index 1d979bc5..b4c5da55 100644 --- a/packaging/rpm/cookbook-rb-manager.spec +++ b/packaging/rpm/cookbook-rb-manager.spec @@ -45,6 +45,8 @@ esac %doc %changelog +* Mon Dec 18 2023 Vicente Mesa - 1.6.3-1 +- Fix kafka configuration on http2k service * Fri Dec 15 2023 David Vanhoucke - 1.6.2-1 - Add sync ip support for zookeeper, druid, memcached and postgresql * Fri Dec 01 2023 Miguel Negrón - 1.6.1-1 diff --git a/resources/metadata.rb b/resources/metadata.rb index f2472ad6..c35c3717 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.6.2' +version '1.6.3' depends 'chef-server' depends 'zookeeper' From 6ee22ad7776b475541e502196dc1872ad75cdc68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20=C3=81lvarez?= <128592227+malvads@users.noreply.github.com> Date: Mon, 18 Dec 2023 14:04:11 +0000 Subject: [PATCH 5/8] Add logstatter in cgroup and systemd & configure service for chef (#96) * Add rblogsatter cookbook and service * Add rb-logstatter to systemd services --------- Co-authored-by: Miguel Negron --- resources/attributes/default.rb | 3 +++ resources/metadata.rb | 1 + resources/recipes/configure.rb | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/resources/attributes/default.rb b/resources/attributes/default.rb index e03d2f3c..29083853 100644 --- a/resources/attributes/default.rb +++ b/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"] diff --git a/resources/metadata.rb b/resources/metadata.rb index c35c3717..5f1aea2e 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -40,3 +40,4 @@ depends 'rb-selinux' #depends 'rbaioutliers' depends 'rbcgroup' +depends 'rblogstatter' diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 454a197c..6d7e3cc3 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -314,6 +314,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]) From 58e68225eb7121bded886fec32cb1c5173cbd515 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Mon, 18 Dec 2023 14:05:38 +0000 Subject: [PATCH 6/8] Release 1.6.4 --- packaging/rpm/cookbook-rb-manager.spec | 2 ++ resources/metadata.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/rpm/cookbook-rb-manager.spec b/packaging/rpm/cookbook-rb-manager.spec index b4c5da55..f0b32842 100644 --- a/packaging/rpm/cookbook-rb-manager.spec +++ b/packaging/rpm/cookbook-rb-manager.spec @@ -45,6 +45,8 @@ esac %doc %changelog +* Mon Dec 18 2023 Miguel Álvarez - 1.6.4-1 +- Add rb-logstatter * Mon Dec 18 2023 Vicente Mesa - 1.6.3-1 - Fix kafka configuration on http2k service * Fri Dec 15 2023 David Vanhoucke - 1.6.2-1 diff --git a/resources/metadata.rb b/resources/metadata.rb index 5f1aea2e..b16b462b 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.6.3' +version '1.6.4' depends 'chef-server' depends 'zookeeper' From 281323d9111d6261cef050a7723294e91049f277 Mon Sep 17 00:00:00 2001 From: nilsver Date: Thu, 21 Dec 2023 09:11:06 +0000 Subject: [PATCH 7/8] added kafka hosts configuration to pmacct --- resources/recipes/configure.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 6d7e3cc3..ebd271e9 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -264,6 +264,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 From d6c487f0546bbd1b73740aaf8b446da8b2dab4f1 Mon Sep 17 00:00:00 2001 From: Miguel Negron Date: Thu, 21 Dec 2023 15:32:14 +0000 Subject: [PATCH 8/8] Release 1.6.5 --- packaging/rpm/cookbook-rb-manager.spec | 2 ++ resources/metadata.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/packaging/rpm/cookbook-rb-manager.spec b/packaging/rpm/cookbook-rb-manager.spec index f0b32842..bb5e6b81 100644 --- a/packaging/rpm/cookbook-rb-manager.spec +++ b/packaging/rpm/cookbook-rb-manager.spec @@ -45,6 +45,8 @@ esac %doc %changelog +* Thu Dec 21 2023 Nils Verschaeve - 1.6.5-1 +- Pass correct kafka brokers to pmacctd * Mon Dec 18 2023 Miguel Álvarez - 1.6.4-1 - Add rb-logstatter * Mon Dec 18 2023 Vicente Mesa - 1.6.3-1 diff --git a/resources/metadata.rb b/resources/metadata.rb index b16b462b..02613416 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.6.4' +version '1.6.5' depends 'chef-server' depends 'zookeeper'