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

Jump to bottom

Kibana Discover support kibana 8.13 #1423

Merged
merged 2 commits into from
Apr 21, 2024
Merged

Kibana Discover support kibana 8.13 #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbc4a13
Kibana Discover support kibana 8.13
nsano-rururu Apr 21, 2024
bc84aba
Update CHANGELOG.md
nsano-rururu Apr 21, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
## Other changes
- [workwechat] add workwechat msgtype - [#1369](https://github.com/jertel/elastalert2/pull/1369) - @bitqiu
- [Pager Duty] Add options: pagerduty_ca_certs, pagerduty_ignore_ssl_errors - [#1418](https://github.com/jertel/elastalert2/pull/1418) - @kexin-zhai
- Add support for Kibana 8.13 for Kibana Discover - [#1423](https://github.com/jertel/elastalert2/pull/1423) - @nsano-rururu

# 2.17.0

Expand Down
2 changes: 1 addition & 1 deletion docs/source/ruletypes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ kibana_discover_version
The currently supported versions of Kibana Discover are:

- `7.0`, `7.1`, `7.2`, `7.3`, `7.4`, `7.5`, `7.6`, `7.7`, `7.8`, `7.9`, `7.10`, `7.11`, `7.12`, `7.13`, `7.14`, `7.15`, `7.16`, `7.17`
- `8.0`, `8.1`, `8.2`, `8.3`, `8.4`, `8.5`, `8.6`, `8.7`, `8.8`, `8.9` , `8.10` , `8.11` , `8.12`
- `8.0`, `8.1`, `8.2`, `8.3`, `8.4`, `8.5`, `8.6`, `8.7`, `8.8`, `8.9` , `8.10` , `8.11` , `8.12` , `8.13`

``kibana_discover_version: '7.15'``

Expand Down
2 changes: 1 addition & 1 deletion elastalert/kibana_discover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

kibana_versions = frozenset([
'7.0', '7.1', '7.2', '7.3', '7.4', '7.5', '7.6', '7.7', '7.8', '7.9', '7.10', '7.11', '7.12', '7.13', '7.14', '7.15', '7.16', '7.17',
'8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6', '8.7', '8.8', '8.9', '8.10', '8.11', '8.12'
'8.0', '8.1', '8.2', '8.3', '8.4', '8.5', '8.6', '8.7', '8.8', '8.9', '8.10', '8.11', '8.12', '8.13'
])

def generate_kibana_discover_url(rule, match):
Expand Down
2 changes: 1 addition & 1 deletion elastalert/schema.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ properties:
generate_kibana_discover_url: {type: boolean}
shorten_kibana_discover_url: {type: boolean}
kibana_discover_app_url: {type: string}
kibana_discover_version: {type: string, enum: ['8.12','8.11', '8.10', '8.9', '8.8', '8.7', '8.6', '8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.17', '7.16', '7.15', '7.14', '7.13', '7.12', '7.11', '7.10', '7.9', '7.8', '7.7', '7.6', '7.5', '7.4', '7.3', '7.2', '7.1', '7.0']}
kibana_discover_version: {type: string, enum: ['8.13','8.12','8.11', '8.10', '8.9', '8.8', '8.7', '8.6', '8.5', '8.4', '8.3', '8.2', '8.1', '8.0', '7.17', '7.16', '7.15', '7.14', '7.13', '7.12', '7.11', '7.10', '7.9', '7.8', '7.7', '7.6', '7.5', '7.4', '7.3', '7.2', '7.1', '7.0']}
kibana_discover_index_pattern_id: {type: string, minLength: 1}
kibana_discover_columns: {type: array, items: {type: string, minLength: 1}, minItems: 1}
kibana_discover_from_timedelta: *timedelta
Expand Down
41 changes: 21 additions & 20 deletions tests/kibana_discover_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
'8.9',
'8.10',
'8.11',
'8.12'
'8.12',
'8.13'
])
def test_generate_kibana_discover_url_with_kibana_7x(kibana_version):
url = generate_kibana_discover_url(
Expand Down Expand Up @@ -73,7 +74,7 @@ def test_generate_kibana_discover_url_with_relative_kibana_discover_app_url():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'app/discover#/',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': '620ad0e6-43df-4557-bda2-384960fa9086',
'timestamp_field': 'timestamp'
},
Expand Down Expand Up @@ -119,7 +120,7 @@ def test_generate_kibana_discover_url_with_missing_kibana_discover_version():
def test_generate_kibana_discover_url_with_missing_kibana_discover_app_url():
url = generate_kibana_discover_url(
rule={
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs',
'timestamp_field': 'timestamp',
'name': 'test'
Expand All @@ -135,7 +136,7 @@ def test_generate_kibana_discover_url_with_missing_kibana_discover_index_pattern
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'timestamp_field': 'timestamp',
'name': 'test'
},
Expand Down Expand Up @@ -169,7 +170,7 @@ def test_generate_kibana_discover_url_with_kibana_discover_app_url_env_substitut
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://$KIBANA_HOST:$KIBANA_PORT/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
'timestamp_field': 'timestamp'
},
Expand Down Expand Up @@ -201,7 +202,7 @@ def test_generate_kibana_discover_url_with_from_timedelta():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
'kibana_discover_from_timedelta': timedelta(hours=1),
'timestamp_field': 'timestamp'
Expand Down Expand Up @@ -234,7 +235,7 @@ def test_generate_kibana_discover_url_with_from_timedelta_and_timeframe():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
'kibana_discover_from_timedelta': timedelta(hours=1),
'timeframe': timedelta(minutes=20),
Expand Down Expand Up @@ -268,7 +269,7 @@ def test_generate_kibana_discover_url_with_to_timedelta():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
'kibana_discover_to_timedelta': timedelta(hours=1),
'timestamp_field': 'timestamp'
Expand Down Expand Up @@ -301,7 +302,7 @@ def test_generate_kibana_discover_url_with_to_timedelta_and_timeframe():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
'kibana_discover_to_timedelta': timedelta(hours=1),
'timeframe': timedelta(minutes=20),
Expand Down Expand Up @@ -335,7 +336,7 @@ def test_generate_kibana_discover_url_with_timeframe():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
'timeframe': timedelta(minutes=20),
'timestamp_field': 'timestamp'
Expand Down Expand Up @@ -368,7 +369,7 @@ def test_generate_kibana_discover_url_with_custom_columns():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'kibana_discover_columns': ['level', 'message'],
'timestamp_field': 'timestamp'
Expand Down Expand Up @@ -401,7 +402,7 @@ def test_generate_kibana_discover_url_with_single_filter():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'filter': [
Expand Down Expand Up @@ -452,7 +453,7 @@ def test_generate_kibana_discover_url_with_multiple_filters():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': '90943e30-9a47-11e8-b64d-95841ca0b247',
'timestamp_field': 'timestamp',
'filter': [
Expand Down Expand Up @@ -506,7 +507,7 @@ def test_generate_kibana_discover_url_with_int_query_key():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'query_key': 'geo.dest'
Expand Down Expand Up @@ -566,7 +567,7 @@ def test_generate_kibana_discover_url_with_str_query_key():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'query_key': 'geo.dest'
Expand Down Expand Up @@ -628,7 +629,7 @@ def test_generate_kibana_discover_url_with_null_query_key_value():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'query_key': 'status'
Expand Down Expand Up @@ -678,7 +679,7 @@ def test_generate_kibana_discover_url_with_missing_query_key_value():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'query_key': 'status'
Expand Down Expand Up @@ -727,7 +728,7 @@ def test_generate_kibana_discover_url_with_compound_query_key():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'compound_query_key': ['geo.src', 'geo.dest'],
Expand Down Expand Up @@ -815,7 +816,7 @@ def test_generate_kibana_discover_url_with_filter_and_query_key():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'filter': [
Expand Down Expand Up @@ -892,7 +893,7 @@ def test_generate_kibana_discover_url_with_querystring_filter_and_query_key():
url = generate_kibana_discover_url(
rule={
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
'kibana_discover_version': '8.12',
'kibana_discover_version': '8.13',
'kibana_discover_index_pattern_id': 'logs-*',
'timestamp_field': 'timestamp',
'filter': [
Expand Down