Merge pull request #1547 from nsano-rururu/kibana_discover815

Kibana Discover support kibana 8.14/8.15
jertel · Oct 7, 2024 · 1603ee5 · 1603ee5
2 parents e3fba4c + e486c61
commit 1603ee5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - [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
 - [OpsGenie] Updated configuration schema with missing OpsGenie alerter properties. [#1543](https://github.com/jertel/elastalert2/pull/1543) - @lstyles
 - [Docs] Add missing documentation of the timestamp_field option - [#1544](https://github.com/jertel/elastalert2/pull/1544) - @apollolv
+- Add support for Kibana 8.14/8.15 for Kibana Discover - [#1547](https://github.com/jertel/elastalert2/pull/1547) - @nsano-rururu
 
 # 2.20.0
 

diff --git a/docs/source/ruletypes.rst b/docs/source/ruletypes.rst
@@ -746,7 +746,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.13` 
+- `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` 
 
 ``kibana_discover_version: '7.15'``
 

diff --git a/elastalert/kibana_discover.py b/elastalert/kibana_discover.py
@@ -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.13'
+        '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'
         ])
 
 def generate_kibana_discover_url(rule, match):

diff --git a/elastalert/schema.yaml b/elastalert/schema.yaml
@@ -324,7 +324,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.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_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']}
   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

diff --git a/tests/kibana_discover_test.py b/tests/kibana_discover_test.py
@@ -36,7 +36,9 @@
     '8.10',
     '8.11',
     '8.12',
-    '8.13'
+    '8.13',
+    '8.14',
+    '8.15'
 ])
 def test_generate_kibana_discover_url_with_kibana_7x(kibana_version):
     url = generate_kibana_discover_url(
@@ -74,7 +76,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': '620ad0e6-43df-4557-bda2-384960fa9086',
             'timestamp_field': 'timestamp'
         },
@@ -120,7 +122,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs',
             'timestamp_field': 'timestamp',
             'name': 'test'
@@ -136,7 +138,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.13',
+            'kibana_discover_version': '8.15',
             'timestamp_field': 'timestamp',
             'name': 'test'
         },
@@ -170,7 +172,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'timestamp_field': 'timestamp'
         },
@@ -202,7 +204,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_from_timedelta': timedelta(hours=1),
             'timestamp_field': 'timestamp'
@@ -235,7 +237,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_from_timedelta': timedelta(hours=1),
             'timeframe': timedelta(minutes=20),
@@ -269,7 +271,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_to_timedelta': timedelta(hours=1),
             'timestamp_field': 'timestamp'
@@ -302,7 +304,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_to_timedelta': timedelta(hours=1),
             'timeframe': timedelta(minutes=20),
@@ -336,7 +338,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'timeframe': timedelta(minutes=20),
             'timestamp_field': 'timestamp'
@@ -369,7 +371,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'kibana_discover_columns': ['level', 'message'],
             'timestamp_field': 'timestamp'
@@ -402,7 +404,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'filter': [
@@ -453,7 +455,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': '90943e30-9a47-11e8-b64d-95841ca0b247',
             'timestamp_field': 'timestamp',
             'filter': [
@@ -507,7 +509,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'geo.dest'
@@ -567,7 +569,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'geo.dest'
@@ -629,7 +631,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'status'
@@ -679,7 +681,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'status'
@@ -728,7 +730,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'compound_query_key': ['geo.src', 'geo.dest'],
@@ -816,7 +818,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'filter': [
@@ -893,7 +895,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.13',
+            'kibana_discover_version': '8.15',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'filter': [