watson/umami
1
0
Fork 0
mirror of https://github.com/umami-software/umami.git synced 2026-02-19 12:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

update data format

Browse source
This commit is contained in:
Viet-Tien Ngoc 2024-06-25 14:41:31 +07:00
parent d2658458aa
commit 3076729d7a
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/lib/clickhouse.ts
View file

@ -32,7 +32,7 @@ function getClient() {
} = new URL(process.env.CLICKHOUSE_URL); } = new URL(process.env.CLICKHOUSE_URL);
const client = createClient({ const client = createClient({
host: `${protocol}//${hostname}:${port}`, url: `${protocol}//${hostname}:${port}`,
database: pathname.replace('/', ''), database: pathname.replace('/', ''),
username: username, username: username,
password, password,

4
src/lib/kafka.ts
View file

@ -19,7 +19,7 @@ function getClient() {
? { ? {
ssl: true, ssl: true,
sasl: { sasl: {
mechanism: 'scram-sha-256', mechanism: 'plain',
username, username,
password, password,
}, },
@ -57,7 +57,7 @@ async function getProducer(): Promise<Producer> {
} }
function getDateFormat(date: Date, format?: string): string { function getDateFormat(date: Date, format?: string): string {
return dateFormat(date, format ? format : 'UTC:yyyy-mm-dd HH:MM:ss'); return dateFormat(date, format ? format : 'yyyy-mm-dd HH:MM:ss');
} }
async function sendMessage( async function sendMessage(

2
src/queries/analytics/eventData/saveEventData.ts
View file

@ -75,7 +75,7 @@ async function clickhouseQuery(data: {
string_value: getStringValue(value, dataType), string_value: getStringValue(value, dataType),
number_value: dataType === DATA_TYPE.number ? value : null, number_value: dataType === DATA_TYPE.number ? value : null,
date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null, date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null,
created_at: createdAt, created_at: createdAt ?? getDateFormat(new Date()),
}; };
}); });

2
src/queries/analytics/sessions/saveSessionData.ts
View file

@ -94,7 +94,7 @@ async function clickhouseQuery(data: {
string_value: getStringValue(value, dataType), string_value: getStringValue(value, dataType),
number_value: dataType === DATA_TYPE.number ? value : null, number_value: dataType === DATA_TYPE.number ? value : null,
date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null, date_value: dataType === DATA_TYPE.date ? getDateFormat(value) : null,
created_at: createdAt, created_at: createdAt ?? getDateFormat(new Date()),
}; };
}); });

1
src/tracker/index.d.ts vendored
View file

@ -146,6 +146,7 @@ export type UmamiTracker = {
*/ */
(eventFunction: CustomEventFunction): Promise<string>; (eventFunction: CustomEventFunction): Promise<string>;
}; };
identify: (data: { [key: string]: number | string | number[] | string[] }) => Promise<string>;
}; };
interface Window { interface Window {