Skip to content

Commit ef3362a

Browse files
jerteljertel
authored
Merge pull request #1423 from nsano-rururu/kibana_discover813
Kibana Discover support kibana 8.13
2 parents 995b91a + bc84aba commit ef3362a

File tree

5 files changed

+25
-23
lines changed

5 files changed

+25
-23
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
## Other changes
1010
- [workwechat] add workwechat msgtype - [#1369](https://github.com/jertel/elastalert2/pull/1369) - @bitqiu
1111
- [Pager Duty] Add options: pagerduty_ca_certs, pagerduty_ignore_ssl_errors - [#1418](https://github.com/jertel/elastalert2/pull/1418) - @kexin-zhai
12+
- Add support for Kibana 8.13 for Kibana Discover - [#1423](https://github.com/jertel/elastalert2/pull/1423) - @nsano-rururu
1213

1314
# 2.17.0
1415

‎docs/source/ruletypes.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ kibana_discover_version
744744
The currently supported versions of Kibana Discover are:
745745

746746
- `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`
747-
- `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`
747+
- `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`
748748

749749
``kibana_discover_version: '7.15'``
750750

‎elastalert/kibana_discover.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
kibana_versions = frozenset([
1818
'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',
19-
'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'
19+
'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'
2020
])
2121

2222
def generate_kibana_discover_url(rule, match):

‎elastalert/schema.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ properties:
296296
generate_kibana_discover_url: {type: boolean}
297297
shorten_kibana_discover_url: {type: boolean}
298298
kibana_discover_app_url: {type: string}
299-
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']}
299+
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']}
300300
kibana_discover_index_pattern_id: {type: string, minLength: 1}
301301
kibana_discover_columns: {type: array, items: {type: string, minLength: 1}, minItems: 1}
302302
kibana_discover_from_timedelta: *timedelta

‎tests/kibana_discover_test.py

+21-20
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@
3535
'8.9',
3636
'8.10',
3737
'8.11',
38-
'8.12'
38+
'8.12',
39+
'8.13'
3940
])
4041
def test_generate_kibana_discover_url_with_kibana_7x(kibana_version):
4142
url = generate_kibana_discover_url(
@@ -73,7 +74,7 @@ def test_generate_kibana_discover_url_with_relative_kibana_discover_app_url():
7374
url = generate_kibana_discover_url(
7475
rule={
7576
'kibana_discover_app_url': 'app/discover#/',
76-
'kibana_discover_version': '8.12',
77+
'kibana_discover_version': '8.13',
7778
'kibana_discover_index_pattern_id': '620ad0e6-43df-4557-bda2-384960fa9086',
7879
'timestamp_field': 'timestamp'
7980
},
@@ -119,7 +120,7 @@ def test_generate_kibana_discover_url_with_missing_kibana_discover_version():
119120
def test_generate_kibana_discover_url_with_missing_kibana_discover_app_url():
120121
url = generate_kibana_discover_url(
121122
rule={
122-
'kibana_discover_version': '8.12',
123+
'kibana_discover_version': '8.13',
123124
'kibana_discover_index_pattern_id': 'logs',
124125
'timestamp_field': 'timestamp',
125126
'name': 'test'
@@ -135,7 +136,7 @@ def test_generate_kibana_discover_url_with_missing_kibana_discover_index_pattern
135136
url = generate_kibana_discover_url(
136137
rule={
137138
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
138-
'kibana_discover_version': '8.12',
139+
'kibana_discover_version': '8.13',
139140
'timestamp_field': 'timestamp',
140141
'name': 'test'
141142
},
@@ -169,7 +170,7 @@ def test_generate_kibana_discover_url_with_kibana_discover_app_url_env_substitut
169170
url = generate_kibana_discover_url(
170171
rule={
171172
'kibana_discover_app_url': 'http://$KIBANA_HOST:$KIBANA_PORT/#/discover',
172-
'kibana_discover_version': '8.12',
173+
'kibana_discover_version': '8.13',
173174
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
174175
'timestamp_field': 'timestamp'
175176
},
@@ -201,7 +202,7 @@ def test_generate_kibana_discover_url_with_from_timedelta():
201202
url = generate_kibana_discover_url(
202203
rule={
203204
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
204-
'kibana_discover_version': '8.12',
205+
'kibana_discover_version': '8.13',
205206
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
206207
'kibana_discover_from_timedelta': timedelta(hours=1),
207208
'timestamp_field': 'timestamp'
@@ -234,7 +235,7 @@ def test_generate_kibana_discover_url_with_from_timedelta_and_timeframe():
234235
url = generate_kibana_discover_url(
235236
rule={
236237
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
237-
'kibana_discover_version': '8.12',
238+
'kibana_discover_version': '8.13',
238239
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
239240
'kibana_discover_from_timedelta': timedelta(hours=1),
240241
'timeframe': timedelta(minutes=20),
@@ -268,7 +269,7 @@ def test_generate_kibana_discover_url_with_to_timedelta():
268269
url = generate_kibana_discover_url(
269270
rule={
270271
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
271-
'kibana_discover_version': '8.12',
272+
'kibana_discover_version': '8.13',
272273
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
273274
'kibana_discover_to_timedelta': timedelta(hours=1),
274275
'timestamp_field': 'timestamp'
@@ -301,7 +302,7 @@ def test_generate_kibana_discover_url_with_to_timedelta_and_timeframe():
301302
url = generate_kibana_discover_url(
302303
rule={
303304
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
304-
'kibana_discover_version': '8.12',
305+
'kibana_discover_version': '8.13',
305306
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
306307
'kibana_discover_to_timedelta': timedelta(hours=1),
307308
'timeframe': timedelta(minutes=20),
@@ -335,7 +336,7 @@ def test_generate_kibana_discover_url_with_timeframe():
335336
url = generate_kibana_discover_url(
336337
rule={
337338
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
338-
'kibana_discover_version': '8.12',
339+
'kibana_discover_version': '8.13',
339340
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
340341
'timeframe': timedelta(minutes=20),
341342
'timestamp_field': 'timestamp'
@@ -368,7 +369,7 @@ def test_generate_kibana_discover_url_with_custom_columns():
368369
url = generate_kibana_discover_url(
369370
rule={
370371
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
371-
'kibana_discover_version': '8.12',
372+
'kibana_discover_version': '8.13',
372373
'kibana_discover_index_pattern_id': 'logs-*',
373374
'kibana_discover_columns': ['level', 'message'],
374375
'timestamp_field': 'timestamp'
@@ -401,7 +402,7 @@ def test_generate_kibana_discover_url_with_single_filter():
401402
url = generate_kibana_discover_url(
402403
rule={
403404
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
404-
'kibana_discover_version': '8.12',
405+
'kibana_discover_version': '8.13',
405406
'kibana_discover_index_pattern_id': 'logs-*',
406407
'timestamp_field': 'timestamp',
407408
'filter': [
@@ -452,7 +453,7 @@ def test_generate_kibana_discover_url_with_multiple_filters():
452453
url = generate_kibana_discover_url(
453454
rule={
454455
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
455-
'kibana_discover_version': '8.12',
456+
'kibana_discover_version': '8.13',
456457
'kibana_discover_index_pattern_id': '90943e30-9a47-11e8-b64d-95841ca0b247',
457458
'timestamp_field': 'timestamp',
458459
'filter': [
@@ -506,7 +507,7 @@ def test_generate_kibana_discover_url_with_int_query_key():
506507
url = generate_kibana_discover_url(
507508
rule={
508509
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
509-
'kibana_discover_version': '8.12',
510+
'kibana_discover_version': '8.13',
510511
'kibana_discover_index_pattern_id': 'logs-*',
511512
'timestamp_field': 'timestamp',
512513
'query_key': 'geo.dest'
@@ -566,7 +567,7 @@ def test_generate_kibana_discover_url_with_str_query_key():
566567
url = generate_kibana_discover_url(
567568
rule={
568569
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
569-
'kibana_discover_version': '8.12',
570+
'kibana_discover_version': '8.13',
570571
'kibana_discover_index_pattern_id': 'logs-*',
571572
'timestamp_field': 'timestamp',
572573
'query_key': 'geo.dest'
@@ -628,7 +629,7 @@ def test_generate_kibana_discover_url_with_null_query_key_value():
628629
url = generate_kibana_discover_url(
629630
rule={
630631
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
631-
'kibana_discover_version': '8.12',
632+
'kibana_discover_version': '8.13',
632633
'kibana_discover_index_pattern_id': 'logs-*',
633634
'timestamp_field': 'timestamp',
634635
'query_key': 'status'
@@ -678,7 +679,7 @@ def test_generate_kibana_discover_url_with_missing_query_key_value():
678679
url = generate_kibana_discover_url(
679680
rule={
680681
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
681-
'kibana_discover_version': '8.12',
682+
'kibana_discover_version': '8.13',
682683
'kibana_discover_index_pattern_id': 'logs-*',
683684
'timestamp_field': 'timestamp',
684685
'query_key': 'status'
@@ -727,7 +728,7 @@ def test_generate_kibana_discover_url_with_compound_query_key():
727728
url = generate_kibana_discover_url(
728729
rule={
729730
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
730-
'kibana_discover_version': '8.12',
731+
'kibana_discover_version': '8.13',
731732
'kibana_discover_index_pattern_id': 'logs-*',
732733
'timestamp_field': 'timestamp',
733734
'compound_query_key': ['geo.src', 'geo.dest'],
@@ -815,7 +816,7 @@ def test_generate_kibana_discover_url_with_filter_and_query_key():
815816
url = generate_kibana_discover_url(
816817
rule={
817818
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
818-
'kibana_discover_version': '8.12',
819+
'kibana_discover_version': '8.13',
819820
'kibana_discover_index_pattern_id': 'logs-*',
820821
'timestamp_field': 'timestamp',
821822
'filter': [
@@ -892,7 +893,7 @@ def test_generate_kibana_discover_url_with_querystring_filter_and_query_key():
892893
url = generate_kibana_discover_url(
893894
rule={
894895
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
895-
'kibana_discover_version': '8.12',
896+
'kibana_discover_version': '8.13',
896897
'kibana_discover_index_pattern_id': 'logs-*',
897898
'timestamp_field': 'timestamp',
898899
'filter': [

0 commit comments

Comments
 (0)