Skip to content

armgit / umami

Public Imported from GitHub
0

Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.

allow event data CH

Brian Cao7c05a54ffe4e
diff --git a/db/clickhouse/migrations/01_init/migration.sql b/db/clickhouse/migrations/01_init/migration.sql
index d83ebdab6..2cca9b843 100644
--- a/db/clickhouse/migrations/01_init/migration.sql
+++ b/db/clickhouse/migrations/01_init/migration.sql
@@ -94,7 +94,7 @@ CREATE TABLE event
created_at DateTime('UTC'),
url String,
event_name String,
- event_data String
+ event_data JSON
)
engine = MergeTree PRIMARY KEY (event_uuid, created_at)
ORDER BY (event_uuid, created_at)
diff --git a/queries/analytics/event/saveEvent.js b/queries/analytics/event/saveEvent.js
index 6391868c6..2c09f05d9 100644
--- a/queries/analytics/event/saveEvent.js
+++ b/queries/analytics/event/saveEvent.js
@@ -31,15 +31,19 @@ async function relationalQuery(website_id, { session_id, url, event_name, event_
});
}
-async function clickhouseQuery(website_id, { event_uuid, session_uuid, url, event_name }) {
+async function clickhouseQuery(
+ website_id,
+ { event_uuid, session_uuid, url, event_name, event_data },
+) {
const { getDateFormat, sendMessage } = kafka;
const params = {
- event_uuid: event_uuid,
- website_id: website_id,
- session_uuid: session_uuid,
+ event_uuid,
+ website_id,
+ session_uuid,
created_at: getDateFormat(new Date()),
url: url?.substring(0, URL_LENGTH),
event_name: event_name?.substring(0, EVENT_NAME_LENGTH),
+ event_data: JSON.stringify(event_data),
};
await sendMessage(params, 'event');