Skip to content

Commit 85282ab

Browse files
jerteljertel
committed
add kibana 8.16
1 parent bb21503 commit 85282ab

File tree

6 files changed

+26
-26
lines changed

6 files changed

+26
-26
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- [OpsGenie] Prevent templated `opsgenie_teams` and `opsgenie_recipients` from being overwritten with evaluated values first time an alert is sent. [#1540](https://github.com/jertel/elastalert2/issues/1540) [#1539](https://github.com/jertel/elastalert2/pull/1539) - @lstyles
1414
- [OpsGenie] Updated configuration schema with missing OpsGenie alerter properties. [#1543](https://github.com/jertel/elastalert2/pull/1543) - @lstyles
1515
- [Docs] Add missing documentation of the timestamp_field option - [#1544](https://github.com/jertel/elastalert2/pull/1544) - @apollolv
16-
- Add support for Kibana 8.14/8.15 for Kibana Discover - [#1547](https://github.com/jertel/elastalert2/pull/1547) - @nsano-rururu
16+
- Add support for Kibana 8.14/8.15/8.16 for Kibana Discover - [#1547](https://github.com/jertel/elastalert2/pull/1547),[#1582](https://github.com/jertel/elastalert2/pull/1582) - @nsano-rururu, @jertel
1717
- Upgrade pylint 3.1.0 to 3.3.1, pytest 8.0.2 to 8.3.3, pytest-cov 4.1.0 to 5.0.0, pytest-xdist 3.5.0 to 3.6.1, sphinx 7.2.6 to 8.0.2, sphinx_rtd_theme 2.0.0 to 3.0.1, tox 4.13.0 to 4.21.2 - [#1550](https://github.com/jertel/elastalert2/pull/1550) - @nsano-rururu
1818
- Upgrade to Python 3.13 - [#1551](https://github.com/jertel/elastalert2/pull/1551) - @nsano-rururu
1919
- [OpsGenie] Support dynamic `opsgenie_addr` values - [#1563](https://github.com/jertel/elastalert2/pull/1563) - @mohamedelema17

‎docs/source/ruletypes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ kibana_discover_version
746746
The currently supported versions of Kibana Discover are:
747747

748748
- `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`
749-
- `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`, `8.14`, `8.15`
749+
- `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`, `8.14`, `8.15`, `8.16`
750750

751751
``kibana_discover_version: '7.15'``
752752

‎docs/source/running_elastalert.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,7 @@ As a Kubernetes deployment
130130

131131
The Docker container for ElastAlert 2 can be used directly as a Kubernetes
132132
deployment, but for convenience, a Helm chart is also available. See the
133-
instructions provided `on Github
134-
<https://github.com/jertel/elastalert2/blob/master/chart/elastalert2/README.md>`_
133+
`Chart Readme <https://github.com/jertel/elastalert2/blob/master/chart/elastalert2/README.md>`_
135134
for more information on how to install, configure, and run the chart.
136135

137136
.. _python-instructions:

‎elastalert/kibana_discover.py

Lines changed: 1 addition & 1 deletion
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', '8.13', '8.14', '8.15'
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', '8.14', '8.15', '8.16'
2020
])
2121

2222
def generate_kibana_discover_url(rule, match):

‎elastalert/schema.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ properties:
324324
generate_kibana_discover_url: {type: boolean}
325325
shorten_kibana_discover_url: {type: boolean}
326326
kibana_discover_app_url: {type: string}
327-
kibana_discover_version: {type: string, enum: ['8.15','8.14','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']}
327+
kibana_discover_version: {type: string, enum: ['8.16','8.15','8.14','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']}
328328
kibana_discover_index_pattern_id: {type: string, minLength: 1}
329329
kibana_discover_columns: {type: array, items: {type: string, minLength: 1}, minItems: 1}
330330
kibana_discover_from_timedelta: *timedelta

‎tests/kibana_discover_test.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
'8.12',
3939
'8.13',
4040
'8.14',
41-
'8.15'
41+
'8.15',
42+
'8.16'
4243
])
4344
def test_generate_kibana_discover_url_with_kibana_7x(kibana_version):
4445
url = generate_kibana_discover_url(
@@ -76,7 +77,7 @@ def test_generate_kibana_discover_url_with_relative_kibana_discover_app_url():
7677
url = generate_kibana_discover_url(
7778
rule={
7879
'kibana_discover_app_url': 'app/discover#/',
79-
'kibana_discover_version': '8.15',
80+
'kibana_discover_version': '8.16',
8081
'kibana_discover_index_pattern_id': '620ad0e6-43df-4557-bda2-384960fa9086',
8182
'timestamp_field': 'timestamp'
8283
},
@@ -122,7 +123,7 @@ def test_generate_kibana_discover_url_with_missing_kibana_discover_version():
122123
def test_generate_kibana_discover_url_with_missing_kibana_discover_app_url():
123124
url = generate_kibana_discover_url(
124125
rule={
125-
'kibana_discover_version': '8.15',
126+
'kibana_discover_version': '8.16',
126127
'kibana_discover_index_pattern_id': 'logs',
127128
'timestamp_field': 'timestamp',
128129
'name': 'test'
@@ -138,7 +139,7 @@ def test_generate_kibana_discover_url_with_missing_kibana_discover_index_pattern
138139
url = generate_kibana_discover_url(
139140
rule={
140141
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
141-
'kibana_discover_version': '8.15',
142+
'kibana_discover_version': '8.16',
142143
'timestamp_field': 'timestamp',
143144
'name': 'test'
144145
},
@@ -172,7 +173,7 @@ def test_generate_kibana_discover_url_with_kibana_discover_app_url_env_substitut
172173
url = generate_kibana_discover_url(
173174
rule={
174175
'kibana_discover_app_url': 'http://$KIBANA_HOST:$KIBANA_PORT/#/discover',
175-
'kibana_discover_version': '8.15',
176+
'kibana_discover_version': '8.16',
176177
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
177178
'timestamp_field': 'timestamp'
178179
},
@@ -204,7 +205,7 @@ def test_generate_kibana_discover_url_with_from_timedelta():
204205
url = generate_kibana_discover_url(
205206
rule={
206207
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
207-
'kibana_discover_version': '8.15',
208+
'kibana_discover_version': '8.16',
208209
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
209210
'kibana_discover_from_timedelta': timedelta(hours=1),
210211
'timestamp_field': 'timestamp'
@@ -237,7 +238,7 @@ def test_generate_kibana_discover_url_with_from_timedelta_and_timeframe():
237238
url = generate_kibana_discover_url(
238239
rule={
239240
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
240-
'kibana_discover_version': '8.15',
241+
'kibana_discover_version': '8.16',
241242
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
242243
'kibana_discover_from_timedelta': timedelta(hours=1),
243244
'timeframe': timedelta(minutes=20),
@@ -271,7 +272,7 @@ def test_generate_kibana_discover_url_with_to_timedelta():
271272
url = generate_kibana_discover_url(
272273
rule={
273274
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
274-
'kibana_discover_version': '8.15',
275+
'kibana_discover_version': '8.16',
275276
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
276277
'kibana_discover_to_timedelta': timedelta(hours=1),
277278
'timestamp_field': 'timestamp'
@@ -304,7 +305,7 @@ def test_generate_kibana_discover_url_with_to_timedelta_and_timeframe():
304305
url = generate_kibana_discover_url(
305306
rule={
306307
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
307-
'kibana_discover_version': '8.15',
308+
'kibana_discover_version': '8.16',
308309
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
309310
'kibana_discover_to_timedelta': timedelta(hours=1),
310311
'timeframe': timedelta(minutes=20),
@@ -338,7 +339,7 @@ def test_generate_kibana_discover_url_with_timeframe():
338339
url = generate_kibana_discover_url(
339340
rule={
340341
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
341-
'kibana_discover_version': '8.15',
342+
'kibana_discover_version': '8.16',
342343
'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
343344
'timeframe': timedelta(minutes=20),
344345
'timestamp_field': 'timestamp'
@@ -371,7 +372,7 @@ def test_generate_kibana_discover_url_with_custom_columns():
371372
url = generate_kibana_discover_url(
372373
rule={
373374
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
374-
'kibana_discover_version': '8.15',
375+
'kibana_discover_version': '8.16',
375376
'kibana_discover_index_pattern_id': 'logs-*',
376377
'kibana_discover_columns': ['level', 'message'],
377378
'timestamp_field': 'timestamp'
@@ -404,7 +405,7 @@ def test_generate_kibana_discover_url_with_single_filter():
404405
url = generate_kibana_discover_url(
405406
rule={
406407
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
407-
'kibana_discover_version': '8.15',
408+
'kibana_discover_version': '8.16',
408409
'kibana_discover_index_pattern_id': 'logs-*',
409410
'timestamp_field': 'timestamp',
410411
'filter': [
@@ -455,7 +456,7 @@ def test_generate_kibana_discover_url_with_multiple_filters():
455456
url = generate_kibana_discover_url(
456457
rule={
457458
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
458-
'kibana_discover_version': '8.15',
459+
'kibana_discover_version': '8.16',
459460
'kibana_discover_index_pattern_id': '90943e30-9a47-11e8-b64d-95841ca0b247',
460461
'timestamp_field': 'timestamp',
461462
'filter': [
@@ -509,7 +510,7 @@ def test_generate_kibana_discover_url_with_int_query_key():
509510
url = generate_kibana_discover_url(
510511
rule={
511512
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
512-
'kibana_discover_version': '8.15',
513+
'kibana_discover_version': '8.16',
513514
'kibana_discover_index_pattern_id': 'logs-*',
514515
'timestamp_field': 'timestamp',
515516
'query_key': 'geo.dest'
@@ -569,7 +570,7 @@ def test_generate_kibana_discover_url_with_str_query_key():
569570
url = generate_kibana_discover_url(
570571
rule={
571572
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
572-
'kibana_discover_version': '8.15',
573+
'kibana_discover_version': '8.16',
573574
'kibana_discover_index_pattern_id': 'logs-*',
574575
'timestamp_field': 'timestamp',
575576
'query_key': 'geo.dest'
@@ -631,7 +632,7 @@ def test_generate_kibana_discover_url_with_null_query_key_value():
631632
url = generate_kibana_discover_url(
632633
rule={
633634
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
634-
'kibana_discover_version': '8.15',
635+
'kibana_discover_version': '8.16',
635636
'kibana_discover_index_pattern_id': 'logs-*',
636637
'timestamp_field': 'timestamp',
637638
'query_key': 'status'
@@ -681,7 +682,7 @@ def test_generate_kibana_discover_url_with_missing_query_key_value():
681682
url = generate_kibana_discover_url(
682683
rule={
683684
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
684-
'kibana_discover_version': '8.15',
685+
'kibana_discover_version': '8.16',
685686
'kibana_discover_index_pattern_id': 'logs-*',
686687
'timestamp_field': 'timestamp',
687688
'query_key': 'status'
@@ -730,7 +731,7 @@ def test_generate_kibana_discover_url_with_compound_query_key():
730731
url = generate_kibana_discover_url(
731732
rule={
732733
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
733-
'kibana_discover_version': '8.15',
734+
'kibana_discover_version': '8.16',
734735
'kibana_discover_index_pattern_id': 'logs-*',
735736
'timestamp_field': 'timestamp',
736737
'compound_query_key': ['geo.src', 'geo.dest'],
@@ -818,7 +819,7 @@ def test_generate_kibana_discover_url_with_filter_and_query_key():
818819
url = generate_kibana_discover_url(
819820
rule={
820821
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
821-
'kibana_discover_version': '8.15',
822+
'kibana_discover_version': '8.16',
822823
'kibana_discover_index_pattern_id': 'logs-*',
823824
'timestamp_field': 'timestamp',
824825
'filter': [
@@ -895,7 +896,7 @@ def test_generate_kibana_discover_url_with_querystring_filter_and_query_key():
895896
url = generate_kibana_discover_url(
896897
rule={
897898
'kibana_discover_app_url': 'http://kibana:5601/#/discover',
898-
'kibana_discover_version': '8.15',
899+
'kibana_discover_version': '8.16',
899900
'kibana_discover_index_pattern_id': 'logs-*',
900901
'timestamp_field': 'timestamp',
901902
'filter': [

0 commit comments

Comments
 (0)