diff --git a/CHANGELOG.md b/CHANGELOG.md index 374a7e4..ce1eb6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ cookbook-logstash CHANGELOG =============== +## 6.1.1 + + - nilsver + - [a0a9c77] check should be reversed + - [bc111d6] remove splittraffic_check + ## 6.1.0 - David Vanhoucke diff --git a/resources/metadata.rb b/resources/metadata.rb index 27da227..799ed84 100644 --- a/resources/metadata.rb +++ b/resources/metadata.rb @@ -3,4 +3,4 @@ maintainer_email 'git@redborder.com' license 'AGPL-3.0' description 'Installs/Configures cookbook-logstash' -version '6.1.0' +version '6.1.1' diff --git a/resources/templates/default/sflow_enrichment.conf.erb b/resources/templates/default/sflow_enrichment.conf.erb index 45a1cc0..e0a625f 100644 --- a/resources/templates/default/sflow_enrichment.conf.erb +++ b/resources/templates/default/sflow_enrichment.conf.erb @@ -1,7 +1,7 @@ filter { <% @flow_nodes.each do |flow_node| %> <% if !flow_node[:ipaddress].nil? and !flow_node["redborder"].nil? and flow_node["redborder"]["blocked"]!=true %> - <% if @split_traffic_logstash %> + <% unless @split_traffic_logstash %> if [sensor_ip] == "<%=flow_node[:ipaddress].to_s%>" { <% end %> <% @observation_id = (flow_node["redborder"]["observation_id"] and !flow_node["redborder"]["observation_id"].empty?) ? flow_node["redborder"]["observation_id"] : "default" %> @@ -19,8 +19,8 @@ filter { } } } - <% if @split_traffic_logstash %> - } # if [sensor_ip] == "<%=flow_node[:ipaddress].to_s%>" + <% unless @split_traffic_logstash %> + } # unless [sensor_ip] == "<%=flow_node[:ipaddress].to_s%>" <% end %> <% end %> <% end %>