Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into bugfix/17853_minio_…
Browse files Browse the repository at this point in the history
…cannot_stop
  • Loading branch information
ljblancoredborder committed Jul 3, 2024
2 parents 4f013bc + 1d069c0 commit adf0025
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cookbook-rb-manager CHANGELOG
===============

## 2.3.0

- Rafael Gomez
- [db4f4be] Feature/#17820 add intrusion pipeline

## 2.2.2

- Miguel Negrón
Expand Down
1 change: 1 addition & 0 deletions resources/libraries/get_pipelines.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ def get_pipelines
logstash_pipelines.push('sflow-pipeline') unless sensors['flow-sensor'].empty?
logstash_pipelines.push('meraki-pipeline') unless sensors['meraki-sensor'].empty?
logstash_pipelines.push('monitor-pipeline') unless namespaces.empty?
logstash_pipelines.push('intrusion-pipeline') unless sensors['ips-sensor'].empty? && sensors['ipsv2-sensor'].empty? && sensors['ipscp-sensor'].empty? && sensors['ipsg-sensor'].empty?

if (sensors['ale-sensor'] && !sensors['ale-sensor'].empty?) ||
(sensors['mse-sensor'] && !sensors['mse-sensor'].empty?) ||
Expand Down
2 changes: 1 addition & 1 deletion resources/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
maintainer_email '[email protected]'
license 'AGPL-3.0'
description 'Installs/Configures redborder manager'
version '2.2.2'
version '2.3.0'

depends 'rb-common'
depends 'chef-server'
Expand Down

0 comments on commit adf0025

Please sign in to comment.