Merge pull request #48 from redBorder/development

Release 0.6.0
redBorder · Sep 30, 2024 · cf7ff22 · cf7ff22
2 parents 1effbed + 630cc1d
commit cf7ff22
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git 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
@@ -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'

diff --git a/resources/recipes/configure.rb b/resources/recipes/configure.rb
@@ -7,6 +7,13 @@
 
 proxy_services = proxy_services()
 
+begin
+  split_traffic_logstash_db = data_bag_item('rBglobal', 'splittraffic')
+  split_traffic_logstash = split_traffic_logstash_db['logstash']
+rescue
+  split_traffic_logstash = false
+end
+
 rb_common_config 'Configure common' do
   action :configure
 end
@@ -144,6 +151,7 @@
 
 rb_exporter_config 'Configure rb-exporter' do
   if proxy_services['redborder-exporter']
+    split_traffic_logstash split_traffic_logstash
     action [:add]
   else
     action [:remove]