Keep the time field in the datasource for now.

Author: fmassot

src/components/QueryEditor/ElasticsearchQueryContext.test.tsx

@@ -18,7 +18,7 @@ const query: ElasticsearchQuery = {
 
 describe('ElasticsearchQueryContext', () => {
   it('Should call onChange and onRunQuery with the default query when the query is empty', () => {
-    const datasource = {} as ElasticDatasource;
+    const datasource = { timeField: 'TIMEFIELD' } as ElasticDatasource;
     const onChange = jest.fn();
     const onRunQuery = jest.fn();
 
@@ -38,6 +38,8 @@ describe('ElasticsearchQueryContext', () => {
     expect(changedQuery.alias).toBeDefined();
     expect(changedQuery.metrics).toBeDefined();
     expect(changedQuery.bucketAggs).toBeDefined();
+    // Should also set timeField to the configured `timeField` option in datasource configuration
+    expect(changedQuery.timeField).toBe(datasource.timeField);
 
     expect(onRunQuery).toHaveBeenCalled();
   });

src/components/QueryEditor/ElasticsearchQueryContext.tsx

@@ -50,11 +50,12 @@ export const ElasticsearchProvider = ({
     query: queryReducer,
     alias: aliasPatternReducer,
     metrics: metricsReducer,
-    bucketAggs: createBucketAggsReducer(),
+    bucketAggs: createBucketAggsReducer(datasource.timeField),
   });
 
   const dispatch = useStatelessReducer(
-    (newState) => onStateChange({ ...query, ...newState }),
+      // timeField is part of the query model, but its value is always set to be the one from datasource settings.
+      (newState) => onStateChange({ ...query, ...newState, timeField: datasource.timeField }),
     query,
     reducer
   );

src/configuration/mocks.ts

@@ -4,6 +4,7 @@ import { QuickwitOptions } from 'quickwit';
 
 export function createDefaultConfigOptions(): DataSourceSettings<QuickwitOptions> {
   return createDatasourceSettings<QuickwitOptions>({
+    timeField: 'timestamp',
     logMessageField: 'test.message',
     logLevelField: 'test.level',
     index: 'test',

src/dataquery.gen.ts

@@ -395,6 +395,10 @@ export interface Elasticsearch extends DataQuery {
    * Lucene query
    */
   query?: string;
+    /**
+   * Name of time field
+   */
+  timeField?: string;
 }
 
 export const defaultElasticsearch: Partial<Elasticsearch> = {

src/datasource.ts

@@ -70,6 +70,7 @@ export class QuickwitDataSource
     DataSourceWithQueryImportSupport<ElasticsearchQuery>
 {
   index: string;
+  timeField: string;
   logMessageField?: string;
   logLevelField?: string;
   dataLinks: DataLinkConfig[];
@@ -84,6 +85,7 @@ export class QuickwitDataSource
     super(instanceSettings);
     const settingsData = instanceSettings.jsonData || ({} as QuickwitOptions);
     this.index = settingsData.index || '';
+    this.timeField = ''
     this.logMessageField = settingsData.logMessageField || '';
     this.logLevelField = settingsData.logLevelField || '';
     this.dataLinks = settingsData.dataLinks || [];
@@ -175,6 +177,7 @@ export class QuickwitDataSource
           return undefined;
         }
         const bucketAggs: BucketAggregation[] = [];
+        const timeField = this.timeField ?? 'timestamp';
 
         if (this.logLevelField) {
           bucketAggs.push({
@@ -197,6 +200,7 @@ export class QuickwitDataSource
             min_doc_count: '0',
             trimEdges: '0',
           },
+          field: timeField,
         });
 
         return {

src/mocks.ts

@@ -38,6 +38,7 @@ export function createElasticDatasource(
     access: 'proxy',
     url: '',
     jsonData: {
+      timeField: '',
       index: '',
       ...jsonData,
     },

src/quickwit.ts

@@ -2,6 +2,7 @@ import { DataSourceJsonData } from "@grafana/data";
 import { DataLinkConfig } from "./types";
 
 export interface QuickwitOptions extends DataSourceJsonData {
+    timeField: string;
     interval?: Interval;
     logMessageField?: string;
     logLevelField?: string;