fix: log query with labels

Author: sunchanglong

src/components/queryBuilder/views/LogsQueryBuilder.tsx

@@ -136,21 +136,8 @@ export const LogsQueryBuilder = (props: LogsQueryBuilderProps) => {
           label={labels.logTimeColumn.label}
           tooltip={labels.logTimeColumn.tooltip}
         />
-        <ColumnSelect
-          disabled={builderState.otelEnabled}
-          allColumns={allColumns}
-          selectedColumn={builderState.logLevelColumn}
-          invalid={!builderState.logLevelColumn}
-          onColumnChange={onOptionChange('logLevelColumn')}
-          columnFilterFn={columnFilterString}
-          columnHint={ColumnHint.LogLevel}
-          label={labels.logLevelColumn.label}
-          tooltip={labels.logLevelColumn.tooltip}
-          inline
-        />
-      </div>
-      <div className="gf-form">
-        <ColumnSelect
+
+      <ColumnSelect
           disabled={builderState.otelEnabled}
           allColumns={allColumns}
           selectedColumn={builderState.messageColumn}
@@ -164,22 +151,17 @@ export const LogsQueryBuilder = (props: LogsQueryBuilderProps) => {
         <ColumnSelect
           disabled={builderState.otelEnabled}
           allColumns={allColumns}
-          selectedColumn={builderState.labelsColumn}
-          invalid={!builderState.labelsColumn}
-          onColumnChange={onOptionChange('labelsColumn')}
-          columnHint={ColumnHint.LogLabels}
-          label={labels.logLabelsColumn.label}
-          tooltip={labels.logLabelsColumn.tooltip}
+          selectedColumn={builderState.logLevelColumn}
+          invalid={!builderState.logLevelColumn}
+          onColumnChange={onOptionChange('logLevelColumn')}
+          columnFilterFn={columnFilterString}
+          columnHint={ColumnHint.LogLevel}
+          label={labels.logLevelColumn.label}
+          tooltip={labels.logLevelColumn.tooltip}
           inline
         />
-        {/* <Switch
-          value={builderState.liveView}
-          onChange={onOptionChange('liveView')}
-          label={labels.liveView.label}
-          tooltip={labels.liveView.tooltip}
-          inline
-        /> */}
       </div>
+
       <OrderByEditor
         orderByOptions={getOrderByOptions(builderOptions, allColumns)}
         orderBy={builderState.orderBy}

src/greptimedb/index.ts

@@ -272,23 +272,32 @@ export function transformGreptimeDBLogs(sqlResponse: GreptimeResponse, query: CH
   const labelColumnIndices: Record<string, number> = {};
   const contextColumnIndices: Record<string, number> = {};
 
-  columnSchemas.forEach((schema, index) => {
-    const lowerCaseName = schema.name.toLowerCase();
-    if (lowerCaseName === 'ts' || lowerCaseName === 'timestamp') {
-      timestampColumnIndex = index;
-    } else if (lowerCaseName === 'body' || lowerCaseName === 'message') {
-      bodyColumnIndex = index;
-    } else if (lowerCaseName === 'severity' || lowerCaseName === 'level') {
-      severityColumnIndex = index;
-    } else if (lowerCaseName === 'id') {
-      idColumnIndex = index;
-    } else if (contextColumns.includes(schema.name)) {
-      contextColumnIndices[schema.name] = index;
-    } else {
-      // Consider other columns as potential labels
-      labelColumnIndices[schema.name] = index;
-    }
-  });
+  
+  if('builderOptions' in query) {
+    const timeColumn = query.builderOptions?.columns?.find(c => c.hint === 'time')
+    const timeColumnName = timeColumn?.alias || timeColumn?.name
+    const bodyColumn = query.builderOptions?.columns?.find(c => c.hint === 'log_message')
+    const bodyColumnName = bodyColumn?.alias || bodyColumn?.name
+    const severityColumn = query.builderOptions?.columns?.find(c => c.hint === 'log_level')
+    const severityColumnName = severityColumn?.alias || severityColumn?.name
+
+    columnSchemas.forEach((schema, index) => {
+      const lowerCaseName = schema.name.toLowerCase();
+      if (lowerCaseName === timeColumnName) {
+        timestampColumnIndex = index;
+      } else if (lowerCaseName === bodyColumnName) {
+        bodyColumnIndex = index;
+      } else if (lowerCaseName === severityColumnName) {
+        severityColumnIndex = index;
+      } else if (contextColumns.includes(schema.name)) {
+        contextColumnIndices[schema.name] = index;
+      } else {
+        // Consider other columns as potential labels
+        labelColumnIndices[schema.name] = index;
+      }
+    });
+  }
+  
 
   // if (timestampColumnIndex === -1 || bodyColumnIndex === -1) {
   //   console.error('Timestamp or body column not found in GreptimeDB response.');