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

Remove the Arcsight module and the modules framework #16794

Merged
merged 7 commits into from
Dec 19, 2024
Merged

Remove the Arcsight module and the modules framework #16794

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c2e15ad
remove modules framework
kaisecheng Dec 13, 2024
74002f7
remove env2yaml
kaisecheng Dec 13, 2024
094092f
remove i18n
kaisecheng Dec 13, 2024
ecd7c1d
remove cloud.id config in yml
kaisecheng Dec 17, 2024
a3f35e1
remove modules_setting_array
kaisecheng Dec 17, 2024
b47188a
remove elasticsearch_client and ssl helper
kaisecheng Dec 17, 2024
e74fd14
fix import
kaisecheng Dec 17, 2024
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: 2 additions & 4 deletions docker/data/logstash/env2yaml/env2yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@ package main
import (
"errors"
"fmt"
"gopkg.in/yaml.v2"
donoghuc marked this conversation as resolved.
Show resolved Hide resolved
"io/ioutil"
"log"
"os"
"strings"

"gopkg.in/yaml.v2"
)

var validSettings = []string{
Expand Down Expand Up @@ -67,7 +68,6 @@ var validSettings = []string{
"log.level",
"log.format",
"log.format.json.fix_duplicate_message_fields",
"modules",
"metric.collect",
"path.logs",
"path.plugins",
Expand Down Expand Up @@ -126,8 +126,6 @@ var validSettings = []string{
"xpack.management.elasticsearch.ssl.cipher_suites",
"xpack.geoip.download.endpoint",
"xpack.geoip.downloader.enabled",
"cloud.id",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these "cloud" settings related to the module being removed?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see these are removed in i18n etc too.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is cloud.id here only relevant to modules, or is this where it is also set for central management and internal collection?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cloud.id is only used for modules
CPM uses xpack.management.elasticsearch.cloud_id. Legacy monitoring uses xpack.monitoring.elasticsearch.cloud_id

"cloud.auth",
}

// Given a setting name, return a downcased version with delimiters removed.
Expand Down
Loading