Merge branch 'master' into feature/#22929_recover_yara_config

Author: pperezredborder

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-logstash CHANGELOG
 ===============
 
+## 8.5.2
+
+  - Miguel Negrón
+    - [f125648] In sflow pipeline tagging template remove the check of proxy "blocked" (#136)
+
 ## 8.5.1
 
   - Luis Blanco

resources/metadata.rb

@@ -3,4 +3,4 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures cookbook-logstash'
-version          '8.5.1'
+version          '8.5.2'

resources/templates/default/sflow_tagging.conf.erb

@@ -38,7 +38,7 @@ filter {
   <% if @split_traffic_logstash %>
   if [tag2] {
     <% @proxy_nodes.each do |proxy_node| %>
-      <% if !proxy_node["redborder"].nil? and proxy_node["redborder"]["blocked"]!=true %>
+      <% if !proxy_node["redborder"].nil? %>
       if [peer_ip_src] == "<%=proxy_node[:ipaddress]%>" {
         ruby {
           code => "