Skip to content

Commit

Permalink
[Logs onboarding] fixing type issues (elastic#167340)
Browse files Browse the repository at this point in the history
`OBSERVABILITY_ONBOARDING_LOCATOR` and
`ObservabilityOnboardingLocatorParams` were removed from
`observability_onboarding` plugin in
[elastic#165962](elastic#165962) and are now
part of `@kbn/deeplinks-observability/locators`.

`datsetName` was transformed into an optional variable in the wizard
state in [elastic#166654](elastic#166654) which
makes sense for first step of custom logs onboarding but it's required
in onboarding saved object.
  • Loading branch information
yngrdyn authored Sep 27, 2023
1 parent 750c4be commit 05c637f
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ import { BackButton } from './back_button';
import { WindowsInstallStep } from '../../shared/windows_install_step';
import { TroubleshootingLink } from '../../shared/troubleshooting_link';

const defaultDatasetName = '';

export function InstallElasticAgent() {
const {
services: { share },
Expand All @@ -63,7 +65,8 @@ export function InstallElasticAgent() {
useState<ElasticAgentPlatform>('linux-tar');

const enforcedDatasetName =
(integration === dataset ? dataset : `${integration}.${dataset}`) || '';
(integration === dataset ? dataset : `${integration}.${dataset}`) ??
defaultDatasetName;

async function onContinue() {
await singleDatasetLocator!.navigate({
Expand Down Expand Up @@ -109,11 +112,15 @@ export function InstallElasticAgent() {
customConfigurations,
logFilePaths,
} = getState();
if (!hasAlreadySavedFlow(getState()) && monitoringRole?.hasPrivileges) {
if (
!hasAlreadySavedFlow(getState()) &&
monitoringRole?.hasPrivileges &&
datasetName
) {
return callApi('POST /internal/observability_onboarding/logs/flow', {
params: {
body: {
name: datasetName || '',
name: datasetName,
type: 'logFiles',
state: {
datasetName,
Expand Down
3 changes: 0 additions & 3 deletions x-pack/plugins/observability_onboarding/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import {
ObservabilityOnboardingPluginStart,
} from './plugin';

export type { OBSERVABILITY_ONBOARDING_LOCATOR } from './locators/onboarding_locator/locator_definition';
export type { ObservabilityOnboardingLocatorParams } from './locators/onboarding_locator/types';

export interface ConfigSchema {
ui: {
enabled: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* 2.0.
*/

import { ObservabilityOnboardingLocatorParams } from './types';
import type { ObservabilityOnboardingLocatorParams } from '@kbn/deeplinks-observability/locators';
import { PLUGIN_ID } from '../../../common';

export function getLocation(params: ObservabilityOnboardingLocatorParams) {
Expand Down

0 comments on commit 05c637f

Please sign in to comment.