Merge branch 'main' into maximizing-serverless-coverage/explore/dashb…

…oards
elastic · Oct 13, 2023 · 40d9253 · 40d9253
2 parents da68c62 + 3f061a5
commit 40d9253
Show file tree

Hide file tree

Showing 15 changed files with 100 additions and 90 deletions.
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/ml_model_deployment_common.ts b/x-pack/plugins/enterprise_search/server/lib/ml/ml_model_deployment_common.ts
@@ -5,16 +5,12 @@
  * 2.0.
  */
 
-import { ELASTIC_MODEL_DEFINITIONS } from '@kbn/ml-trained-models-utils';
-
 import {
   ElasticsearchResponseError,
   isNotFoundException,
   isResourceNotFoundException,
 } from '../../utils/identify_exceptions';
 
-export const acceptableModelNames = Object.keys(ELASTIC_MODEL_DEFINITIONS);
-
 export function isNotFoundExceptionError(error: unknown): boolean {
   return (
     isResourceNotFoundException(error as ElasticsearchResponseError) ||
@@ -23,20 +19,3 @@ export function isNotFoundExceptionError(error: unknown): boolean {
     error?.statusCode === 404
   );
 }
-
-export function throwIfNotAcceptableModelName(modelName: string) {
-  if (!acceptableModelNames.includes(modelName)) {
-    const notFoundError: ElasticsearchResponseError = {
-      meta: {
-        body: {
-          error: {
-            type: 'resource_not_found_exception',
-          },
-        },
-        statusCode: 404,
-      },
-      name: 'ResponseError',
-    };
-    throw notFoundError;
-  }
-}
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.ts b/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_deployment.ts
@@ -12,10 +12,7 @@ import { MlTrainedModels } from '@kbn/ml-plugin/server';
 import { MlModelDeploymentStatus, MlModelDeploymentState } from '../../../common/types/ml';
 
 import { getMlModelDeploymentStatus } from './get_ml_model_deployment_status';
-import {
-  isNotFoundExceptionError,
-  throwIfNotAcceptableModelName,
-} from './ml_model_deployment_common';
+import { isNotFoundExceptionError } from './ml_model_deployment_common';
 
 export const startMlModelDeployment = async (
   modelName: string,
@@ -25,10 +22,6 @@ export const startMlModelDeployment = async (
     throw new Error('Machine Learning is not enabled');
   }
 
-  // before anything else, check our model name
-  // to ensure we only allow those names we want
-  throwIfNotAcceptableModelName(modelName);
-
   try {
     // try and get the deployment status of the model first
     // and see if it's already deployed or deploying...

diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_download.ts b/x-pack/plugins/enterprise_search/server/lib/ml/start_ml_model_download.ts
@@ -11,10 +11,7 @@ import { MlTrainedModels } from '@kbn/ml-plugin/server';
 import { MlModelDeploymentState, MlModelDeploymentStatus } from '../../../common/types/ml';
 
 import { getMlModelDeploymentStatus } from './get_ml_model_deployment_status';
-import {
-  isNotFoundExceptionError,
-  throwIfNotAcceptableModelName,
-} from './ml_model_deployment_common';
+import { isNotFoundExceptionError } from './ml_model_deployment_common';
 
 export const startMlModelDownload = async (
   modelName: string,
@@ -24,10 +21,6 @@ export const startMlModelDownload = async (
     throw new Error('Machine Learning is not enabled');
   }
 
-  // before anything else, check our model name
-  // to ensure we only allow those names we want
-  throwIfNotAcceptableModelName(modelName);
-
   try {
     // try and get the deployment status of the model first
     // and see if it's already deployed or deploying...

diff --git a/x-pack/plugins/observability/public/application/index.tsx b/x-pack/plugins/observability/public/application/index.tsx
@@ -14,8 +14,9 @@ import { Router, Routes, Route } from '@kbn/shared-ux-router';
 import { AppMountParameters, APP_WRAPPER_CLASS, CoreStart } from '@kbn/core/public';
 import { EuiThemeProvider } from '@kbn/kibana-react-plugin/common';
 import type { LazyObservabilityPageTemplateProps } from '@kbn/observability-shared-plugin/public';
-import { KibanaContextProvider, RedirectAppLinks } from '@kbn/kibana-react-plugin/public';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
+import { RedirectAppLinks } from '@kbn/shared-ux-link-redirect-app';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import { ObservabilityAIAssistantProvider } from '@kbn/observability-ai-assistant-plugin/public';
@@ -111,8 +112,7 @@ export const renderApp = ({
                     <EuiThemeProvider darkMode={isDarkMode}>
                       <i18nCore.Context>
                         <RedirectAppLinks
-                          application={core.application}
-                          className={APP_WRAPPER_CLASS}
+                          coreStart={core}
                           data-test-subj="observabilityMainContainer"
                         >
                           <QueryClientProvider client={queryClient}>

diff --git a/x-pack/plugins/observability/tsconfig.json b/x-pack/plugins/observability/tsconfig.json
@@ -90,7 +90,8 @@
     "@kbn/deeplinks-observability",
     "@kbn/core-application-common",
     "@kbn/react-kibana-mount",
-    "@kbn/react-kibana-context-theme"
+    "@kbn/react-kibana-context-theme",
+    "@kbn/shared-ux-link-redirect-app"
   ],
   "exclude": [
     "target/**/*"

diff --git a/x-pack/plugins/observability_onboarding/public/application/app.tsx b/x-pack/plugins/observability_onboarding/public/application/app.tsx
@@ -24,7 +24,6 @@ import { Router, Routes, Route } from '@kbn/shared-ux-router';
 import { euiDarkVars, euiLightVars } from '@kbn/ui-theme';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { RouteComponentProps, RouteProps } from 'react-router-dom';
 import { ConfigSchema } from '..';
 import { customLogsRoutes } from '../components/app/custom_logs';
 import { systemLogsRoutes } from '../components/app/system_logs';
@@ -37,16 +36,6 @@ import { baseRoutes, routes } from '../routes';
 import { CustomLogs } from '../routes/templates/custom_logs';
 import { SystemLogs } from '../routes/templates/system_logs';
 
-export type BreadcrumbTitle<
-  T extends { [K in keyof T]?: string | undefined } = {}
-> = string | ((props: RouteComponentProps<T>) => string) | null;
-
-export interface RouteDefinition<
-  T extends { [K in keyof T]?: string | undefined } = any
-> extends RouteProps {
-  breadcrumb: BreadcrumbTitle<T>;
-}
-
 export const onBoardingTitle = i18n.translate(
   'xpack.observability_onboarding.breadcrumbs.onboarding',
   {
@@ -157,6 +146,8 @@ export function ObservabilityOnboardingAppRoot({
   const i18nCore = core.i18n;
   const plugins = { ...deps };
 
+  const renderFeedbackLinkAsPortal = !config.serverless.enabled;
+
   return (
     <RedirectAppLinks
       className={APP_WRAPPER_CLASS}
@@ -183,12 +174,14 @@ export function ObservabilityOnboardingAppRoot({
           <i18nCore.Context>
             <Router history={history}>
               <EuiErrorBoundary>
-                <HeaderMenuPortal
-                  setHeaderActionMenu={setHeaderActionMenu}
-                  theme$={theme$}
-                >
-                  <ObservabilityOnboardingHeaderActionMenu />
-                </HeaderMenuPortal>
+                {renderFeedbackLinkAsPortal && (
+                  <HeaderMenuPortal
+                    setHeaderActionMenu={setHeaderActionMenu}
+                    theme$={theme$}
+                  >
+                    <ObservabilityOnboardingHeaderActionMenu />
+                  </HeaderMenuPortal>
+                )}
                 <ObservabilityOnboardingApp />
               </EuiErrorBoundary>
             </Router>

diff --git a/x-pack/plugins/observability_onboarding/public/plugin.ts b/x-pack/plugins/observability_onboarding/public/plugin.ts
@@ -28,6 +28,7 @@ import type { ObservabilityOnboardingConfig } from '../server';
 import { PLUGIN_ID } from '../common';
 import { ObservabilityOnboardingLocatorDefinition } from './locators/onboarding_locator/locator_definition';
 import { ObservabilityOnboardingPluginLocators } from './locators';
+import { ConfigSchema } from '.';
 
 export type ObservabilityOnboardingPluginSetup = void;
 export type ObservabilityOnboardingPluginStart = void;
@@ -44,6 +45,14 @@ export interface ObservabilityOnboardingPluginStartDeps {
   observability: ObservabilityPublicStart;
 }
 
+export interface ObservabilityOnboardingPluginContextValue {
+  core: CoreStart;
+  plugins: ObservabilityOnboardingPluginSetupDeps;
+  data: DataPublicPluginStart;
+  observability: ObservabilityPublicStart;
+  config: ConfigSchema;
+}
+
 export class ObservabilityOnboardingPlugin
   implements
     Plugin<

diff --git a/x-pack/plugins/observability_onboarding/public/routes/templates/custom_logs.tsx b/x-pack/plugins/observability_onboarding/public/routes/templates/custom_logs.tsx
@@ -9,13 +9,16 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useBreadcrumbs } from '@kbn/observability-shared-plugin/public';
 import React, { ComponentType, useRef, useState } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ObservabilityOnboardingPluginContextValue } from '../../plugin';
 import { breadcrumbsApp } from '../../application/app';
 import { Provider as WizardProvider } from '../../components/app/custom_logs';
 import {
   FilmstripFrame,
   FilmstripTransition,
   TransitionState,
 } from '../../components/shared/filmstrip_transition';
+import { ObservabilityOnboardingHeaderActionMenu } from '../../components/app/header_action_menu';
 
 interface Props {
   children: React.ReactNode;
@@ -43,6 +46,12 @@ function AnimatedTransitionsWizard({ children }: Props) {
   const [title, setTitle] = useState<string>();
   const TransitionComponent = useRef<ComponentType>(() => null);
 
+  const {
+    services: { config },
+  } = useKibana<ObservabilityOnboardingPluginContextValue>();
+
+  const isServerless = config.serverless.enabled;
+
   function onChangeStep({
     direction,
     stepTitle,
@@ -68,21 +77,33 @@ function AnimatedTransitionsWizard({ children }: Props) {
       <EuiFlexGroup direction="column" alignItems="center">
         <EuiFlexItem grow={false}>
           <EuiSpacer size="l" />
-          <EuiTitle
-            size="l"
-            data-test-subj="obltOnboardingStreamLogFilePageHeader"
-          >
-            <h1>
-              {title
-                ? title
-                : i18n.translate(
-                    'xpack.observability_onboarding.title.collectCustomLogs',
-                    {
-                      defaultMessage: 'Stream log files to Elastic',
-                    }
-                  )}
-            </h1>
-          </EuiTitle>
+          <EuiFlexGroup direction="row">
+            <EuiFlexItem grow={false}>
+              <EuiTitle
+                size="l"
+                data-test-subj="obltOnboardingStreamLogFilePageHeader"
+              >
+                <h1>
+                  {title
+                    ? title
+                    : i18n.translate(
+                        'xpack.observability_onboarding.title.collectCustomLogs',
+                        {
+                          defaultMessage: 'Stream log files to Elastic',
+                        }
+                      )}
+                </h1>
+              </EuiTitle>
+            </EuiFlexItem>
+            {isServerless && (
+              <EuiFlexItem
+                grow={false}
+                css={{ position: 'absolute', right: 10 }}
+              >
+                <ObservabilityOnboardingHeaderActionMenu />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem grow={1} style={{ width: '50%' }}>
           <FilmstripTransition

diff --git a/x-pack/plugins/observability_onboarding/public/routes/templates/system_logs.tsx b/x-pack/plugins/observability_onboarding/public/routes/templates/system_logs.tsx
@@ -9,8 +9,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useBreadcrumbs } from '@kbn/observability-shared-plugin/public';
 import React from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { breadcrumbsApp } from '../../application/app';
 import { Provider as WizardProvider } from '../../components/app/system_logs';
+import { ObservabilityOnboardingHeaderActionMenu } from '../../components/app/header_action_menu';
+import { ObservabilityOnboardingPluginContextValue } from '../../plugin';
 
 interface Props {
   children: React.ReactNode;
@@ -28,22 +31,40 @@ export function SystemLogs({ children }: Props) {
     ],
     breadcrumbsApp
   );
+
+  const {
+    services: { config },
+  } = useKibana<ObservabilityOnboardingPluginContextValue>();
+
+  const isServerless = config.serverless.enabled;
   return (
     <WizardProvider>
       <EuiFlexGroup direction="column" alignItems="center">
         <EuiFlexItem grow={false}>
           <EuiSpacer size="l" />
-          <EuiTitle
-            size="l"
-            data-test-subj="obltOnboardingSystemLogsFilePageHeader"
-          >
-            <h1>
-              {i18n.translate(
-                'xpack.observability_onboarding.title.collectSystemLogs',
-                { defaultMessage: 'Install shipper to collect system logs' }
-              )}
-            </h1>
-          </EuiTitle>
+          <EuiFlexGroup direction="row">
+            <EuiFlexItem grow={false}>
+              <EuiTitle
+                size="l"
+                data-test-subj="obltOnboardingSystemLogsFilePageHeader"
+              >
+                <h1>
+                  {i18n.translate(
+                    'xpack.observability_onboarding.title.collectSystemLogs',
+                    { defaultMessage: 'Install shipper to collect system logs' }
+                  )}
+                </h1>
+              </EuiTitle>
+            </EuiFlexItem>
+            {isServerless && (
+              <EuiFlexItem
+                grow={false}
+                css={{ position: 'absolute', right: 10 }}
+              >
+                <ObservabilityOnboardingHeaderActionMenu />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem grow={1} style={{ width: '50%' }}>
           <div

diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts b/x-pack/test_serverless/api_integration/test_suites/search/config.feature_flags.ts
@@ -24,5 +24,5 @@ export default createTestConfig({
 
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
-  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
+  esServerArgs: [],
 });
diff --git a/x-pack/test_serverless/api_integration/test_suites/search/config.ts b/x-pack/test_serverless/api_integration/test_suites/search/config.ts
@@ -17,5 +17,5 @@ export default createTestConfig({
 
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
-  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
+  esServerArgs: [],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.examples.ts b/x-pack/test_serverless/functional/test_suites/search/config.examples.ts
@@ -23,5 +23,5 @@ export default createTestConfig({
 
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
-  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
+  esServerArgs: [],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts b/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
@@ -24,5 +24,5 @@ export default createTestConfig({
 
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
-  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
+  esServerArgs: [],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts b/x-pack/test_serverless/functional/test_suites/search/config.screenshots.ts
@@ -19,5 +19,5 @@ export default createTestConfig({
 
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
-  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
+  esServerArgs: [],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.ts b/x-pack/test_serverless/functional/test_suites/search/config.ts
@@ -17,5 +17,5 @@ export default createTestConfig({
 
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
-  esServerArgs: ['xpack.ml.ad.enabled=false', 'xpack.ml.dfa.enabled=false'],
+  esServerArgs: [],
 });