Merge branch 'main' into mds-update-tocache

sumukhswamy · Apr 26, 2024 · 30c533c · 30c533c
2 parents af04339 + 947385f
commit 30c533c
Show file tree

Hide file tree

Showing 15 changed files with 3,627 additions and 3,926 deletions.
diff --git a/common/constants/shared.ts b/common/constants/shared.ts
@@ -93,6 +93,7 @@ export const PPL_INDEX_INSERT_POINT_REGEX = /(search source|source|index)\s*=\s*
 export const PPL_INDEX_REGEX = /(search source|source|index)\s*=\s*([^|\s]+)/i;
 export const PPL_WHERE_CLAUSE_REGEX = /\s*where\s+/i;
 export const PPL_NEWLINE_REGEX = /[\n\r]+/g;
+export const PPL_DESCRIBE_INDEX_REGEX = /(describe)\s+([^|\s]+)/i;
 
 // Observability plugin URI
 const BASE_OBSERVABILITY_URI = '/_plugins/_observability';

diff --git a/public/components/common/query_utils/index.ts b/public/components/common/query_utils/index.ts
@@ -21,6 +21,7 @@ import {
   OTEL_DATE_FORMAT,
   OTEL_METRIC_SUBTYPE,
   PROMQL_METRIC_SUBTYPE,
+  PPL_DESCRIBE_INDEX_REGEX,
 } from '../../../../common/constants/shared';
 import { IExplorerFields, IQuery } from '../../../../common/types/explorer';
 import { SPAN_RESOLUTION_REGEX } from '../../../../common/constants/metrics';
@@ -219,6 +220,14 @@ export const getIndexPatternFromRawQuery = (query: string): string => {
   return getPromQLIndex(query) || getPPLIndex(query);
 };
 
+export const getDescribeQueryIndexFromRawQuery = (query: string): string | undefined => {
+  const matches = query.match(PPL_DESCRIBE_INDEX_REGEX);
+  if (matches) {
+    return matches[2];
+  }
+  return undefined;
+};
+
 function extractSpanAndResolution(query: string) {
   if (!query) return;
 

diff --git a/public/components/event_analytics/explorer/explorer.tsx b/public/components/event_analytics/explorer/explorer.tsx
@@ -44,6 +44,7 @@ import {
   DATE_PICKER_FORMAT,
   DEFAULT_AVAILABILITY_QUERY,
   EVENT_ANALYTICS_DOCUMENTATION_URL,
+  FINAL_QUERY,
   PATTERNS_EXTRACTOR_REGEX,
   PATTERNS_REGEX,
   RAW_QUERY,
@@ -63,6 +64,7 @@ import { QUERY_ASSIST_API } from '../../../../common/constants/query_assist';
 import {
   LIVE_END_TIME,
   LIVE_OPTIONS,
+  PPL_DESCRIBE_INDEX_REGEX,
   PPL_METRIC_SUBTYPE,
   PPL_NEWLINE_REGEX,
 } from '../../../../common/constants/shared';
@@ -540,12 +542,17 @@ export const Explorer = ({
     return 0;
   }, [countDistribution?.data]);
 
+  const showTimeBasedComponents =
+    (isDefaultDataSourceType || appLogEvents) &&
+    query[SELECTED_TIMESTAMP] !== '' &&
+    !query[FINAL_QUERY].match(PPL_DESCRIBE_INDEX_REGEX);
+
   const mainContent = useMemo(() => {
     return (
       <div className="dscWrapper">
         {explorerData && !isEmpty(explorerData.jsonData) ? (
           <EuiFlexGroup direction="column" gutterSize="none">
-            {(isDefaultDataSourceType || appLogEvents) && query[SELECTED_TIMESTAMP] !== '' && (
+            {showTimeBasedComponents && (
               <>
                 <EuiFlexItem grow={false}>
                   <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
@@ -594,7 +601,7 @@ export const Explorer = ({
                 </EuiFlexItem>
               </>
             )}
-            {(isDefaultDataSourceType || appLogEvents) && query[SELECTED_TIMESTAMP] !== '' && (
+            {showTimeBasedComponents && (
               <EuiFlexItem grow={false}>
                 <EuiPanel hasBorder={false} hasShadow={false} paddingSize="s" color="transparent">
                   <EuiPanel paddingSize="s" style={{ height: '100%' }}>
@@ -643,11 +650,14 @@ export const Explorer = ({
                         rows={explorerData.jsonData}
                         rowsAll={explorerData.jsonDataAll}
                         explorerFields={explorerFields}
-                        timeStampField={queryRef.current![SELECTED_TIMESTAMP]}
+                        timeStampField={
+                          !query[FINAL_QUERY].match(PPL_DESCRIBE_INDEX_REGEX)
+                            ? queryRef.current![SELECTED_TIMESTAMP]
+                            : ''
+                        }
                         rawQuery={appBasedRef.current || queryRef.current![RAW_QUERY]}
                         totalHits={
-                          (isDefaultDataSourceType || appLogEvents) &&
-                          query[SELECTED_TIMESTAMP] !== ''
+                          showTimeBasedComponents
                             ? _.sum(countDistribution.data?.['count()']) ||
                               explorerData.datarows.length
                             : explorerData.datarows.length
@@ -656,7 +666,7 @@ export const Explorer = ({
                         startTime={startTime}
                         endTime={endTime}
                         isDefaultDataSource={
-                          explorerSearchMeta.datasources[0].type === DEFAULT_DATA_SOURCE_TYPE
+                          explorerSearchMeta?.datasources?.[0]?.type === DEFAULT_DATA_SOURCE_TYPE
                         }
                       />
                     )}

diff --git a/...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/...omponents/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap