Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Logs onboarding] fixing type issues #167340

Merged
merged 7 commits into from
Sep 27, 2023
Merged

[Logs onboarding] fixing type issues #167340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ad8279
fixing type issues
yngrdyn Sep 26, 2023
2c465f8
Merge branch 'main' into fixing-onboarding-type-problems
yngrdyn Sep 26, 2023
0b5f0b8
Addressing PR comments
yngrdyn Sep 27, 2023
730b801
Merge branch 'fixing-onboarding-type-problems' of github.com:yngrdyn/…
yngrdyn Sep 27, 2023
6e46917
Merge branch 'main' into fixing-onboarding-type-problems
yngrdyn Sep 27, 2023
23d36ab
Merge remote-tracking branch 'origin/main' into fixing-onboarding-typ…
yngrdyn Sep 27, 2023
5ca39ef
Removing default datasetNamewhen calling pur API
yngrdyn Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ...gins/observability_onboarding/public/components/app/custom_logs/install_elastic_agent.tsx
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion x-pack/plugins/observability_onboarding/public/locators/onboarding_locator/get_location.ts
View file
Open in desktop
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
Loading