change: Utilize datasource defined timestamp column automatically in data frame parser

Author: jealouscloud

src/datasource.ts

@@ -72,20 +72,20 @@ export class DataSource
 
       // As we don't show histogram for sql mode in explore
       if (options.app === 'explore' && target?.refId?.includes(REF_ID_STARTER_LOG_VOLUME) && target.sqlMode) {
-        return getGraphDataFrame([], target, options.app);
+        return getGraphDataFrame([], target, options.app, this.timestampColumn);
       }
 
       this.cachedQuery.requestQuery = JSON.stringify(reqData);
       this.cachedQuery.isFetching = true;
       return this.doRequest(target, reqData)
         .then((response) => {
           if (options.app === 'panel-editor' || options.app === 'dashboard') {
-            return getGraphDataFrame(response.hits, target, options.app);
+            return getGraphDataFrame(response.hits, target, options.app, this.timestampColumn);
           }
 
           const logsDataFrame = getLogsDataFrame(response.hits, target, this.streamFields, this.timestampColumn);
 
-          const graphDataFrame = getGraphDataFrame(response?.aggs?.histogram || [], target, options.app);
+          const graphDataFrame = getGraphDataFrame(response?.aggs?.histogram || [], target, options.app, this.timestampColumn);
 
           this.cachedQuery.promise?.resolve({ graph: graphDataFrame, logs: logsDataFrame });
 

src/features/log/queryResponseBuilder.ts

@@ -36,7 +36,12 @@ export const getLogsDataFrame = (
   return logsData;
 };
 
-export const getGraphDataFrame = (data: any, target: MyQuery, app: string) => {
+export const getGraphDataFrame = (
+  data: any,
+  target: MyQuery,
+  app: string,
+  timestampColumn = '_timestamp'
+) => {
   const graphData = getDefaultDataFrame(target.refId, 'graph');
 
   let fields = ['zo_sql_key', 'zo_sql_num'];
@@ -50,7 +55,7 @@ export const getGraphDataFrame = (data: any, target: MyQuery, app: string) => {
   }
 
   for (let i = 0; i < fields.length; i++) {
-    if (fields[i] === '_timestamp') {
+    if (fields[i] === timestampColumn) {
       graphData.addField({
         config: {
           filterable: true,
@@ -70,7 +75,7 @@ export const getGraphDataFrame = (data: any, target: MyQuery, app: string) => {
   }
 
   data.forEach((log: any) => {
-    graphData.add(getField(log, fields, '_timestamp'));
+    graphData.add(getField(log, fields, timestampColumn));
   });
 
   return graphData;