Skip to content

[Fleet] Make Elasticsearch scope setting a select #5451

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

Merged
jillguyonnet merged 12 commits into from
Apr 3, 2023
Merged

[Fleet] Make Elasticsearch scope setting a select #5451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
69795c8
[Fleet] Make Elasticsearch scope setting a select
jillguyonnet Mar 6, 2023
7847da8
Constrain Kibana to 8.8.0 and higher
jillguyonnet Mar 24, 2023
e74038a
Fix package linting
jillguyonnet Mar 24, 2023
6475bba
Add changelog entry
jillguyonnet Mar 24, 2023
9aca07e
Fix tests
jillguyonnet Mar 24, 2023
8d28e7d
Fix static tests
jillguyonnet Mar 24, 2023
c640092
Add missing build changes
jillguyonnet Mar 24, 2023
fe2c888
Separate system tests for slowlog
mrodm Mar 27, 2023
b2216f2
Set default value to node
jillguyonnet Mar 30, 2023
c67f125
Add node.roles
jillguyonnet Mar 31, 2023
cd7646f
Amend README
jillguyonnet Mar 31, 2023
8ae90f0
Rebuild README
jillguyonnet Mar 31, 2023
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
4 changes: 2 additions & 2 deletions packages/elasticsearch/_dev/deploy/docker/config/log4j2.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs\
.cluster_name}_index_search_slowlog.json
appender.index_search_slowlog_rolling.layout.type = ECSJsonLayout
appender.index_search_slowlog_rolling.layout.dataset = elasticsearch.index_search_slowlog
appender.index_search_slowlog_rolling.layout.dataset = elasticsearch.slowlog

appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs\
.cluster_name}_index_search_slowlog-%i.json.gz
Expand All @@ -112,7 +112,7 @@ appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
_index_indexing_slowlog.json
appender.index_indexing_slowlog_rolling.layout.type = ECSJsonLayout
appender.index_indexing_slowlog_rolling.layout.dataset = elasticsearch.index_indexing_slowlog
appender.index_indexing_slowlog_rolling.layout.dataset = elasticsearch.slowlog


appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
Expand Down
10 changes: 1 addition & 9 deletions packages/elasticsearch/_dev/deploy/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,7 @@ services:
- "ES_JAVA_OPTS=-Xms1g -Xmx1g"
- "ELASTIC_PASSWORD=changeme"
healthcheck:
test:
[
"CMD",
"curl",
"-f",
"-u",
"elastic:changeme",
"http://127.0.0.1:9200/",
]
test: ["CMD", "curl", "-f", "-u", "elastic:changeme", "http://127.0.0.1:9200/"]
retries: 300
interval: 1s
volumes:
Expand Down
8 changes: 8 additions & 0 deletions packages/elasticsearch/changelog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
# newer versions go on top
- version: "1.6.0"
changes:
- description: Make scope variable a select
type: enhancement
link: https://github.com/elastic/integrations/pull/5451
- description: Add roles to node
type: enhancement
link: https://github.com/elastic/integrations/pull/5451
- version: "1.5.0"
changes:
- description: Add force_merge to thread_pool node stats
Expand Down
4 changes: 2 additions & 2 deletions packages/elasticsearch/data_stream/ccr/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
"data_stream": {
"namespace": "default",
"type": "metrics",
"dataset": "elasticsearch.ccr"
"dataset": "elasticsearch.stack_monitoring.ccr"
},
"elastic_agent": {
"id": "071bc382-9090-4d81-9181-98472331a5c2",
Expand Down Expand Up @@ -150,6 +150,6 @@
"agent_id_status": "verified",
"ingested": "2022-09-05T00:30:29Z",
"module": "elasticsearch",
"dataset": "elasticsearch.ccr"
"dataset": "elasticsearch.stack_monitoring.ccr"
}
}
4 changes: 2 additions & 2 deletions packages/elasticsearch/data_stream/enrich/sample_event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"data_stream": {
"namespace": "default",
"type": "metrics",
"dataset": "elasticsearch.enrich"
"dataset": "elasticsearch.stack_monitoring.enrich"
Copy link
Contributor

@klacabane klacabane Mar 28, 2023

Choose a reason for hiding this comment

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

These sample events were generated before we specified an override for the dataset and I suppose elastic-package now validates the field.
The slowlogs failures should be related to that new validation: the spec expects the raw datastream name elasticsearch.slowlog but log4j configuration specifies an override outside of the package scope, causing a disconnect

},
"host": {
"hostname": "docker-fleet-agent",
Expand Down Expand Up @@ -78,6 +78,6 @@
"agent_id_status": "verified",
"ingested": "2021-07-30T14:47:16.373180707Z",
"module": "elasticsearch",
"dataset": "elasticsearch.enrich"
"dataset": "elasticsearch.stack_monitoring.enrich"
}
}
1 change: 0 additions & 1 deletion packages/elasticsearch/data_stream/ingest_pipeline/fields/fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
- name: elasticsearch.ingest_pipeline
type: group
release: beta
description: Runtime metrics on ingest pipeline execution
fields:
- name: name
Expand Down
4 changes: 4 additions & 0 deletions packages/elasticsearch/data_stream/node_stats/fields/package-fields.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,3 +326,7 @@
type: boolean
description: |
Is mlockall enabled on the node?
- name: roles
type: keyword
description: |
Node roles
Loading