Merge remote-tracking branch 'origin/main' into fixing-onboarding-typ…

…e-problems
elastic · Sep 27, 2023 · 23d36ab · 23d36ab
2 parents 6e46917 + 7a87c36
commit 23d36ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_service_summary/index.ts b/x-pack/plugins/apm/server/routes/assistant_functions/get_apm_service_summary/index.ts
@@ -275,6 +275,7 @@ export async function getApmServiceSummary({
         start,
         end,
         serviceName,
+        environment,
       }),
       getAnomalies({
         serviceName,

diff --git a/...gins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx b/...gins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
@@ -120,7 +120,7 @@ export function InstallElasticAgent() {
         return callApi('POST /internal/observability_onboarding/logs/flow', {
           params: {
             body: {
-              name: datasetName,
+              name: datasetName || '',
               type: 'logFiles',
               state: {
                 datasetName,

diff --git a/...plugins/observability_onboarding/public/locators/onboarding_locator/locator_definition.ts b/...plugins/observability_onboarding/public/locators/onboarding_locator/locator_definition.ts
@@ -11,6 +11,8 @@ import {
   OBSERVABILITY_ONBOARDING_LOCATOR,
 } from '@kbn/deeplinks-observability/locators';
 
+export type { OBSERVABILITY_ONBOARDING_LOCATOR } from '@kbn/deeplinks-observability/locators';
+
 export class ObservabilityOnboardingLocatorDefinition
   implements LocatorDefinition<ObservabilityOnboardingLocatorParams>
 {

diff --git a/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/types.ts b/x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/types.ts
@@ -8,5 +8,6 @@
 import type { LocatorPublic } from '@kbn/share-plugin/public';
 import type { ObservabilityOnboardingLocatorParams } from '@kbn/deeplinks-observability/locators';
 
+export type { ObservabilityOnboardingLocatorParams } from '@kbn/deeplinks-observability/locators';
 export type ObservabilityOnboardingLocator =
   LocatorPublic<ObservabilityOnboardingLocatorParams>;