Merge branch 'master' into alerting/tls-warning

gmmorris · Mar 19, 2020 · 3cbfd52 · 3cbfd52
2 parents 10740f2 + 020e4d0
commit 3cbfd52
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 92 deletions.
diff --git a/.github/workflows/pr-project-assigner.yml b/.github/workflows/pr-project-assigner.yml
@@ -17,5 +17,5 @@ jobs:
               { "label": "Feature:Lens", "projectNumber": 32, "columnName": "In progress" },
               { "label": "Team:Canvas", "projectNumber": 38, "columnName": "Review in progress" }            
             ]
-          ghToken: ${{ secrets.GITHUB_TOKEN }}
+          ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
 
diff --git a/.github/workflows/project-assigner.yml b/.github/workflows/project-assigner.yml
@@ -12,6 +12,6 @@ jobs:
         id: project_assigner
         with:
           issue-mappings: '[{"label": "Team:AppArch", "projectNumber": 37, "columnName": "To triage"}, {"label": "Feature:Lens", "projectNumber": 32, "columnName": "Long-term goals"}, {"label": "Team:Canvas", "projectNumber": 38, "columnName": "Inbox"}]'
-          ghToken: ${{ secrets.GITHUB_TOKEN }}
+          ghToken: ${{ secrets.PROJECT_ASSIGNER_TOKEN }}
 
 
diff --git a/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/package_icon.tsx b/x-pack/plugins/ingest_manager/public/applications/ingest_manager/components/package_icon.tsx
@@ -25,7 +25,7 @@ export const PackageIcon: React.FunctionComponent<{
 
 const usePackageIcon = (packageName: string, version?: string, icons?: Package['icons']) => {
   const { toImage } = useLinks();
-  const [iconType, setIconType] = useState<string>('');
+  const [iconType, setIconType] = useState<string>(''); // FIXME: use `empty` icon during initialization - see: https://github.com/elastic/kibana/issues/60622
   const pkgKey = `${packageName}-${version ?? ''}`;
 
   // Generates an icon path or Eui Icon name based on an icon list from the package

diff --git a/...cations/ingest_manager/sections/agent_config/create_datasource_page/components/layout.tsx b/...cations/ingest_manager/sections/agent_config/create_datasource_page/components/layout.tsx
@@ -17,7 +17,7 @@ import {
 } from '@elastic/eui';
 import { WithHeaderLayout } from '../../../../layouts';
 import { AgentConfig, PackageInfo } from '../../../../types';
-import { PackageIcon } from '../../../epm/components';
+import { PackageIcon } from '../../../../components/package_icon';
 import { CreateDatasourceFrom, CreateDatasourceStep } from '../types';
 import { CreateDatasourceStepsNavigation } from './navigation';
 
@@ -94,7 +94,12 @@ export const CreateDatasourcePageLayout: React.FunctionComponent<{
                     <EuiDescriptionListDescription>
                       <EuiFlexGroup alignItems="center" gutterSize="s">
                         <EuiFlexItem grow={false}>
-                          <PackageIcon packageName={packageInfo?.name || ''} size="m" />
+                          <PackageIcon
+                            packageName={packageInfo?.name || ''}
+                            version={packageInfo?.version || ''}
+                            icons={packageInfo?.icons}
+                            size="m"
+                          />
                         </EuiFlexItem>
                         <EuiFlexItem grow={false}>
                           {packageInfo?.title || packageInfo?.name || '-'}

diff --git a/...tions/ingest_manager/sections/agent_config/create_datasource_page/step_select_package.tsx b/...tions/ingest_manager/sections/agent_config/create_datasource_page/step_select_package.tsx
@@ -18,7 +18,7 @@ import {
 import { Error } from '../../../components';
 import { AgentConfig, PackageInfo } from '../../../types';
 import { useGetOneAgentConfig, useGetPackages, sendGetPackageInfoByKey } from '../../../hooks';
-import { PackageIcon } from '../../epm/components';
+import { PackageIcon } from '../../../components/package_icon';
 
 export const StepSelectPackage: React.FunctionComponent<{
   agentConfigId: string;
@@ -125,12 +125,12 @@ export const StepSelectPackage: React.FunctionComponent<{
           allowExclusions={false}
           singleSelection={true}
           isLoading={isPackagesLoading}
-          options={packages.map(({ title, name, version }) => {
+          options={packages.map(({ title, name, version, icons }) => {
             const pkgkey = `${name}-${version}`;
             return {
               label: title || name,
               key: pkgkey,
-              prepend: <PackageIcon packageName={name} size="m" />,
+              prepend: <PackageIcon packageName={name} version={version} icons={icons} size="m" />,
               checked: selectedPkgKey === pkgkey ? 'on' : undefined,
             };
           })}

diff --git a/...lugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/index.ts b/...lugins/ingest_manager/public/applications/ingest_manager/sections/epm/components/index.ts
@@ -3,5 +3,3 @@
  * or more contributor license agreements. Licensed under the Elastic License;
  * you may not use this file except in compliance with the Elastic License.
  */
-
-export { PackageIcon } from './package_icon';
diff --git a/...ngest_manager/public/applications/ingest_manager/sections/epm/components/package_card.tsx b/...ngest_manager/public/applications/ingest_manager/sections/epm/components/package_card.tsx
@@ -8,7 +8,7 @@ import styled from 'styled-components';
 import { EuiCard } from '@elastic/eui';
 import { PackageInfo, PackageListItem } from '../../../types';
 import { useLinks } from '../hooks';
-import { PackageIcon } from './package_icon';
+import { PackageIcon } from '../../../components/package_icon';
 
 export interface BadgeProps {
   showInstalledBadge?: boolean;
@@ -40,7 +40,7 @@ export function PackageCard({
       layout="horizontal"
       title={title || ''}
       description={description}
-      icon={<PackageIcon icons={icons} packageName={name} size="l" />}
+      icon={<PackageIcon icons={icons} packageName={name} version={version} size="l" />}
       href={url}
     />
   );

diff --git a/...ngest_manager/public/applications/ingest_manager/sections/epm/components/package_icon.tsx b/...ngest_manager/public/applications/ingest_manager/sections/epm/components/package_icon.tsx
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
@@ -9,6 +9,8 @@ import ReactDOM from 'react-dom';
 
 import { AppMountParameters, CoreStart } from 'kibana/public';
 
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
+
 import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
 import { setDependencyCache, clearCache } from './util/dependency_cache';
 import { setLicenseCache } from './license';
@@ -24,6 +26,8 @@ interface AppProps {
   appMountParams: AppMountParameters;
 }
 
+const localStorage = new Storage(window.localStorage);
+
 const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
   setDependencyCache({
     indexPatterns: deps.data.indexPatterns,
@@ -62,6 +66,7 @@ const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
     appName: 'ML',
     data: deps.data,
     security: deps.security,
+    storage: localStorage,
     ...coreStart,
   };
 

diff --git a/...on/datavisualizer/index_based/components/field_data_card/content_types/number_content.tsx b/...on/datavisualizer/index_based/components/field_data_card/content_types/number_content.tsx
@@ -157,7 +157,7 @@ export const NumberContent: FC<FieldDataCardProps> = ({ config }) => {
         buttonSize="compressed"
       />
       <EuiSpacer size="m" />
-      {detailsMode === DETAILS_MODE.DISTRIBUTION && (
+      {distribution && detailsMode === DETAILS_MODE.DISTRIBUTION && (
         <Fragment>
           <EuiFlexGroup justifyContent="spaceAround" gutterSize="xs">
             <EuiFlexItem grow={false}>

diff --git a/...ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx b/...ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
@@ -4,37 +4,34 @@
  * you may not use this file except in compliance with the Elastic License.
  */
 
-import React, { FC } from 'react';
+import React, { FC, useState } from 'react';
 
-import {
-  EuiFieldSearch,
-  EuiFlexItem,
-  EuiFlexGroup,
-  EuiForm,
-  EuiFormRow,
-  EuiIconTip,
-  EuiSuperSelect,
-  EuiText,
-} from '@elastic/eui';
+import { EuiFlexItem, EuiFlexGroup, EuiIconTip, EuiSuperSelect, EuiText } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
 import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
 
 import { SEARCH_QUERY_LANGUAGE } from '../../../../../../common/constants/search';
-import { SavedSearchQuery } from '../../../../contexts/ml';
 
-// @ts-ignore
-import { KqlFilterBar } from '../../../../components/kql_filter_bar/index';
+import {
+  esKuery,
+  esQuery,
+  Query,
+  QueryStringInput,
+} from '../../../../../../../../../src/plugins/data/public';
+
+import { getToastNotifications } from '../../../../util/dependency_cache';
 
 interface Props {
   indexPattern: IndexPattern;
-  searchString: string | SavedSearchQuery;
-  setSearchString(s: string): void;
-  searchQuery: string | SavedSearchQuery;
-  setSearchQuery(q: string | SavedSearchQuery): void;
+  searchString: Query['query'];
+  setSearchString(s: Query['query']): void;
+  searchQuery: Query['query'];
+  setSearchQuery(q: Query['query']): void;
   searchQueryLanguage: SEARCH_QUERY_LANGUAGE;
+  setSearchQueryLanguage(q: any): void;
   samplerShardSize: number;
   setSamplerShardSize(s: number): void;
   totalCount: number;
@@ -59,51 +56,86 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map(v => {
   };
 });
 
+const kqlSyntaxErrorMessage = i18n.translate(
+  'xpack.ml.datavisualizer.invalidKqlSyntaxErrorMessage',
+  {
+    defaultMessage:
+      'Invalid syntax in search bar. The input must be valid Kibana Query Language (KQL)',
+  }
+);
+const luceneSyntaxErrorMessage = i18n.translate(
+  'xpack.ml.datavisualizer.invalidLuceneSyntaxErrorMessage',
+  {
+    defaultMessage: 'Invalid syntax in search bar. The input must be valid Lucene',
+  }
+);
+
 export const SearchPanel: FC<Props> = ({
   indexPattern,
   searchString,
   setSearchString,
   searchQuery,
   setSearchQuery,
   searchQueryLanguage,
+  setSearchQueryLanguage,
   samplerShardSize,
   setSamplerShardSize,
   totalCount,
 }) => {
-  const searchHandler = (d: Record<string, any>) => {
-    setSearchQuery(d.filterQuery);
+  // The internal state of the input query bar updated on every key stroke.
+  const [searchInput, setSearchInput] = useState<Query>({
+    query: searchString || '',
+    language: searchQueryLanguage,
+  });
+
+  const searchHandler = (query: Query) => {
+    let filterQuery;
+    try {
+      if (query.language === SEARCH_QUERY_LANGUAGE.KUERY) {
+        filterQuery = esKuery.toElasticsearchQuery(
+          esKuery.fromKueryExpression(query.query),
+          indexPattern
+        );
+      } else if (query.language === SEARCH_QUERY_LANGUAGE.LUCENE) {
+        filterQuery = esQuery.luceneStringToDsl(query.query);
+      } else {
+        filterQuery = {};
+      }
+
+      setSearchQuery(filterQuery);
+      setSearchString(query.query);
+      setSearchQueryLanguage(query.language);
+    } catch (e) {
+      console.log('Invalid syntax', e); // eslint-disable-line no-console
+      const toastNotifications = getToastNotifications();
+      const notification =
+        query.language === SEARCH_QUERY_LANGUAGE.KUERY
+          ? kqlSyntaxErrorMessage
+          : luceneSyntaxErrorMessage;
+      toastNotifications.addDanger(notification);
+    }
   };
+  const searchChangeHandler = (query: Query) => setSearchInput(query);
 
   return (
     <EuiFlexGroup gutterSize="m" alignItems="center" data-test-subj="mlDataVisualizerSearchPanel">
       <EuiFlexItem>
-        {searchQueryLanguage === SEARCH_QUERY_LANGUAGE.KUERY ? (
-          <KqlFilterBar
-            indexPattern={indexPattern}
-            onSubmit={searchHandler}
-            initialValue={searchString}
-            placeholder={i18n.translate(
-              'xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText',
-              {
-                defaultMessage: 'Search… (e.g. status:200 AND extension:"PHP")',
-              }
-            )}
-          />
-        ) : (
-          <EuiForm>
-            <EuiFormRow
-              helpText={i18n.translate('xpack.ml.datavisualizer.searchPanel.kqlEditOnlyLabel', {
-                defaultMessage: 'Currently only KQL saved searches can be edited',
-              })}
-            >
-              <EuiFieldSearch
-                value={`${searchString}`}
-                readOnly
-                data-test-subj="mlDataVisualizerLuceneSearchBarl"
-              />
-            </EuiFormRow>
-          </EuiForm>
-        )}
+        <QueryStringInput
+          bubbleSubmitEvent={true}
+          query={searchInput}
+          indexPatterns={[indexPattern]}
+          onChange={searchChangeHandler}
+          onSubmit={searchHandler}
+          placeholder={i18n.translate(
+            'xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText',
+            {
+              defaultMessage: 'Search… (e.g. status:200 AND extension:"PHP")',
+            }
+          )}
+          disableAutoFocus={true}
+          dataTestSubj="transformQueryInput"
+          languageSwitcherPopoverAnchorPosition="rightDown"
+        />
       </EuiFlexItem>
 
       <EuiFlexItem grow={false}>

diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx
@@ -24,6 +24,7 @@ import {
 import {
   IFieldType,
   KBN_FIELD_TYPES,
+  Query,
   esQuery,
   esKuery,
 } from '../../../../../../../src/plugins/data/public';
@@ -36,7 +37,7 @@ import { checkPermission } from '../../privilege/check_privilege';
 import { mlNodesAvailable } from '../../ml_nodes_check/check_ml_nodes';
 import { FullTimeRangeSelector } from '../../components/full_time_range_selector';
 import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service';
-import { useMlContext, SavedSearchQuery } from '../../contexts/ml';
+import { useMlContext } from '../../contexts/ml';
 import { kbnTypeToMLJobType } from '../../util/field_types_utils';
 import { useTimefilter } from '../../contexts/kibana';
 import { timeBasedIndexCheck, getQueryFromSavedSearch } from '../../util/index_utils';
@@ -49,8 +50,8 @@ import { SearchPanel } from './components/search_panel';
 import { DataLoader } from './data_loader';
 
 interface DataVisualizerPageState {
-  searchQuery: string | SavedSearchQuery;
-  searchString: string | SavedSearchQuery;
+  searchQuery: Query['query'];
+  searchString: Query['query'];
   searchQueryLanguage: SEARCH_QUERY_LANGUAGE;
   samplerShardSize: number;
   overallStats: any;
@@ -160,7 +161,7 @@ export const Page: FC = () => {
 
   const [searchString, setSearchString] = useState(initSearchString);
   const [searchQuery, setSearchQuery] = useState(initSearchQuery);
-  const [searchQueryLanguage] = useState(initQueryLanguage);
+  const [searchQueryLanguage, setSearchQueryLanguage] = useState(initQueryLanguage);
   const [samplerShardSize, setSamplerShardSize] = useState(defaults.samplerShardSize);
 
   // TODO - type overallStats and stats
@@ -676,6 +677,7 @@ export const Page: FC = () => {
                     searchQuery={searchQuery}
                     setSearchQuery={setSearchQuery}
                     searchQueryLanguage={searchQueryLanguage}
+                    setSearchQueryLanguage={setSearchQueryLanguage}
                     samplerShardSize={samplerShardSize}
                     setSamplerShardSize={setSamplerShardSize}
                     totalCount={overallStats.totalCount}

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -7677,7 +7677,6 @@
     "xpack.ml.datavisualizer.page.fieldsPanelTitle": "フィールド",
     "xpack.ml.datavisualizer.page.metricsPanelTitle": "メトリック",
     "xpack.ml.datavisualizer.searchPanel.allOptionLabel": "すべて",
-    "xpack.ml.datavisualizer.searchPanel.kqlEditOnlyLabel": "現在 KQAL で保存された検索のみ編集できます。",
     "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholder": "小さいサンプルサイズを選択することで、クエリの実行時間を短縮しクラスターへの負荷を軽減できます。",
     "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText": "検索… (例: status:200 AND extension:\"PHP\")",
     "xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel": "サンプリングするドキュメント数を選択してください",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -7677,7 +7677,6 @@
     "xpack.ml.datavisualizer.page.fieldsPanelTitle": "字段",
     "xpack.ml.datavisualizer.page.metricsPanelTitle": "指标",
     "xpack.ml.datavisualizer.searchPanel.allOptionLabel": "全部",
-    "xpack.ml.datavisualizer.searchPanel.kqlEditOnlyLabel": "当前仅可以编辑 KQL 已保存搜索",
     "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholder": "选择较小的样例大小将减少查询运行时间和集群上的负载。",
     "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText": "搜索……（例如，status:200 AND extension:\"PHP\"）",
     "xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel": "选择要采样的文档数目",