From a686df03d0502280ecaafd86a401ab03dffec444 Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Mon, 23 Sep 2024 13:15:32 +0100 Subject: [PATCH 1/4] add method to activate the split of the traffic through logstash --- resources/recipes/configure.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 5c2bbc8..2de1918 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -7,6 +7,14 @@ proxy_services = proxy_services() +begin + split_traffic_logstash_db = data_bag_item('rBglobal', 'splittraffic') + split_traffic_logstash = split_traffic_logstash_db['active'] +rescue + split_traffic_logstash = false +end + + rb_common_config 'Configure common' do action :configure end @@ -144,6 +152,7 @@ rb_exporter_config 'Configure rb-exporter' do if proxy_services['redborder-exporter'] + split_traffic_logstash split_traffic_logstash action [:add] else action [:remove] From 964e8d03aada26944241968235d57d017e110c17 Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Mon, 23 Sep 2024 13:50:28 +0100 Subject: [PATCH 2/4] remove blank line --- resources/recipes/configure.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb index 2de1918..d031848 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -14,7 +14,6 @@ split_traffic_logstash = false end - rb_common_config 'Configure common' do action :configure end From 7dadc5ed50fb9ec08c6ec037b00f9bcbeca1c387 Mon Sep 17 00:00:00 2001 From: David Vanhoucke Date: Thu, 26 Sep 2024 10:47:34 +0100 Subject: [PATCH 3/4] use descrfptive name --- 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 d031848..444bbae 100644 --- a/resources/recipes/configure.rb +++ b/resources/recipes/configure.rb @@ -9,7 +9,7 @@ begin split_traffic_logstash_db = data_bag_item('rBglobal', 'splittraffic') - split_traffic_logstash = split_traffic_logstash_db['active'] + split_traffic_logstash = split_traffic_logstash_db['logstash'] rescue split_traffic_logstash = false end From 630cc1d155ee63ddc94129501ea196c0cef779ed Mon Sep 17 00:00:00 2001 From: JuanSheba Date: Mon, 30 Sep 2024 09:23:35 +0100 Subject: [PATCH 4/4] Release 0.6.0 --- CHANGELOG.md | 7 +++++++ resources/metadata.rb | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4302c4..67265ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ cookbook-rb-proxy CHANGELOG =============== +## 0.6.0 + + - David Vanhoucke + - [7dadc5e] use descrfptive name + - [964e8d0] remove blank line + - [a686df0] add method to activate the split of the traffic through logstash + ## 0.5.1 - Daniel Castro diff --git a/resources/metadata.rb b/resources/metadata.rb index 28d7dc6..986e4d6 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -3,7 +3,7 @@ maintainer_email 'git@redborder.com' license 'AGPL-3.0' description 'Installs/Configures redborder proxy' -version '0.5.1' +version '0.6.0' depends 'rb-common' depends 'rb-selinux'