Skip to content

Commit 0578974

Browse files
authored
Remove the Arcsight module and the modules framework (#16794)
Remove all module related code - remove arcsight module - remove module framework - remove module tests - remove module configs
1 parent 03ddf12 commit 0578974

File tree

369 files changed

+30
-7785
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

369 files changed

+30
-7785
lines changed

build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,6 @@ tasks.register("assembleTarDistribution") {
334334
inputs.files fileTree("${projectDir}/bin")
335335
inputs.files fileTree("${projectDir}/config")
336336
inputs.files fileTree("${projectDir}/lib")
337-
inputs.files fileTree("${projectDir}/modules")
338337
inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
339338
inputs.files fileTree("${projectDir}/logstash-core/lib")
340339
inputs.files fileTree("${projectDir}/logstash-core/src")
@@ -351,7 +350,6 @@ tasks.register("assembleOssTarDistribution") {
351350
inputs.files fileTree("${projectDir}/bin")
352351
inputs.files fileTree("${projectDir}/config")
353352
inputs.files fileTree("${projectDir}/lib")
354-
inputs.files fileTree("${projectDir}/modules")
355353
inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
356354
inputs.files fileTree("${projectDir}/logstash-core/lib")
357355
inputs.files fileTree("${projectDir}/logstash-core/src")
@@ -366,7 +364,6 @@ tasks.register("assembleZipDistribution") {
366364
inputs.files fileTree("${projectDir}/bin")
367365
inputs.files fileTree("${projectDir}/config")
368366
inputs.files fileTree("${projectDir}/lib")
369-
inputs.files fileTree("${projectDir}/modules")
370367
inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
371368
inputs.files fileTree("${projectDir}/logstash-core/lib")
372369
inputs.files fileTree("${projectDir}/logstash-core/src")
@@ -383,7 +380,6 @@ tasks.register("assembleOssZipDistribution") {
383380
inputs.files fileTree("${projectDir}/bin")
384381
inputs.files fileTree("${projectDir}/config")
385382
inputs.files fileTree("${projectDir}/lib")
386-
inputs.files fileTree("${projectDir}/modules")
387383
inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
388384
inputs.files fileTree("${projectDir}/logstash-core/lib")
389385
inputs.files fileTree("${projectDir}/logstash-core/src")

config/logstash.yml

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -181,38 +181,6 @@
181181
#
182182
# api.auth.basic.password_policy.mode: WARN
183183
#
184-
# ------------ Module Settings ---------------
185-
# Define modules here. Modules definitions must be defined as an array.
186-
# The simple way to see this is to prepend each `name` with a `-`, and keep
187-
# all associated variables under the `name` they are associated with, and
188-
# above the next, like this:
189-
#
190-
# modules:
191-
# - name: MODULE_NAME
192-
# var.PLUGINTYPE1.PLUGINNAME1.KEY1: VALUE
193-
# var.PLUGINTYPE1.PLUGINNAME1.KEY2: VALUE
194-
# var.PLUGINTYPE2.PLUGINNAME1.KEY1: VALUE
195-
# var.PLUGINTYPE3.PLUGINNAME3.KEY1: VALUE
196-
#
197-
# Module variable names must be in the format of
198-
#
199-
# var.PLUGIN_TYPE.PLUGIN_NAME.KEY
200-
#
201-
# modules:
202-
#
203-
# ------------ Cloud Settings ---------------
204-
# Define Elastic Cloud settings here.
205-
# Format of cloud.id is a base64 value e.g. dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRub3RhcmVhbCRpZGVudGlmaWVy
206-
# and it may have an label prefix e.g. staging:dXMtZ...
207-
# This will overwrite 'var.elasticsearch.hosts' and 'var.kibana.host'
208-
# cloud.id: <identifier>
209-
#
210-
# Format of cloud.auth is: <user>:<pass>
211-
# This is optional
212-
# If supplied this will overwrite 'var.elasticsearch.username' and 'var.elasticsearch.password'
213-
# If supplied this will overwrite 'var.kibana.username' and 'var.kibana.password'
214-
# cloud.auth: elastic:<password>
215-
#
216184
# ------------ Queuing Settings --------------
217185
#
218186
# Internal queuing model, "memory" for legacy in-memory based queuing and

docker/data/logstash/env2yaml/env2yaml.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ package main
1717
import (
1818
"errors"
1919
"fmt"
20-
"gopkg.in/yaml.v2"
2120
"io/ioutil"
2221
"log"
2322
"os"
2423
"strings"
24+
25+
"gopkg.in/yaml.v2"
2526
)
2627

2728
var validSettings = []string{
@@ -67,7 +68,6 @@ var validSettings = []string{
6768
"log.level",
6869
"log.format",
6970
"log.format.json.fix_duplicate_message_fields",
70-
"modules",
7171
"metric.collect",
7272
"path.logs",
7373
"path.plugins",
@@ -126,8 +126,6 @@ var validSettings = []string{
126126
"xpack.management.elasticsearch.ssl.cipher_suites",
127127
"xpack.geoip.download.endpoint",
128128
"xpack.geoip.downloader.enabled",
129-
"cloud.id",
130-
"cloud.auth",
131129
}
132130

133131
// Given a setting name, return a downcased version with delimiters removed.

logstash-core/lib/logstash/config/modules_common.rb

Lines changed: 0 additions & 130 deletions
This file was deleted.

logstash-core/lib/logstash/config/source/base.rb

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -71,37 +71,5 @@ def config_path
7171
def config_path?
7272
!(config_path.nil? || config_path.empty?)
7373
end
74-
75-
def modules_cli_setting
76-
@settings.get_setting("modules.cli")
77-
end
78-
79-
def modules_cli
80-
modules_cli_setting.value
81-
end
82-
83-
def modules_cli?
84-
!(modules_cli.nil? || modules_cli.empty?)
85-
end
86-
87-
def modules_setting
88-
@settings.get_setting("modules")
89-
end
90-
91-
def modules
92-
modules_setting.value
93-
end
94-
95-
def modules?
96-
!(modules.nil? || modules.empty?)
97-
end
98-
99-
def both_module_configs?
100-
modules_cli? && modules?
101-
end
102-
103-
def modules_defined?
104-
modules_cli? || modules?
105-
end
10674
end
10775
end end end

logstash-core/lib/logstash/config/source/local.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ def pipeline_configs
179179

180180
def match?
181181
# see basic settings predicates and getters defined in the base class
182-
(config_string? || config_path?) && !(modules_cli? || modules?) && !automatic_reload_with_config_string?
182+
(config_string? || config_path?) && !automatic_reload_with_config_string?
183183
end
184184

185185
def config_conflict?

logstash-core/lib/logstash/config/source/modules.rb

Lines changed: 0 additions & 68 deletions
This file was deleted.

logstash-core/lib/logstash/config/source/multi_local.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def pipeline_configs
4848
end
4949

5050
def match?
51-
if modules_cli? || modules? || config_string? || config_path?
51+
if config_string? || config_path?
5252
return false
5353
end
5454
detect_pipelines if !@detect_pipelines_called
@@ -62,7 +62,7 @@ def invalid_pipelines_detected?
6262
def config_conflict?
6363
@conflict_messages.clear
6464
# are there any auto-reload conflicts?
65-
if !(modules_cli? || modules? || config_string? || config_path?)
65+
if !(config_string? || config_path?)
6666
detect_pipelines if !@detect_pipelines_called
6767
if @detected_marker.nil?
6868
@conflict_messages << I18n.t("logstash.runner.config-pipelines-failed-read", :path => pipelines_yaml_location)
@@ -74,7 +74,7 @@ def config_conflict?
7474
@conflict_messages << @detected_marker.message
7575
end
7676
else
77-
do_warning? && logger.warn("Ignoring the 'pipelines.yml' file because modules or command line options are specified")
77+
do_warning? && logger.warn("Ignoring the 'pipelines.yml' file because command line options are specified")
7878
end
7979
@conflict_messages.any?
8080
end

logstash-core/lib/logstash/config/source_loader.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
# under the License.
1717

1818
require "logstash/config/source/local"
19-
require "logstash/config/source/modules"
2019
require "logstash/config/source/multi_local"
2120
require "thread"
2221
require "set"

0 commit comments

Comments
 (0)