From b81712dd07ff477c925cf1ab2765f70078c852e8 Mon Sep 17 00:00:00 2001 From: RasonJ <145287540+RasonJ@users.noreply.github.com> Date: Wed, 22 May 2024 04:35:34 -0700 Subject: [PATCH 1/4] schema updates --- src/main/resources/events-mapping.json | 119 ++++++------------------ src/main/resources/queries-mapping.json | 34 ++----- 2 files changed, 34 insertions(+), 119 deletions(-) diff --git a/src/main/resources/events-mapping.json b/src/main/resources/events-mapping.json index 705cfd2..1a96752 100644 --- a/src/main/resources/events-mapping.json +++ b/src/main/resources/events-mapping.json @@ -1,114 +1,49 @@ { "properties": { - "action_name": { - "type": "keyword" - }, - "user_id": { - "type": "keyword" - }, - "query_id": { - "type": "keyword" - }, - "page_id": { - "type": "keyword" - }, - "message": { - "type": "keyword" - }, - "message_type": { - "type": "keyword" - }, + "application": { "type": "keyword", "ignore_above": 256 }, + "action_name": { "type": "keyword", "ignore_above": 100 }, + "client_id": { "type": "keyword", "ignore_above": 100 }, + "message": { "type": "keyword", "ignore_above": 1024 }, + "message_type": { "type": "keyword", "ignore_above": 100 }, "timestamp": { "type": "date", + "format":"rfc3339_lenient||epoch_millis", + "ignore_malformed": true, "doc_values": true }, "event_attributes": { "properties": { - "user_name": { - "type": "keyword" - }, - "user_id": { - "type": "keyword" - }, - "email": { - "type": "keyword" - }, - "price": { - "type": "float" - }, - "ip": { - "type": "ip", - "ignore_malformed": true - }, - "browser": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword" - } - } + "dwell_time": { "type": "integer" }, + "ip": { "type": "ip", "ignore_malformed": true }, + "browser": { "type": "text", + "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } } }, "position": { "properties": { - "ordinal": { - "type": "integer" - }, - "x": { - "type": "integer" - }, - "y": { - "type": "integer" - }, - "page_depth": { - "type": "integer" - }, - "scroll_depth": { - "type": "integer" - }, - "trail": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword" - } + "ordinal": { "type": "integer" }, + "x": { "type": "integer" }, + "y": { "type": "integer" }, + "page_depth": { "type": "integer" }, + "scroll_depth": { "type": "integer" }, + "trail": { "type": "text", + "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } } } } }, "object": { "properties": { - "key_value": { - "type": "keyword" - }, - "object_id": { - "type": "keyword" - }, - "object_type": { - "type": "keyword" - }, - "transaction_id": { - "type": "keyword" - }, - "name": { - "type": "keyword" - }, - "description": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword" - } - } - }, - "to_user_id": { - "type": "keyword" - }, - "object_detail": { - "type": "text" - } + "internal_id": { "type": "keyword" }, + "object_id": { "type": "keyword", "ignore_above": 256 }, + "object_type": { "type": "keyword", "ignore_above": 100 }, + "name": { "type": "keyword", "ignore_above": 256 }, + "description": { "type": "text", + "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } } + }, + "object_detail": { "type": "flat_object" } } } } } } -} +} \ No newline at end of file diff --git a/src/main/resources/queries-mapping.json b/src/main/resources/queries-mapping.json index 298a18c..29590e8 100644 --- a/src/main/resources/queries-mapping.json +++ b/src/main/resources/queries-mapping.json @@ -1,31 +1,11 @@ { "dynamic": false, "properties": { - "timestamp": { - "type": "date" - }, - "query_id": { - "type": "keyword" - }, - "query": { - "type": "text" - }, - "query_response_id": { - "type": "keyword" - }, - "query_response_object_ids": { - "type": "keyword" - }, - "user_id": { - "type": "keyword" - }, - "user_query": { - "type": "text", - "fields": { - "keyword": { - "type": "keyword" - } - } - } + "timestamp": { "type": "date" }, + "query_id": { "type": "keyword", "ignore_above": 100 }, + "query": { "type": "flat_object" }, + "query_response_id": { "type": "keyword", "ignore_above": 100 }, + "query_response_hit_ids": { "type": "keyword" }, + "client_id": { "type": "keyword", "ignore_above": 100 } } -} \ No newline at end of file +} From d388d26a6f2803df6ce507fc924b7aa916298707 Mon Sep 17 00:00:00 2001 From: RasonJ <145287540+RasonJ@users.noreply.github.com> Date: Wed, 22 May 2024 04:47:44 -0700 Subject: [PATCH 2/4] Adding user query and query attributes --- src/main/resources/queries-mapping.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/queries-mapping.json b/src/main/resources/queries-mapping.json index 29590e8..4b8c41a 100644 --- a/src/main/resources/queries-mapping.json +++ b/src/main/resources/queries-mapping.json @@ -6,6 +6,10 @@ "query": { "type": "flat_object" }, "query_response_id": { "type": "keyword", "ignore_above": 100 }, "query_response_hit_ids": { "type": "keyword" }, + "user_query": { "type": "text", + "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } } + }, + "query_attributes": { "type": "flat_object" }, "client_id": { "type": "keyword", "ignore_above": 100 } } } From 9852b6d59772d01c6eaea80686699d13f1f48ee3 Mon Sep 17 00:00:00 2001 From: RasonJ <145287540+RasonJ@users.noreply.github.com> Date: Thu, 23 May 2024 08:33:31 -0700 Subject: [PATCH 3/4] make explicitly dynamic --- src/main/resources/events-mapping.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/events-mapping.json b/src/main/resources/events-mapping.json index 1a96752..5ac9120 100644 --- a/src/main/resources/events-mapping.json +++ b/src/main/resources/events-mapping.json @@ -1,4 +1,5 @@ { + "dynamic": true, "properties": { "application": { "type": "keyword", "ignore_above": 256 }, "action_name": { "type": "keyword", "ignore_above": 100 }, From d99d394e19f5c279354605f25a233d6070951fd5 Mon Sep 17 00:00:00 2001 From: RasonJ <145287540+RasonJ@users.noreply.github.com> Date: Tue, 28 May 2024 14:23:30 -0700 Subject: [PATCH 4/4] moved dynamic attribute to event_attributes and renamed `object_type` to `object_id_field` --- src/main/resources/events-mapping.json | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/resources/events-mapping.json b/src/main/resources/events-mapping.json index 5ac9120..da9cbbd 100644 --- a/src/main/resources/events-mapping.json +++ b/src/main/resources/events-mapping.json @@ -1,5 +1,4 @@ { - "dynamic": true, "properties": { "application": { "type": "keyword", "ignore_above": 256 }, "action_name": { "type": "keyword", "ignore_above": 100 }, @@ -13,12 +12,8 @@ "doc_values": true }, "event_attributes": { + "dynamic": true, "properties": { - "dwell_time": { "type": "integer" }, - "ip": { "type": "ip", "ignore_malformed": true }, - "browser": { "type": "text", - "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } } - }, "position": { "properties": { "ordinal": { "type": "integer" }, @@ -36,7 +31,7 @@ "properties": { "internal_id": { "type": "keyword" }, "object_id": { "type": "keyword", "ignore_above": 256 }, - "object_type": { "type": "keyword", "ignore_above": 100 }, + "object_id_field": { "type": "keyword", "ignore_above": 100 }, "name": { "type": "keyword", "ignore_above": 256 }, "description": { "type": "text", "fields": { "keyword": { "type": "keyword", "ignore_above": 256 } }