Query manager integration (#987)

* Bump prismjs from 1.25.0 to 1.27.0 in /dashboards-observability (#508) (#574) Bumps [prismjs](https://github.com/PrismJS/prism) from 1.25.0 to 1.27.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](PrismJS/prism@v1.25.0...v1.27.0) --- updated-dependencies: - dependency-name: prismjs dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> (cherry picked from commit b4f491a) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * change to support java 8 in compile and runtime (#575) (#576) Signed-off-by: Zhongnan Su <[email protected]> (cherry picked from commit 5c43e9d) Co-authored-by: Zhongnan Su <[email protected]> * Add 1.3.0 release notes (#580) (#582) Signed-off-by: Eugene Lee <[email protected]> * query manager Signed-off-by: Eric Wei <[email protected]> * removed aggregations from dimensions Signed-off-by: Eric Wei <[email protected]> * qm improvements Signed-off-by: Eric Wei <[email protected]> * types/code cleanups/error corrections Signed-off-by: Eric Wei <[email protected]> * qm fixes for query builder Signed-off-by: Eric Wei <[email protected]> * viz timestamp selector Signed-off-by: Eric Wei <[email protected]> * query manager integration with bar step 1 Signed-off-by: Eric Wei <[email protected]> * span fix Signed-off-by: Eric Wei <[email protected]> * use postinstall for antlr output files Signed-off-by: Eric Wei <[email protected]> * query building fix Signed-off-by: Eric Wei <[email protected]> * updated snapshots Signed-off-by: Eric Wei <[email protected]> * fixed file not found issue Signed-off-by: Eric Wei <[email protected]> * remove output files Signed-off-by: Eric Wei <[email protected]> Signed-off-by: Eugene Lee <[email protected]> Signed-off-by: Eric Wei <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zhongnan Su <[email protected]>
opensearch-project · Sep 7, 2022 · 5970b0e · 5970b0e
1 parent 2fae9b0
commit 5970b0e
Show file tree

Hide file tree

Showing 14 changed files with 829 additions and 854 deletions.
diff --git a/dashboards-observability/common/constants/explorer.ts b/dashboards-observability/common/constants/explorer.ts
@@ -91,31 +91,31 @@ export const VIZ_CONTAIN_XY_AXIS = [
 // default ppl aggregation method options
 export const AGGREGATION_OPTIONS = [
   {
-    label: 'COUNT',
+    label: 'count',
   },
   {
-    label: 'SUM',
+    label: 'sum',
   },
   {
-    label: 'AVERAGE',
+    label: 'avg',
   },
   {
-    label: 'MAX',
+    label: 'max',
   },
   {
-    label: 'MIN',
+    label: 'min',
   },
   {
-    label: 'VAR_SAMP',
+    label: 'var_samp',
   },
   {
-    label: 'VAR_POP',
+    label: 'var_pop',
   },
   {
-    label: 'STDDEV_SAMP',
+    label: 'stddev_samp',
   },
   {
-    label: 'STDDEV_POP',
+    label: 'stddev_pop',
   },
 ];
 

diff --git a/dashboards-observability/common/query_manager/ast/expression/span.ts b/dashboards-observability/common/query_manager/ast/expression/span.ts
@@ -23,6 +23,6 @@ export class Span extends PPLNode {
   }
 
   toString(): string {
-    return `${this.spanExpression.toString()} as ${this.alias}`;
+    return `${this.spanExpression.toString()}${this.alias ? ` as ${this.alias}` : ''}`;
   }
 }
diff --git a/dashboards-observability/common/types/explorer.ts b/dashboards-observability/common/types/explorer.ts
@@ -265,12 +265,21 @@ export interface ConfigListEntry {
   side: string;
   type: string;
 }
+
 export interface HistogramConfigList {
   bucketSize: string;
   bucketOffset: string;
 }
 
+export interface DimensionSpan {
+  time_field: IField;
+  interval: number;
+  unit: string;
+}
+
 export interface ConfigList {
   dimensions?: ConfigListEntry[] | HistogramConfigList[];
   metrics?: ConfigListEntry[];
+  breakdowns?: ConfigListEntry[] | HistogramConfigList[];
+  span?: DimensionSpan;
 }
diff --git a/dashboards-observability/public/.DS_Store b/dashboards-observability/public/.DS_Store
diff --git a/dashboards-observability/public/components/common/search/autocomplete.tsx b/dashboards-observability/public/components/common/search/autocomplete.tsx
@@ -185,7 +185,13 @@ export const Autocomplete = (props: AutocompleteProps) => {
                             <div className="aa-ItemWrapper">
                               <div className="aa-ItemContent">
                                 <div className="aa-ItemContentBody">
-                                  <div
+                                  <div>
+                                    <span>
+                                      <b>{fullWord.slice(0, -item.suggestion.length)}</b>
+                                      {item.suggestion}
+                                    </span>
+                                  </div>
+                                  {/* <div
                                     className="aa-ItemContentTitle"
                                     // eslint-disable-next-line react/no-danger
                                     dangerouslySetInnerHTML={{
@@ -195,7 +201,7 @@ export const Autocomplete = (props: AutocompleteProps) => {
                                       }</span>
                                       </div>`,
                                     }}
-                                  />
+                                  /> */}
                                 </div>
                               </div>
                             </div>

diff --git a/dashboards-observability/public/components/common/search/search.tsx b/dashboards-observability/public/components/common/search/search.tsx
@@ -16,8 +16,8 @@ import {
   EuiBadge,
   EuiContextMenuPanel,
   EuiToolTip,
+  EuiCallOut
 } from '@elastic/eui';
-import _ from 'lodash';
 import { DatePicker } from './date_picker';
 import '@algolia/autocomplete-theme-classic';
 import { Autocomplete } from './autocomplete';
@@ -82,10 +82,10 @@ export const Search = (props: any) => {
     stopLive,
     setIsLiveTailPopoverOpen,
     liveTailName,
+    searchError = null,
   } = props;
-
+  
   const appLogEvents = tabId.match(APP_ANALYTICS_TAB_ID_REGEX);
-
   const [isSavePanelOpen, setIsSavePanelOpen] = useState(false);
   const [isFlyoutVisible, setIsFlyoutVisible] = useState(false);
 
@@ -247,6 +247,17 @@ export const Search = (props: any) => {
           </>
         )}
       </EuiFlexGroup>
+      { searchError && searchError.error && (
+        <EuiFlexGroup gutterSize="s" justifyContent="flexStart" alignItems="flexStart">
+          <EuiFlexItem>
+            <EuiCallOut title={JSON.parse(searchError.message).error.reason} color="danger" iconType="alert">
+              <p>
+                {JSON.parse(searchError.message).error.details}
+              </p>
+            </EuiCallOut>
+          </EuiFlexItem>
+        </EuiFlexGroup>)
+      }
       {flyout}
     </div>
   );