@perses-dev/clickhouse-plugin 0.6.0-rc.0 → 0.6.0

package/lib/cjs/model/click-house-client.js

@@ -14,19 +14,36 @@
 Object.defineProperty(exports, "__esModule", {
     value: true
 });
-Object.defineProperty(exports, "query", {
-    enumerable: true,
-    get: function() {
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: Object.getOwnPropertyDescriptor(all, name).get
+    });
+}
+_export(exports, {
+    get formatClickHouseDateTime () {
+        return formatClickHouseDateTime;
+    },
+    get query () {
         return query;
+    },
+    get replaceTimeRangePlaceholders () {
+        return replaceTimeRangePlaceholders;
     }
 });
+function replaceTimeRangePlaceholders(query, start, end) {
+    return query.replaceAll('{start}', start ?? '{start}').replaceAll('{end}', end ?? '{end}');
+}
+function formatClickHouseDateTime(date) {
+    return date.toISOString().replace('T', ' ').replace(/\.\d{3}Z$/, '');
+}
 async function query(params, queryOptions) {
     const { datasourceUrl, headers } = queryOptions;
     const url = urlBuilder(datasourceUrl);
     if (!params.query) {
         throw new Error('No query provided in params');
     }
-    let finalQuery = params.query.trim();
+    let finalQuery = replaceTimeRangePlaceholders(params.query.trim(), params.start, params.end);
     if (!finalQuery.toUpperCase().includes('FORMAT')) {
         finalQuery += ' FORMAT JSON';
     }

package/lib/cjs/queries/click-house-log-query/get-click-house-log-data.js

@@ -21,6 +21,7 @@ Object.defineProperty(exports, "getClickHouseLogData", {
     }
 });
 const _pluginsystem = require("@perses-dev/plugin-system");
+const _clickhouseclient = require("../../model/click-house-client");
 const _constants = require("../constants");
 function flattenObject(obj, parentKey = '', result = {}) {
     for (const [key, value] of Object.entries(obj)){
@@ -71,10 +72,13 @@ const getClickHouseLogData = async (spec, context)=>{
     const query = (0, _pluginsystem.replaceVariables)(spec.query, context.variableState);
     const client = await context.datasourceStore.getDatasourceClient(spec.datasource ?? _constants.DEFAULT_DATASOURCE);
     const { start, end } = context.timeRange;
+    const startTime = (0, _clickhouseclient.formatClickHouseDateTime)(start);
+    const endTime = (0, _clickhouseclient.formatClickHouseDateTime)(end);
+    const executedQueryString = (0, _clickhouseclient.replaceTimeRangePlaceholders)(query, startTime, endTime);
     const response = await client.query({
-        start: start.getTime().toString(),
-        end: end.getTime().toString(),
-        query
+        start: startTime,
+        end: endTime,
+        query: executedQueryString
     });
     return {
         timeRange: {
@@ -83,7 +87,7 @@ const getClickHouseLogData = async (spec, context)=>{
         },
         logs: convertStreamsToLogs(response.data),
         metadata: {
-            executedQueryString: query
+            executedQueryString
         }
     };
 };

package/lib/cjs/queries/click-house-time-series-query/get-click-house-data.js

@@ -22,25 +22,68 @@ Object.defineProperty(exports, "getTimeSeriesData", {
 });
 const _pluginsystem = require("@perses-dev/plugin-system");
 const _constants = require("../constants");
+const _clickhouseclient = require("../../model/click-house-client");
+const DEFAULT_STEP_MS = 30 * 1000;
 function buildTimeSeries(response) {
     const data = response?.data;
     if (!response || !data || data.length === 0) {
         return [];
     }
-    const values = data.map((row)=>{
-        const timestamp = new Date(row.time).getTime();
-        const value = Number(row.log_count);
-        return [
-            timestamp,
-            value
-        ];
-    });
-    return [
-        {
-            name: 'log_count',
+    const metricNames = Object.keys(data[0] ?? {}).filter((key)=>key !== 'time');
+    return metricNames.map((metricName)=>{
+        const values = data.map((row)=>{
+            const timestamp = new Date(row.time).getTime();
+            const value = toTimeSeriesValue(row[metricName]);
+            return [
+                timestamp,
+                value
+            ];
+        });
+        return {
+            name: metricName,
             values
+        };
+    }).filter((series)=>series.values.some(([, value])=>value !== null));
+}
+function toTimeSeriesValue(value) {
+    if (value === null || value === undefined || value === '') {
+        return null;
+    }
+    const numericValue = Number(value);
+    return Number.isFinite(numericValue) ? numericValue : null;
+}
+function inferStepMs(response) {
+    const data = response?.data;
+    if (!response || !data || data.length < 2) {
+        return DEFAULT_STEP_MS;
+    }
+    const timestamps = data.map((row)=>new Date(row.time).getTime()).filter(Number.isFinite).sort((a, b)=>a - b);
+    if (timestamps.length < 2) {
+        return DEFAULT_STEP_MS;
+    }
+    const deltas = [];
+    for(let i = 1; i < timestamps.length; i++){
+        const previous = timestamps[i - 1];
+        const current = timestamps[i];
+        if (previous === undefined || current === undefined || current <= previous) {
+            continue;
+        }
+        deltas.push(current - previous);
+    }
+    if (deltas.length === 0) {
+        return DEFAULT_STEP_MS;
+    }
+    const deltaCounts = new Map();
+    for (const delta of deltas){
+        deltaCounts.set(delta, (deltaCounts.get(delta) ?? 0) + 1);
+    }
+    const inferredStep = Array.from(deltaCounts.entries()).sort(([deltaA, countA], [deltaB, countB])=>{
+        if (countA !== countB) {
+            return countB - countA;
         }
-    ];
+        return deltaB - deltaA;
+    })[0]?.[0];
+    return inferredStep ?? DEFAULT_STEP_MS;
 }
 const getTimeSeriesData = async (spec, context)=>{
     if (spec.query === undefined || spec.query === null || spec.query === '') {
@@ -51,10 +94,13 @@ const getTimeSeriesData = async (spec, context)=>{
     const query = (0, _pluginsystem.replaceVariables)(spec.query, context.variableState);
     const client = await context.datasourceStore.getDatasourceClient(spec.datasource ?? _constants.DEFAULT_DATASOURCE);
     const { start, end } = context.timeRange;
+    const startTime = (0, _clickhouseclient.formatClickHouseDateTime)(start);
+    const endTime = (0, _clickhouseclient.formatClickHouseDateTime)(end);
+    const executedQueryString = (0, _clickhouseclient.replaceTimeRangePlaceholders)(query, startTime, endTime);
     const response = await client.query({
-        start: start.getTime().toString(),
-        end: end.getTime().toString(),
-        query
+        start: startTime,
+        end: endTime,
+        query: executedQueryString
     });
     return {
         series: buildTimeSeries(response),
@@ -62,9 +108,9 @@ const getTimeSeriesData = async (spec, context)=>{
             start,
             end
         },
-        stepMs: 30 * 1000,
+        stepMs: inferStepMs(response),
         metadata: {
-            executedQueryString: query
+            executedQueryString
         }
     };
 };

package/lib/model/click-house-client.d.ts

@@ -1,6 +1,8 @@
 import { RequestHeaders } from '@perses-dev/client';
 export interface ClickHouseQueryParams {
     query: string;
+    start?: string;
+    end?: string;
     database?: string;
 }
 export interface ClickHouseQueryOptions {
@@ -18,5 +20,7 @@ export interface ClickHouseClient {
         query: string;
     }) => Promise<ClickHouseQueryResponse>;
 }
+export declare function replaceTimeRangePlaceholders(query: string, start?: string, end?: string): string;
+export declare function formatClickHouseDateTime(date: Date): string;
 export declare function query(params: ClickHouseQueryParams, queryOptions: ClickHouseQueryOptions): Promise<ClickHouseQueryResponse>;
 //# sourceMappingURL=click-house-client.d.ts.map

package/lib/model/click-house-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"click-house-client.d.ts","sourceRoot":"","sources":["../../../src/model/click-house-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACpG;AAED,wBAAsB,KAAK,CACzB,MAAM,EAAE,qBAAqB,EAC7B,YAAY,EAAE,sBAAsB,GACnC,OAAO,CAAC,uBAAuB,CAAC,CA4ClC"}
+{"version":3,"file":"click-house-client.d.ts","sourceRoot":"","sources":["../../../src/model/click-house-client.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,WAAW,qBAAqB;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACrC,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED,MAAM,WAAW,uBAAuB;IACtC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC;IAC5B,IAAI,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,uBAAuB,CAAC,CAAC;CACpG;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAEhG;AAED,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAK3D;AAED,wBAAsB,KAAK,CACzB,MAAM,EAAE,qBAAqB,EAC7B,YAAY,EAAE,sBAAsB,GACnC,OAAO,CAAC,uBAAuB,CAAC,CA4ClC"}

package/lib/model/click-house-client.js

@@ -10,13 +10,19 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+export function replaceTimeRangePlaceholders(query, start, end) {
+    return query.replaceAll('{start}', start ?? '{start}').replaceAll('{end}', end ?? '{end}');
+}
+export function formatClickHouseDateTime(date) {
+    return date.toISOString().replace('T', ' ').replace(/\.\d{3}Z$/, '');
+}
 export async function query(params, queryOptions) {
     const { datasourceUrl, headers } = queryOptions;
     const url = urlBuilder(datasourceUrl);
     if (!params.query) {
         throw new Error('No query provided in params');
     }
-    let finalQuery = params.query.trim();
+    let finalQuery = replaceTimeRangePlaceholders(params.query.trim(), params.start, params.end);
     if (!finalQuery.toUpperCase().includes('FORMAT')) {
         finalQuery += ' FORMAT JSON';
     }

package/lib/model/click-house-client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/model/click-house-client.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { RequestHeaders } from '@perses-dev/client';\n\nexport interface ClickHouseQueryParams {\n  query: string;\n  database?: string;\n}\n\nexport interface ClickHouseQueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface ClickHouseQueryResponse {\n  status: 'success' | 'error';\n  data: unknown;\n}\n\nexport interface ClickHouseClient {\n  query: (params: { start: string; end: string; query: string }) => Promise<ClickHouseQueryResponse>;\n}\n\nexport async function query(\n  params: ClickHouseQueryParams,\n  queryOptions: ClickHouseQueryOptions\n): Promise<ClickHouseQueryResponse> {\n  const { datasourceUrl, headers } = queryOptions;\n\n  const url = urlBuilder(datasourceUrl);\n  if (!params.query) {\n    throw new Error('No query provided in params');\n  }\n\n  let finalQuery = params.query.trim();\n  if (!finalQuery.toUpperCase().includes('FORMAT')) {\n    finalQuery += ' FORMAT JSON';\n  }\n\n  url.searchParams.set('query', finalQuery);\n  url.searchParams.set('database', params.database || 'default');\n\n  const init = {\n    method: 'GET',\n    headers: {\n      ...headers,\n    },\n  };\n\n  try {\n    const response = await fetch(url.toString(), init);\n\n    if (!response.ok) {\n      const errorText = await response.text();\n      console.error('ClickHouse error response:', errorText);\n      return {\n        status: 'error',\n        data: [],\n      };\n    }\n\n    const body = await response.json();\n\n    return {\n      status: 'success',\n      data: body.data || body,\n    };\n  } catch (e) {\n    throw new Error(`ClickHouse query failed: ${e}`);\n  }\n}\n\nfunction urlBuilder(datasourceUrl: string): URL {\n  if (datasourceUrl.startsWith('http://') || datasourceUrl.startsWith('https://')) {\n    return new URL(datasourceUrl);\n  }\n  // if relative path (e.g. proxy url), resolve against window.location.origin\n  return new URL(datasourceUrl, window.location.origin);\n}\n"],"names":["query","params","queryOptions","datasourceUrl","headers","url","urlBuilder","Error","finalQuery","trim","toUpperCase","includes","searchParams","set","database","init","method","response","fetch","toString","ok","errorText","text","console","error","status","data","body","json","e","startsWith","URL","window","location","origin"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAuBjC,OAAO,eAAeA,MACpBC,MAA6B,EAC7BC,YAAoC;IAEpC,MAAM,EAAEC,aAAa,EAAEC,OAAO,EAAE,GAAGF;IAEnC,MAAMG,MAAMC,WAAWH;IACvB,IAAI,CAACF,OAAOD,KAAK,EAAE;QACjB,MAAM,IAAIO,MAAM;IAClB;IAEA,IAAIC,aAAaP,OAAOD,KAAK,CAACS,IAAI;IAClC,IAAI,CAACD,WAAWE,WAAW,GAAGC,QAAQ,CAAC,WAAW;QAChDH,cAAc;IAChB;IAEAH,IAAIO,YAAY,CAACC,GAAG,CAAC,SAASL;IAC9BH,IAAIO,YAAY,CAACC,GAAG,CAAC,YAAYZ,OAAOa,QAAQ,IAAI;IAEpD,MAAMC,OAAO;QACXC,QAAQ;QACRZ,SAAS;YACP,GAAGA,OAAO;QACZ;IACF;IAEA,IAAI;QACF,MAAMa,WAAW,MAAMC,MAAMb,IAAIc,QAAQ,IAAIJ;QAE7C,IAAI,CAACE,SAASG,EAAE,EAAE;YAChB,MAAMC,YAAY,MAAMJ,SAASK,IAAI;YACrCC,QAAQC,KAAK,CAAC,8BAA8BH;YAC5C,OAAO;gBACLI,QAAQ;gBACRC,MAAM,EAAE;YACV;QACF;QAEA,MAAMC,OAAO,MAAMV,SAASW,IAAI;QAEhC,OAAO;YACLH,QAAQ;YACRC,MAAMC,KAAKD,IAAI,IAAIC;QACrB;IACF,EAAE,OAAOE,GAAG;QACV,MAAM,IAAItB,MAAM,CAAC,yBAAyB,EAAEsB,GAAG;IACjD;AACF;AAEA,SAASvB,WAAWH,aAAqB;IACvC,IAAIA,cAAc2B,UAAU,CAAC,cAAc3B,cAAc2B,UAAU,CAAC,aAAa;QAC/E,OAAO,IAAIC,IAAI5B;IACjB;IACA,4EAA4E;IAC5E,OAAO,IAAI4B,IAAI5B,eAAe6B,OAAOC,QAAQ,CAACC,MAAM;AACtD"}
+{"version":3,"sources":["../../../src/model/click-house-client.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { RequestHeaders } from '@perses-dev/client';\n\nexport interface ClickHouseQueryParams {\n  query: string;\n  start?: string;\n  end?: string;\n  database?: string;\n}\n\nexport interface ClickHouseQueryOptions {\n  datasourceUrl: string;\n  headers?: RequestHeaders;\n}\n\nexport interface ClickHouseQueryResponse {\n  status: 'success' | 'error';\n  data: unknown;\n}\n\nexport interface ClickHouseClient {\n  query: (params: { start: string; end: string; query: string }) => Promise<ClickHouseQueryResponse>;\n}\n\nexport function replaceTimeRangePlaceholders(query: string, start?: string, end?: string): string {\n  return query.replaceAll('{start}', start ?? '{start}').replaceAll('{end}', end ?? '{end}');\n}\n\nexport function formatClickHouseDateTime(date: Date): string {\n  return date\n    .toISOString()\n    .replace('T', ' ')\n    .replace(/\\.\\d{3}Z$/, '');\n}\n\nexport async function query(\n  params: ClickHouseQueryParams,\n  queryOptions: ClickHouseQueryOptions\n): Promise<ClickHouseQueryResponse> {\n  const { datasourceUrl, headers } = queryOptions;\n\n  const url = urlBuilder(datasourceUrl);\n  if (!params.query) {\n    throw new Error('No query provided in params');\n  }\n\n  let finalQuery = replaceTimeRangePlaceholders(params.query.trim(), params.start, params.end);\n  if (!finalQuery.toUpperCase().includes('FORMAT')) {\n    finalQuery += ' FORMAT JSON';\n  }\n\n  url.searchParams.set('query', finalQuery);\n  url.searchParams.set('database', params.database || 'default');\n\n  const init = {\n    method: 'GET',\n    headers: {\n      ...headers,\n    },\n  };\n\n  try {\n    const response = await fetch(url.toString(), init);\n\n    if (!response.ok) {\n      const errorText = await response.text();\n      console.error('ClickHouse error response:', errorText);\n      return {\n        status: 'error',\n        data: [],\n      };\n    }\n\n    const body = await response.json();\n\n    return {\n      status: 'success',\n      data: body.data || body,\n    };\n  } catch (e) {\n    throw new Error(`ClickHouse query failed: ${e}`);\n  }\n}\n\nfunction urlBuilder(datasourceUrl: string): URL {\n  if (datasourceUrl.startsWith('http://') || datasourceUrl.startsWith('https://')) {\n    return new URL(datasourceUrl);\n  }\n  // if relative path (e.g. proxy url), resolve against window.location.origin\n  return new URL(datasourceUrl, window.location.origin);\n}\n"],"names":["replaceTimeRangePlaceholders","query","start","end","replaceAll","formatClickHouseDateTime","date","toISOString","replace","params","queryOptions","datasourceUrl","headers","url","urlBuilder","Error","finalQuery","trim","toUpperCase","includes","searchParams","set","database","init","method","response","fetch","toString","ok","errorText","text","console","error","status","data","body","json","e","startsWith","URL","window","location","origin"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAyBjC,OAAO,SAASA,6BAA6BC,KAAa,EAAEC,KAAc,EAAEC,GAAY;IACtF,OAAOF,MAAMG,UAAU,CAAC,WAAWF,SAAS,WAAWE,UAAU,CAAC,SAASD,OAAO;AACpF;AAEA,OAAO,SAASE,yBAAyBC,IAAU;IACjD,OAAOA,KACJC,WAAW,GACXC,OAAO,CAAC,KAAK,KACbA,OAAO,CAAC,aAAa;AAC1B;AAEA,OAAO,eAAeP,MACpBQ,MAA6B,EAC7BC,YAAoC;IAEpC,MAAM,EAAEC,aAAa,EAAEC,OAAO,EAAE,GAAGF;IAEnC,MAAMG,MAAMC,WAAWH;IACvB,IAAI,CAACF,OAAOR,KAAK,EAAE;QACjB,MAAM,IAAIc,MAAM;IAClB;IAEA,IAAIC,aAAahB,6BAA6BS,OAAOR,KAAK,CAACgB,IAAI,IAAIR,OAAOP,KAAK,EAAEO,OAAON,GAAG;IAC3F,IAAI,CAACa,WAAWE,WAAW,GAAGC,QAAQ,CAAC,WAAW;QAChDH,cAAc;IAChB;IAEAH,IAAIO,YAAY,CAACC,GAAG,CAAC,SAASL;IAC9BH,IAAIO,YAAY,CAACC,GAAG,CAAC,YAAYZ,OAAOa,QAAQ,IAAI;IAEpD,MAAMC,OAAO;QACXC,QAAQ;QACRZ,SAAS;YACP,GAAGA,OAAO;QACZ;IACF;IAEA,IAAI;QACF,MAAMa,WAAW,MAAMC,MAAMb,IAAIc,QAAQ,IAAIJ;QAE7C,IAAI,CAACE,SAASG,EAAE,EAAE;YAChB,MAAMC,YAAY,MAAMJ,SAASK,IAAI;YACrCC,QAAQC,KAAK,CAAC,8BAA8BH;YAC5C,OAAO;gBACLI,QAAQ;gBACRC,MAAM,EAAE;YACV;QACF;QAEA,MAAMC,OAAO,MAAMV,SAASW,IAAI;QAEhC,OAAO;YACLH,QAAQ;YACRC,MAAMC,KAAKD,IAAI,IAAIC;QACrB;IACF,EAAE,OAAOE,GAAG;QACV,MAAM,IAAItB,MAAM,CAAC,yBAAyB,EAAEsB,GAAG;IACjD;AACF;AAEA,SAASvB,WAAWH,aAAqB;IACvC,IAAIA,cAAc2B,UAAU,CAAC,cAAc3B,cAAc2B,UAAU,CAAC,aAAa;QAC/E,OAAO,IAAIC,IAAI5B;IACjB;IACA,4EAA4E;IAC5E,OAAO,IAAI4B,IAAI5B,eAAe6B,OAAOC,QAAQ,CAACC,MAAM;AACtD"}

package/lib/model/click-house-data-types.d.ts

@@ -4,6 +4,6 @@ export interface ClickHouseTimeSeriesData extends TimeSeriesData {
 }
 export interface TimeSeriesEntry {
     time: string;
-    log_count: number | string;
+    [key: string]: number | string | null | undefined;
 }
 //# sourceMappingURL=click-house-data-types.d.ts.map

package/lib/model/click-house-data-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"click-house-data-types.d.ts","sourceRoot":"","sources":["../../../src/model/click-house-data-types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,wBAAyB,SAAQ,cAAc;IAC9D,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5B"}
+{"version":3,"file":"click-house-data-types.d.ts","sourceRoot":"","sources":["../../../src/model/click-house-data-types.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAE3D,MAAM,WAAW,wBAAyB,SAAQ,cAAc;IAC9D,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACnD"}

package/lib/model/click-house-data-types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/model/click-house-data-types.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { LogData, TimeSeriesData } from '@perses-dev/spec';\n\nexport interface ClickHouseTimeSeriesData extends TimeSeriesData {\n  logs?: LogData;\n}\n\nexport interface TimeSeriesEntry {\n  time: string;\n  log_count: number | string;\n}\n"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAQjC,WAGC"}
+{"version":3,"sources":["../../../src/model/click-house-data-types.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { LogData, TimeSeriesData } from '@perses-dev/spec';\n\nexport interface ClickHouseTimeSeriesData extends TimeSeriesData {\n  logs?: LogData;\n}\n\nexport interface TimeSeriesEntry {\n  time: string;\n  [key: string]: number | string | null | undefined;\n}\n"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAQjC,WAGC"}

package/lib/queries/click-house-log-query/get-click-house-log-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-click-house-log-data.d.ts","sourceRoot":"","sources":["../../../../src/queries/click-house-log-query/get-click-house-log-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAoB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAI7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAoDvE,eAAO,MAAM,oBAAoB,EAAE,cAAc,CAAC,sBAAsB,CAAC,CAAC,YAAY,CA6BrF,CAAC"}
+{"version":3,"file":"get-click-house-log-data.d.ts","sourceRoot":"","sources":["../../../../src/queries/click-house-log-query/get-click-house-log-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAoB,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAS7E,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAoDvE,eAAO,MAAM,oBAAoB,EAAE,cAAc,CAAC,sBAAsB,CAAC,CAAC,YAAY,CAgCrF,CAAC"}

package/lib/queries/click-house-log-query/get-click-house-log-data.js

@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 import { replaceVariables } from '@perses-dev/plugin-system';
+import { formatClickHouseDateTime, replaceTimeRangePlaceholders } from '../../model/click-house-client';
 import { DEFAULT_DATASOURCE } from '../constants';
 function flattenObject(obj, parentKey = '', result = {}) {
     for (const [key, value] of Object.entries(obj)){
@@ -61,10 +62,13 @@ export const getClickHouseLogData = async (spec, context)=>{
     const query = replaceVariables(spec.query, context.variableState);
     const client = await context.datasourceStore.getDatasourceClient(spec.datasource ?? DEFAULT_DATASOURCE);
     const { start, end } = context.timeRange;
+    const startTime = formatClickHouseDateTime(start);
+    const endTime = formatClickHouseDateTime(end);
+    const executedQueryString = replaceTimeRangePlaceholders(query, startTime, endTime);
     const response = await client.query({
-        start: start.getTime().toString(),
-        end: end.getTime().toString(),
-        query
+        start: startTime,
+        end: endTime,
+        query: executedQueryString
     });
     return {
         timeRange: {
@@ -73,7 +77,7 @@ export const getClickHouseLogData = async (spec, context)=>{
         },
         logs: convertStreamsToLogs(response.data),
         metadata: {
-            executedQueryString: query
+            executedQueryString
         }
     };
 };

package/lib/queries/click-house-log-query/get-click-house-log-data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/queries/click-house-log-query/get-click-house-log-data.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { replaceVariables, LogQueryPlugin } from '@perses-dev/plugin-system';\nimport { LogData, LogEntry } from '@perses-dev/spec';\nimport { ClickHouseClient, ClickHouseQueryResponse } from '../../model/click-house-client';\nimport { DEFAULT_DATASOURCE } from '../constants';\nimport { ClickHouseLogQuerySpec } from './click-house-log-query-types';\n\nfunction flattenObject(\n  obj: Record<string, unknown>,\n  parentKey = '',\n  result: Record<string, unknown> = {}\n): Record<string, unknown> {\n  for (const [key, value] of Object.entries(obj)) {\n    const newKey = parentKey ? `${parentKey}.${key}` : key;\n    if (value && typeof value === 'object' && !Array.isArray(value)) {\n      flattenObject(value as Record<string, unknown>, newKey, result);\n    } else {\n      result[newKey] = value;\n    }\n  }\n\n  return result;\n}\n\nfunction convertStreamsToLogs(streams: LogEntry[]): LogData {\n  const entries: LogEntry[] = streams.map((entry) => {\n    const flattened = flattenObject(entry as unknown as Record<string, unknown>);\n\n    if (!flattened['Timestamp'] && flattened['log_time']) {\n      flattened['Timestamp'] = flattened['log_time'];\n    }\n\n    const sortedEntry: Record<string, unknown> = {};\n    Object.keys(flattened)\n      .sort((a, b) => a.localeCompare(b))\n      .forEach((key) => {\n        sortedEntry[key] = flattened[key];\n      });\n\n    const line = Object.entries(sortedEntry)\n      .filter(([key]) => key !== 'Timestamp')\n      .map(([key, value]) => `<${key}> ${value === '' || value === null || value === undefined ? '--' : value}`)\n      .join(' ');\n\n    return {\n      timestamp: sortedEntry?.['Timestamp'] as unknown as number,\n      labels: sortedEntry as Record<string, string>,\n      line,\n    } as LogEntry;\n  });\n\n  return {\n    entries,\n    totalCount: entries.length,\n  };\n}\n\nexport const getClickHouseLogData: LogQueryPlugin<ClickHouseLogQuerySpec>['getLogData'] = async (spec, context) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    return {\n      logs: { entries: [], totalCount: 0 },\n      timeRange: { start: context.timeRange.start, end: context.timeRange.end },\n    };\n  }\n\n  const query = replaceVariables(spec.query, context.variableState);\n\n  const client = (await context.datasourceStore.getDatasourceClient(\n    spec.datasource ?? DEFAULT_DATASOURCE\n  )) as ClickHouseClient;\n\n  const { start, end } = context.timeRange;\n\n  const response: ClickHouseQueryResponse = await client.query({\n    start: start.getTime().toString(),\n    end: end.getTime().toString(),\n    query,\n  });\n\n  return {\n    timeRange: { start, end },\n    logs: convertStreamsToLogs(response.data as LogEntry[]),\n    metadata: {\n      executedQueryString: query,\n    },\n  };\n};\n"],"names":["replaceVariables","DEFAULT_DATASOURCE","flattenObject","obj","parentKey","result","key","value","Object","entries","newKey","Array","isArray","convertStreamsToLogs","streams","map","entry","flattened","sortedEntry","keys","sort","a","b","localeCompare","forEach","line","filter","undefined","join","timestamp","labels","totalCount","length","getClickHouseLogData","spec","context","query","logs","timeRange","start","end","variableState","client","datasourceStore","getDatasourceClient","datasource","response","getTime","toString","data","metadata","executedQueryString"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAASA,gBAAgB,QAAwB,4BAA4B;AAG7E,SAASC,kBAAkB,QAAQ,eAAe;AAGlD,SAASC,cACPC,GAA4B,EAC5BC,YAAY,EAAE,EACdC,SAAkC,CAAC,CAAC;IAEpC,KAAK,MAAM,CAACC,KAAKC,MAAM,IAAIC,OAAOC,OAAO,CAACN,KAAM;QAC9C,MAAMO,SAASN,YAAY,GAAGA,UAAU,CAAC,EAAEE,KAAK,GAAGA;QACnD,IAAIC,SAAS,OAAOA,UAAU,YAAY,CAACI,MAAMC,OAAO,CAACL,QAAQ;YAC/DL,cAAcK,OAAkCG,QAAQL;QAC1D,OAAO;YACLA,MAAM,CAACK,OAAO,GAAGH;QACnB;IACF;IAEA,OAAOF;AACT;AAEA,SAASQ,qBAAqBC,OAAmB;IAC/C,MAAML,UAAsBK,QAAQC,GAAG,CAAC,CAACC;QACvC,MAAMC,YAAYf,cAAcc;QAEhC,IAAI,CAACC,SAAS,CAAC,YAAY,IAAIA,SAAS,CAAC,WAAW,EAAE;YACpDA,SAAS,CAAC,YAAY,GAAGA,SAAS,CAAC,WAAW;QAChD;QAEA,MAAMC,cAAuC,CAAC;QAC9CV,OAAOW,IAAI,CAACF,WACTG,IAAI,CAAC,CAACC,GAAGC,IAAMD,EAAEE,aAAa,CAACD,IAC/BE,OAAO,CAAC,CAAClB;YACRY,WAAW,CAACZ,IAAI,GAAGW,SAAS,CAACX,IAAI;QACnC;QAEF,MAAMmB,OAAOjB,OAAOC,OAAO,CAACS,aACzBQ,MAAM,CAAC,CAAC,CAACpB,IAAI,GAAKA,QAAQ,aAC1BS,GAAG,CAAC,CAAC,CAACT,KAAKC,MAAM,GAAK,CAAC,CAAC,EAAED,IAAI,EAAE,EAAEC,UAAU,MAAMA,UAAU,QAAQA,UAAUoB,YAAY,OAAOpB,OAAO,EACxGqB,IAAI,CAAC;QAER,OAAO;YACLC,WAAWX,aAAa,CAAC,YAAY;YACrCY,QAAQZ;YACRO;QACF;IACF;IAEA,OAAO;QACLhB;QACAsB,YAAYtB,QAAQuB,MAAM;IAC5B;AACF;AAEA,OAAO,MAAMC,uBAA6E,OAAOC,MAAMC;IACrG,IAAID,KAAKE,KAAK,KAAKT,aAAaO,KAAKE,KAAK,KAAK,QAAQF,KAAKE,KAAK,KAAK,IAAI;QACxE,OAAO;YACLC,MAAM;gBAAE5B,SAAS,EAAE;gBAAEsB,YAAY;YAAE;YACnCO,WAAW;gBAAEC,OAAOJ,QAAQG,SAAS,CAACC,KAAK;gBAAEC,KAAKL,QAAQG,SAAS,CAACE,GAAG;YAAC;QAC1E;IACF;IAEA,MAAMJ,QAAQpC,iBAAiBkC,KAAKE,KAAK,EAAED,QAAQM,aAAa;IAEhE,MAAMC,SAAU,MAAMP,QAAQQ,eAAe,CAACC,mBAAmB,CAC/DV,KAAKW,UAAU,IAAI5C;IAGrB,MAAM,EAAEsC,KAAK,EAAEC,GAAG,EAAE,GAAGL,QAAQG,SAAS;IAExC,MAAMQ,WAAoC,MAAMJ,OAAON,KAAK,CAAC;QAC3DG,OAAOA,MAAMQ,OAAO,GAAGC,QAAQ;QAC/BR,KAAKA,IAAIO,OAAO,GAAGC,QAAQ;QAC3BZ;IACF;IAEA,OAAO;QACLE,WAAW;YAAEC;YAAOC;QAAI;QACxBH,MAAMxB,qBAAqBiC,SAASG,IAAI;QACxCC,UAAU;YACRC,qBAAqBf;QACvB;IACF;AACF,EAAE"}
+{"version":3,"sources":["../../../../src/queries/click-house-log-query/get-click-house-log-data.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { replaceVariables, LogQueryPlugin } from '@perses-dev/plugin-system';\nimport { LogData, LogEntry } from '@perses-dev/spec';\nimport {\n  ClickHouseClient,\n  ClickHouseQueryResponse,\n  formatClickHouseDateTime,\n  replaceTimeRangePlaceholders,\n} from '../../model/click-house-client';\nimport { DEFAULT_DATASOURCE } from '../constants';\nimport { ClickHouseLogQuerySpec } from './click-house-log-query-types';\n\nfunction flattenObject(\n  obj: Record<string, unknown>,\n  parentKey = '',\n  result: Record<string, unknown> = {}\n): Record<string, unknown> {\n  for (const [key, value] of Object.entries(obj)) {\n    const newKey = parentKey ? `${parentKey}.${key}` : key;\n    if (value && typeof value === 'object' && !Array.isArray(value)) {\n      flattenObject(value as Record<string, unknown>, newKey, result);\n    } else {\n      result[newKey] = value;\n    }\n  }\n\n  return result;\n}\n\nfunction convertStreamsToLogs(streams: LogEntry[]): LogData {\n  const entries: LogEntry[] = streams.map((entry) => {\n    const flattened = flattenObject(entry as unknown as Record<string, unknown>);\n\n    if (!flattened['Timestamp'] && flattened['log_time']) {\n      flattened['Timestamp'] = flattened['log_time'];\n    }\n\n    const sortedEntry: Record<string, unknown> = {};\n    Object.keys(flattened)\n      .sort((a, b) => a.localeCompare(b))\n      .forEach((key) => {\n        sortedEntry[key] = flattened[key];\n      });\n\n    const line = Object.entries(sortedEntry)\n      .filter(([key]) => key !== 'Timestamp')\n      .map(([key, value]) => `<${key}> ${value === '' || value === null || value === undefined ? '--' : value}`)\n      .join(' ');\n\n    return {\n      timestamp: sortedEntry?.['Timestamp'] as unknown as number,\n      labels: sortedEntry as Record<string, string>,\n      line,\n    } as LogEntry;\n  });\n\n  return {\n    entries,\n    totalCount: entries.length,\n  };\n}\n\nexport const getClickHouseLogData: LogQueryPlugin<ClickHouseLogQuerySpec>['getLogData'] = async (spec, context) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    return {\n      logs: { entries: [], totalCount: 0 },\n      timeRange: { start: context.timeRange.start, end: context.timeRange.end },\n    };\n  }\n\n  const query = replaceVariables(spec.query, context.variableState);\n\n  const client = (await context.datasourceStore.getDatasourceClient(\n    spec.datasource ?? DEFAULT_DATASOURCE\n  )) as ClickHouseClient;\n\n  const { start, end } = context.timeRange;\n  const startTime = formatClickHouseDateTime(start);\n  const endTime = formatClickHouseDateTime(end);\n  const executedQueryString = replaceTimeRangePlaceholders(query, startTime, endTime);\n\n  const response: ClickHouseQueryResponse = await client.query({\n    start: startTime,\n    end: endTime,\n    query: executedQueryString,\n  });\n\n  return {\n    timeRange: { start, end },\n    logs: convertStreamsToLogs(response.data as LogEntry[]),\n    metadata: {\n      executedQueryString,\n    },\n  };\n};\n"],"names":["replaceVariables","formatClickHouseDateTime","replaceTimeRangePlaceholders","DEFAULT_DATASOURCE","flattenObject","obj","parentKey","result","key","value","Object","entries","newKey","Array","isArray","convertStreamsToLogs","streams","map","entry","flattened","sortedEntry","keys","sort","a","b","localeCompare","forEach","line","filter","undefined","join","timestamp","labels","totalCount","length","getClickHouseLogData","spec","context","query","logs","timeRange","start","end","variableState","client","datasourceStore","getDatasourceClient","datasource","startTime","endTime","executedQueryString","response","data","metadata"],"mappings":"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"}

package/lib/queries/click-house-time-series-query/get-click-house-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get-click-house-data.d.ts","sourceRoot":"","sources":["../../../../src/queries/click-house-time-series-query/get-click-house-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,qBAAqB,EAAoB,MAAM,2BAA2B,CAAC;AAKpF,OAAO,EAAE,6BAA6B,EAA2B,MAAM,2BAA2B,CAAC;AAsBnG,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CA8BvG,CAAC"}
+{"version":3,"file":"get-click-house-data.d.ts","sourceRoot":"","sources":["../../../../src/queries/click-house-time-series-query/get-click-house-data.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,qBAAqB,EAAoB,MAAM,2BAA2B,CAAC;AAUpF,OAAO,EAAE,6BAA6B,EAA2B,MAAM,2BAA2B,CAAC;AAiFnG,eAAO,MAAM,iBAAiB,EAAE,qBAAqB,CAAC,6BAA6B,CAAC,CAAC,mBAAmB,CAiCvG,CAAC"}

package/lib/queries/click-house-time-series-query/get-click-house-data.js

@@ -12,25 +12,68 @@
 // limitations under the License.
 import { replaceVariables } from '@perses-dev/plugin-system';
 import { DEFAULT_DATASOURCE } from '../constants';
+import { formatClickHouseDateTime, replaceTimeRangePlaceholders } from '../../model/click-house-client';
+const DEFAULT_STEP_MS = 30 * 1000;
 function buildTimeSeries(response) {
     const data = response?.data;
     if (!response || !data || data.length === 0) {
         return [];
     }
-    const values = data.map((row)=>{
-        const timestamp = new Date(row.time).getTime();
-        const value = Number(row.log_count);
-        return [
-            timestamp,
-            value
-        ];
-    });
-    return [
-        {
-            name: 'log_count',
+    const metricNames = Object.keys(data[0] ?? {}).filter((key)=>key !== 'time');
+    return metricNames.map((metricName)=>{
+        const values = data.map((row)=>{
+            const timestamp = new Date(row.time).getTime();
+            const value = toTimeSeriesValue(row[metricName]);
+            return [
+                timestamp,
+                value
+            ];
+        });
+        return {
+            name: metricName,
             values
+        };
+    }).filter((series)=>series.values.some(([, value])=>value !== null));
+}
+function toTimeSeriesValue(value) {
+    if (value === null || value === undefined || value === '') {
+        return null;
+    }
+    const numericValue = Number(value);
+    return Number.isFinite(numericValue) ? numericValue : null;
+}
+function inferStepMs(response) {
+    const data = response?.data;
+    if (!response || !data || data.length < 2) {
+        return DEFAULT_STEP_MS;
+    }
+    const timestamps = data.map((row)=>new Date(row.time).getTime()).filter(Number.isFinite).sort((a, b)=>a - b);
+    if (timestamps.length < 2) {
+        return DEFAULT_STEP_MS;
+    }
+    const deltas = [];
+    for(let i = 1; i < timestamps.length; i++){
+        const previous = timestamps[i - 1];
+        const current = timestamps[i];
+        if (previous === undefined || current === undefined || current <= previous) {
+            continue;
+        }
+        deltas.push(current - previous);
+    }
+    if (deltas.length === 0) {
+        return DEFAULT_STEP_MS;
+    }
+    const deltaCounts = new Map();
+    for (const delta of deltas){
+        deltaCounts.set(delta, (deltaCounts.get(delta) ?? 0) + 1);
+    }
+    const inferredStep = Array.from(deltaCounts.entries()).sort(([deltaA, countA], [deltaB, countB])=>{
+        if (countA !== countB) {
+            return countB - countA;
         }
-    ];
+        return deltaB - deltaA;
+    })[0]?.[0];
+    return inferredStep ?? DEFAULT_STEP_MS;
 }
 export const getTimeSeriesData = async (spec, context)=>{
     if (spec.query === undefined || spec.query === null || spec.query === '') {
@@ -41,10 +84,13 @@ export const getTimeSeriesData = async (spec, context)=>{
     const query = replaceVariables(spec.query, context.variableState);
     const client = await context.datasourceStore.getDatasourceClient(spec.datasource ?? DEFAULT_DATASOURCE);
     const { start, end } = context.timeRange;
+    const startTime = formatClickHouseDateTime(start);
+    const endTime = formatClickHouseDateTime(end);
+    const executedQueryString = replaceTimeRangePlaceholders(query, startTime, endTime);
     const response = await client.query({
-        start: start.getTime().toString(),
-        end: end.getTime().toString(),
-        query
+        start: startTime,
+        end: endTime,
+        query: executedQueryString
     });
     return {
         series: buildTimeSeries(response),
@@ -52,9 +98,9 @@ export const getTimeSeriesData = async (spec, context)=>{
             start,
             end
         },
-        stepMs: 30 * 1000,
+        stepMs: inferStepMs(response),
         metadata: {
-            executedQueryString: query
+            executedQueryString
         }
     };
 };

package/lib/queries/click-house-time-series-query/get-click-house-data.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/queries/click-house-time-series-query/get-click-house-data.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesQueryPlugin, replaceVariables } from '@perses-dev/plugin-system';\nimport { TimeSeries } from '@perses-dev/spec';\nimport { DEFAULT_DATASOURCE } from '../constants';\nimport { TimeSeriesEntry } from '../../model/click-house-data-types';\nimport { ClickHouseClient, ClickHouseQueryResponse } from '../../model/click-house-client';\nimport { ClickHouseTimeSeriesQuerySpec, DatasourceQueryResponse } from './click-house-query-types';\n\nfunction buildTimeSeries(response?: DatasourceQueryResponse): TimeSeries[] {\n  const data = response?.data as TimeSeriesEntry[];\n  if (!response || !data || data.length === 0) {\n    return [];\n  }\n\n  const values: Array<[number, number]> = data.map((row: TimeSeriesEntry) => {\n    const timestamp = new Date(row.time).getTime();\n    const value = Number(row.log_count);\n    return [timestamp, value];\n  });\n\n  return [\n    {\n      name: 'log_count',\n      values,\n    },\n  ];\n}\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<ClickHouseTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\n) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    return { series: [] };\n  }\n\n  const query = replaceVariables(spec.query, context.variableState);\n\n  const client = (await context.datasourceStore.getDatasourceClient(\n    spec.datasource ?? DEFAULT_DATASOURCE\n  )) as ClickHouseClient;\n\n  const { start, end } = context.timeRange;\n\n  const response: ClickHouseQueryResponse = await client.query({\n    start: start.getTime().toString(),\n    end: end.getTime().toString(),\n    query,\n  });\n\n  return {\n    series: buildTimeSeries(response),\n    timeRange: { start, end },\n    stepMs: 30 * 1000,\n    metadata: {\n      executedQueryString: query,\n    },\n  };\n};\n"],"names":["replaceVariables","DEFAULT_DATASOURCE","buildTimeSeries","response","data","length","values","map","row","timestamp","Date","time","getTime","value","Number","log_count","name","getTimeSeriesData","spec","context","query","undefined","series","variableState","client","datasourceStore","getDatasourceClient","datasource","start","end","timeRange","toString","stepMs","metadata","executedQueryString"],"mappings":"AAAA,+BAA+B;AAC/B,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,6CAA6C;AAC7C,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;AAEjC,SAAgCA,gBAAgB,QAAQ,4BAA4B;AAEpF,SAASC,kBAAkB,QAAQ,eAAe;AAKlD,SAASC,gBAAgBC,QAAkC;IACzD,MAAMC,OAAOD,UAAUC;IACvB,IAAI,CAACD,YAAY,CAACC,QAAQA,KAAKC,MAAM,KAAK,GAAG;QAC3C,OAAO,EAAE;IACX;IAEA,MAAMC,SAAkCF,KAAKG,GAAG,CAAC,CAACC;QAChD,MAAMC,YAAY,IAAIC,KAAKF,IAAIG,IAAI,EAAEC,OAAO;QAC5C,MAAMC,QAAQC,OAAON,IAAIO,SAAS;QAClC,OAAO;YAACN;YAAWI;SAAM;IAC3B;IAEA,OAAO;QACL;YACEG,MAAM;YACNV;QACF;KACD;AACH;AAEA,OAAO,MAAMW,oBAA+F,OAC1GC,MACAC;IAEA,IAAID,KAAKE,KAAK,KAAKC,aAAaH,KAAKE,KAAK,KAAK,QAAQF,KAAKE,KAAK,KAAK,IAAI;QACxE,OAAO;YAAEE,QAAQ,EAAE;QAAC;IACtB;IAEA,MAAMF,QAAQpB,iBAAiBkB,KAAKE,KAAK,EAAED,QAAQI,aAAa;IAEhE,MAAMC,SAAU,MAAML,QAAQM,eAAe,CAACC,mBAAmB,CAC/DR,KAAKS,UAAU,IAAI1B;IAGrB,MAAM,EAAE2B,KAAK,EAAEC,GAAG,EAAE,GAAGV,QAAQW,SAAS;IAExC,MAAM3B,WAAoC,MAAMqB,OAAOJ,KAAK,CAAC;QAC3DQ,OAAOA,MAAMhB,OAAO,GAAGmB,QAAQ;QAC/BF,KAAKA,IAAIjB,OAAO,GAAGmB,QAAQ;QAC3BX;IACF;IAEA,OAAO;QACLE,QAAQpB,gBAAgBC;QACxB2B,WAAW;YAAEF;YAAOC;QAAI;QACxBG,QAAQ,KAAK;QACbC,UAAU;YACRC,qBAAqBd;QACvB;IACF;AACF,EAAE"}
+{"version":3,"sources":["../../../../src/queries/click-house-time-series-query/get-click-house-data.ts"],"sourcesContent":["// Copyright The Perses Authors\n// Licensed under the Apache License, Version 2.0 (the \"License\");\n// you may not use this file except in compliance with the License.\n// You may obtain a copy of the License at\n//\n// http://www.apache.org/licenses/LICENSE-2.0\n//\n// Unless required by applicable law or agreed to in writing, software\n// distributed under the License is distributed on an \"AS IS\" BASIS,\n// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n// See the License for the specific language governing permissions and\n// limitations under the License.\n\nimport { TimeSeriesQueryPlugin, replaceVariables } from '@perses-dev/plugin-system';\nimport { TimeSeries } from '@perses-dev/spec';\nimport { DEFAULT_DATASOURCE } from '../constants';\nimport { TimeSeriesEntry } from '../../model/click-house-data-types';\nimport {\n  ClickHouseClient,\n  ClickHouseQueryResponse,\n  formatClickHouseDateTime,\n  replaceTimeRangePlaceholders,\n} from '../../model/click-house-client';\nimport { ClickHouseTimeSeriesQuerySpec, DatasourceQueryResponse } from './click-house-query-types';\n\nconst DEFAULT_STEP_MS = 30 * 1000;\n\nfunction buildTimeSeries(response?: DatasourceQueryResponse): TimeSeries[] {\n  const data = response?.data as TimeSeriesEntry[];\n  if (!response || !data || data.length === 0) {\n    return [];\n  }\n\n  const metricNames = Object.keys(data[0] ?? {}).filter((key) => key !== 'time');\n\n  return metricNames\n    .map((metricName) => {\n      const values: Array<[number, number | null]> = data.map((row: TimeSeriesEntry) => {\n        const timestamp = new Date(row.time).getTime();\n        const value = toTimeSeriesValue(row[metricName]);\n        return [timestamp, value];\n      });\n\n      return {\n        name: metricName,\n        values,\n      };\n    })\n    .filter((series) => series.values.some(([, value]) => value !== null));\n}\n\nfunction toTimeSeriesValue(value: number | string | null | undefined): number | null {\n  if (value === null || value === undefined || value === '') {\n    return null;\n  }\n\n  const numericValue = Number(value);\n  return Number.isFinite(numericValue) ? numericValue : null;\n}\n\nfunction inferStepMs(response?: DatasourceQueryResponse): number {\n  const data = response?.data as TimeSeriesEntry[];\n  if (!response || !data || data.length < 2) {\n    return DEFAULT_STEP_MS;\n  }\n\n  const timestamps = data\n    .map((row: TimeSeriesEntry) => new Date(row.time).getTime())\n    .filter(Number.isFinite)\n    .sort((a, b) => a - b);\n\n  if (timestamps.length < 2) {\n    return DEFAULT_STEP_MS;\n  }\n\n  const deltas: number[] = [];\n  for (let i = 1; i < timestamps.length; i++) {\n    const previous = timestamps[i - 1];\n    const current = timestamps[i];\n    if (previous === undefined || current === undefined || current <= previous) {\n      continue;\n    }\n    deltas.push(current - previous);\n  }\n\n  if (deltas.length === 0) {\n    return DEFAULT_STEP_MS;\n  }\n\n  const deltaCounts = new Map<number, number>();\n  for (const delta of deltas) {\n    deltaCounts.set(delta, (deltaCounts.get(delta) ?? 0) + 1);\n  }\n\n  const inferredStep = Array.from(deltaCounts.entries()).sort(([deltaA, countA], [deltaB, countB]) => {\n    if (countA !== countB) {\n      return countB - countA;\n    }\n    return deltaB - deltaA;\n  })[0]?.[0];\n\n  return inferredStep ?? DEFAULT_STEP_MS;\n}\n\nexport const getTimeSeriesData: TimeSeriesQueryPlugin<ClickHouseTimeSeriesQuerySpec>['getTimeSeriesData'] = async (\n  spec,\n  context\n) => {\n  if (spec.query === undefined || spec.query === null || spec.query === '') {\n    return { series: [] };\n  }\n\n  const query = replaceVariables(spec.query, context.variableState);\n\n  const client = (await context.datasourceStore.getDatasourceClient(\n    spec.datasource ?? DEFAULT_DATASOURCE\n  )) as ClickHouseClient;\n\n  const { start, end } = context.timeRange;\n  const startTime = formatClickHouseDateTime(start);\n  const endTime = formatClickHouseDateTime(end);\n  const executedQueryString = replaceTimeRangePlaceholders(query, startTime, endTime);\n\n  const response: ClickHouseQueryResponse = await client.query({\n    start: startTime,\n    end: endTime,\n    query: executedQueryString,\n  });\n\n  return {\n    series: buildTimeSeries(response),\n    timeRange: { start, end },\n    stepMs: inferStepMs(response),\n    metadata: {\n      executedQueryString,\n    },\n  };\n};\n"],"names":["replaceVariables","DEFAULT_DATASOURCE","formatClickHouseDateTime","replaceTimeRangePlaceholders","DEFAULT_STEP_MS","buildTimeSeries","response","data","length","metricNames","Object","keys","filter","key","map","metricName","values","row","timestamp","Date","time","getTime","value","toTimeSeriesValue","name","series","some","undefined","numericValue","Number","isFinite","inferStepMs","timestamps","sort","a","b","deltas","i","previous","current","push","deltaCounts","Map","delta","set","get","inferredStep","Array","from","entries","deltaA","countA","deltaB","countB","getTimeSeriesData","spec","context","query","variableState","client","datasourceStore","getDatasourceClient","datasource","start","end","timeRange","startTime","endTime","executedQueryString","stepMs","metadata"],"mappings":"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"}