mirror of
https://github.com/elastic/logstash.git
synced 2025-06-27 17:08:55 -04:00
Re-enable json filter and netflow codec plugins (#15722)
- Re-enabled logstash-filter-json and logstash-codec-netflow plugins into the test_plugins BK pipeline. - Moved codecs tier2 to be executed in separata VM. - Commented plugin logstash-codec-collectd till is fixed
This commit is contained in:
parent
f643e8606d
commit
2be661b9bc
2 changed files with 15 additions and 5 deletions
|
@ -58,7 +58,15 @@ steps:
|
||||||
- label: "Test Tier2 filters"
|
- label: "Test Tier2 filters"
|
||||||
command: ./ci/test_plugins.sh -t tier2 -k filter
|
command: ./ci/test_plugins.sh -t tier2 -k filter
|
||||||
- label: "Test Tier2 codecs"
|
- label: "Test Tier2 codecs"
|
||||||
command: ./ci/test_plugins.sh -t tier2 -k codec
|
command: |
|
||||||
|
source .buildkite/scripts/common/vm-agent.sh
|
||||||
|
./ci/test_plugins.sh -t tier2 -k codec
|
||||||
|
agents:
|
||||||
|
provider: gcp
|
||||||
|
imageProject: elastic-images-prod
|
||||||
|
image: family/platform-ingest-logstash-ubuntu-2204
|
||||||
|
machineType: "n2-standard-4"
|
||||||
|
diskSizeGb: 120
|
||||||
- label: "Test Tier2 outputs"
|
- label: "Test Tier2 outputs"
|
||||||
command: ./ci/test_plugins.sh -t tier2 -k output
|
command: ./ci/test_plugins.sh -t tier2 -k output
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,7 @@ class Plugin
|
||||||
unit_test_folders = Dir.glob('spec/**/*')
|
unit_test_folders = Dir.glob('spec/**/*')
|
||||||
.select {|f| File.directory? f}
|
.select {|f| File.directory? f}
|
||||||
.select{|f| not f.include?('integration')}
|
.select{|f| not f.include?('integration')}
|
||||||
|
.select{|f| not f.include?('benchmark')}
|
||||||
.join(" ")
|
.join(" ")
|
||||||
|
|
||||||
puts "test plugins(execute_rspec)>> rake vendor (at #{Time.new})"
|
puts "test plugins(execute_rspec)>> rake vendor (at #{Time.new})"
|
||||||
|
@ -85,7 +86,7 @@ class Plugin
|
||||||
|
|
||||||
puts "test plugins(execute_rspec)>> exec rspec"
|
puts "test plugins(execute_rspec)>> exec rspec"
|
||||||
rspec_command = "#{ENV['LOGSTASH_PATH']}/bin/ruby -S bundle exec rspec #{unit_test_folders} --tag ~integration --tag ~secure_integration"
|
rspec_command = "#{ENV['LOGSTASH_PATH']}/bin/ruby -S bundle exec rspec #{unit_test_folders} --tag ~integration --tag ~secure_integration"
|
||||||
puts "\t\t executing: #{rspec_command}"
|
puts "\t\t executing: #{rspec_command}\n from #{Dir.pwd}"
|
||||||
stdout, stderr, status = Open3.capture3(rspec_command)
|
stdout, stderr, status = Open3.capture3(rspec_command)
|
||||||
if status != 0
|
if status != 0
|
||||||
puts "Error executing rspec"
|
puts "Error executing rspec"
|
||||||
|
@ -149,7 +150,7 @@ PLUGIN_DEFINITIONS = {
|
||||||
:filter => ["logstash-filter-cidr", "logstash-filter-clone", "logstash-filter-csv", "logstash-filter-date", "logstash-filter-dissect",
|
:filter => ["logstash-filter-cidr", "logstash-filter-clone", "logstash-filter-csv", "logstash-filter-date", "logstash-filter-dissect",
|
||||||
"logstash-filter-dns", "logstash-filter-drop", "logstash-filter-elasticsearch", "logstash-filter-fingerprint",
|
"logstash-filter-dns", "logstash-filter-drop", "logstash-filter-elasticsearch", "logstash-filter-fingerprint",
|
||||||
"logstash-filter-geoip", "logstash-filter-grok", "logstash-filter-http",
|
"logstash-filter-geoip", "logstash-filter-grok", "logstash-filter-http",
|
||||||
#"logstash-filter-json", # Commented because of issue https://github.com/logstash-plugins/logstash-filter-json/issues/55
|
"logstash-filter-json",
|
||||||
"logstash-filter-kv",
|
"logstash-filter-kv",
|
||||||
"logstash-filter-memcached", "logstash-filter-mutate", "logstash-filter-prune", "logstash-filter-ruby",
|
"logstash-filter-memcached", "logstash-filter-mutate", "logstash-filter-prune", "logstash-filter-ruby",
|
||||||
"logstash-filter-sleep", "logstash-filter-split", "logstash-filter-syslog_pri", "logstash-filter-translate",
|
"logstash-filter-sleep", "logstash-filter-split", "logstash-filter-syslog_pri", "logstash-filter-translate",
|
||||||
|
@ -164,9 +165,10 @@ PLUGIN_DEFINITIONS = {
|
||||||
:input => [# "logstash-input-couchdb_changes", # Removed because of https://github.com/logstash-plugins/logstash-input-couchdb_changes/issues/51
|
:input => [# "logstash-input-couchdb_changes", # Removed because of https://github.com/logstash-plugins/logstash-input-couchdb_changes/issues/51
|
||||||
"logstash-input-gelf", "logstash-input-graphite", "logstash-input-jms",
|
"logstash-input-gelf", "logstash-input-graphite", "logstash-input-jms",
|
||||||
"logstash-input-snmp", "logstash-input-sqs", "logstash-input-twitter"],
|
"logstash-input-snmp", "logstash-input-sqs", "logstash-input-twitter"],
|
||||||
:codec => ["logstash-codec-collectd", "logstash-codec-dots", "logstash-codec-fluent", "logstash-codec-graphite",
|
:codec => [#"logstash-codec-collectd", # Removed because of https://github.com/logstash-plugins/logstash-codec-collectd/issues/32
|
||||||
|
"logstash-codec-dots", "logstash-codec-fluent", "logstash-codec-graphite",
|
||||||
"logstash-codec-msgpack",
|
"logstash-codec-msgpack",
|
||||||
#{}"logstash-codec-netflow" # Commented because of issue https://github.com/logstash-plugins/logstash-codec-netflow/issues/203
|
"logstash-codec-netflow"
|
||||||
],
|
],
|
||||||
:filter => ["logstash-filter-aggregate", "logstash-filter-de_dot", "logstash-filter-throttle"],
|
:filter => ["logstash-filter-aggregate", "logstash-filter-de_dot", "logstash-filter-throttle"],
|
||||||
:output => ["logstash-output-csv", "logstash-output-graphite"]
|
:output => ["logstash-output-csv", "logstash-output-graphite"]
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue