Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 6.1.1 #87

Merged
merged 6 commits into from
Jan 23, 2025
Merged

Release 6.1.1 #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc111d6
remove splittraffic_check
nilsver Nov 29, 2024
a0a9c77
check should be reversed
nilsver Dec 3, 2024
46dfb87
undo previous change
nilsver Dec 26, 2024
7d9552c
Merge branch 'master' of github.com:redBorder/cookbook-logstash into …
jsotofernandez Jan 22, 2025
3e38819
Merge pull request #78 from redBorder/bugfix/19477_wrong_sensor_name_…
jsotofernandez Jan 23, 2025
2914a0f
Release 6.1.1
jsotofernandez Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/metadata.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
6 changes: 3 additions & 3 deletions resources/templates/default/sflow_enrichment.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" %>
Expand All @@ -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 %>
Expand Down
Loading