Merge pull request #763 from nsano-rururu/kibana_discover_810

Kibana Discover support kibana 8.1
jertel · Mar 9, 2022 · 622eb19 · 622eb19
2 parents ee4f999 + bda4188
commit 622eb19
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@
 ## Breaking changes
 
 ## New features
+- Add support for Kibana 8.1 for Kibana Discover - [#763](https://github.com/jertel/elastalert2/pull/763) - @nsano-rururu
 
 ## Other changes
 

diff --git a/docs/source/ruletypes.rst b/docs/source/ruletypes.rst
@@ -674,7 +674,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.0`, `8.1`
 
 ``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.0', '8.1'
         ])
 
 def generate_kibana_discover_url(rule, match):

diff --git a/elastalert/schema.yaml b/elastalert/schema.yaml
@@ -257,7 +257,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.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.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
@@ -24,7 +24,7 @@
     '7.15',
     '7.16',
     '8.0',
-    '8.0',
+    '8.1'
 ])
 def test_generate_kibana_discover_url_with_kibana_7x(kibana_version):
     url = generate_kibana_discover_url(
@@ -62,7 +62,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': '620ad0e6-43df-4557-bda2-384960fa9086',
             'timestamp_field': 'timestamp'
         },
@@ -108,7 +108,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs',
             'timestamp_field': 'timestamp',
             'name': 'test'
@@ -124,7 +124,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.0',
+            'kibana_discover_version': '8.1',
             'timestamp_field': 'timestamp',
             'name': 'test'
         },
@@ -158,7 +158,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'timestamp_field': 'timestamp'
         },
@@ -190,7 +190,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_from_timedelta': timedelta(hours=1),
             'timestamp_field': 'timestamp'
@@ -223,7 +223,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_from_timedelta': timedelta(hours=1),
             'timeframe': timedelta(minutes=20),
@@ -257,7 +257,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_to_timedelta': timedelta(hours=1),
             'timestamp_field': 'timestamp'
@@ -290,7 +290,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'kibana_discover_to_timedelta': timedelta(hours=1),
             'timeframe': timedelta(minutes=20),
@@ -324,7 +324,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'd6cabfb6-aaef-44ea-89c5-600e9a76991a',
             'timeframe': timedelta(minutes=20),
             'timestamp_field': 'timestamp'
@@ -357,7 +357,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'kibana_discover_columns': ['level', 'message'],
             'timestamp_field': 'timestamp'
@@ -390,7 +390,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'filter': [
@@ -441,7 +441,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': '90943e30-9a47-11e8-b64d-95841ca0b247',
             'timestamp_field': 'timestamp',
             'filter': [
@@ -495,7 +495,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'geo.dest'
@@ -555,7 +555,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'geo.dest'
@@ -617,7 +617,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'status'
@@ -667,7 +667,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'query_key': 'status'
@@ -716,7 +716,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'compound_query_key': ['geo.src', 'geo.dest'],
@@ -804,7 +804,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'filter': [
@@ -881,7 +881,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.0',
+            'kibana_discover_version': '8.1',
             'kibana_discover_index_pattern_id': 'logs-*',
             'timestamp_field': 'timestamp',
             'filter': [