Skip to content

Commit

Permalink
[Infra][Monitoring] Update imports from Observability to Observabilit…
Browse files Browse the repository at this point in the history
…y Shared (#157872)

Co-authored-by: Carlos Crespo <[email protected]>
  • Loading branch information
2 people authored and jasonrhodes committed May 17, 2023
1 parent 093787d commit ca614ce
Show file tree
Hide file tree
Showing 35 changed files with 38 additions and 46 deletions.
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/apps/common_providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
useUiSetting$,
} from '@kbn/kibana-react-plugin/public';
import { Storage } from '@kbn/kibana-utils-plugin/public';
import { NavigationWarningPromptProvider } from '@kbn/observability-plugin/public';
import { NavigationWarningPromptProvider } from '@kbn/observability-shared-plugin/public';
import { TriggersAndActionsUIPublicPluginStart } from '@kbn/triggers-actions-ui-plugin/public';
import { useKibanaContextForPluginProvider } from '../hooks/use_kibana';
import { InfraClientStartDeps, InfraClientStartExports } from '../types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { EuiButton } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { NoIndices } from './no_indices';

export const NoRemoteCluster = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { parse } from '@kbn/datemath';
import { EuiLink } from '@elastic/eui';
import React from 'react';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import type { InventoryItemType } from '../../../../../common/inventory_models/types';
import { getNodeDetailUrl } from '../../../../pages/link_to';
import type { MetricsExplorerTimeOptions } from '../../../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import React from 'react';
import {
noMetricIndicesPromptDescription,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { EuiButton } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useCallback } from 'react';
import { shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
import { shouldHandleLinkEvent } from '@kbn/observability-shared-plugin/public';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';

export const AnalyzeInMlButton: React.FunctionComponent<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { EuiButton, EuiButtonProps } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import React from 'react';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';

export const UserManagementLink: React.FunctionComponent<EuiButtonProps> = (props) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useMemo } from 'react';
import { getApmTraceUrl } from '@kbn/observability-plugin/public';
import { useLinkProps, LinkDescriptor } from '@kbn/observability-plugin/public';
import { useLinkProps, LinkDescriptor } from '@kbn/observability-shared-plugin/public';
import { useVisibilityState } from '../../../utils/use_visibility_state';
import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { EuiButton } from '@elastic/eui';
import React from 'react';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';

interface ViewSourceConfigurationButtonProps {
'data-test-subj'?: string;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/components/try_it_button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { EuiFlexGroup, EuiFlexItem, EuiBetaBadge, EuiLink } from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import { LinkDescriptor, useLinkProps } from '@kbn/observability-plugin/public';
import { LinkDescriptor, useLinkProps } from '@kbn/observability-shared-plugin/public';
import { css } from '@emotion/react';
import { EuiLinkColor } from '@elastic/eui';
import { ExperimentalBadge } from './experimental_badge';
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/hooks/use_breadcrumbs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import { ChromeBreadcrumb } from '@kbn/core/public';
import { useEffect } from 'react';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { observabilityTitle } from '../translations';
import { useKibanaContextForPlugin } from './use_kibana';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React from 'react';
import { Redirect, RouteComponentProps } from 'react-router-dom';

import { LinkDescriptor } from '@kbn/observability-plugin/public';
import { LinkDescriptor } from '@kbn/observability-shared-plugin/public';
import { replaceMetricTimeInQueryString } from '../metrics/metric_detail/hooks/use_metrics_time';
import { getFromFromLocation, getToFromLocation } from './query_params';
import { InventoryItemType } from '../../../common/inventory_models/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { i18n } from '@kbn/i18n';
import { LinkDescriptor } from '@kbn/observability-plugin/public';
import { LinkDescriptor } from '@kbn/observability-shared-plugin/public';
import React from 'react';
import { Redirect, RouteComponentProps } from 'react-router-dom';
import useMount from 'react-use/lib/useMount';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import moment from 'moment';
import { i18n } from '@kbn/i18n';
import React, { useCallback } from 'react';
import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
import { shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
import { shouldHandleLinkEvent } from '@kbn/observability-shared-plugin/public';
import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
import { TimeRange } from '../../../../../../common/time/time_range';
import { partitionField } from '../../../../../../common/log_analysis/job_parameters';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import { i18n } from '@kbn/i18n';
import { encode } from '@kbn/rison';
import moment from 'moment';

import { useUiTracker } from '@kbn/observability-shared-plugin/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useUiTracker, useLinkProps } from '@kbn/observability-shared-plugin/public';
import { LogEntry, LogEntryContext } from '../../../../../../common/log_entry';
import { TimeRange } from '../../../../../../common/time';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { encode } from '@kbn/rison';
import { i18n } from '@kbn/i18n';
import { useMlHref, ML_PAGES } from '@kbn/ml-plugin/public';
import { euiStyled } from '@kbn/kibana-react-plugin/common';
import { useLinkProps, shouldHandleLinkEvent } from '@kbn/observability-plugin/public';
import { useLinkProps, shouldHandleLinkEvent } from '@kbn/observability-shared-plugin/public';
import { useKibanaContextForPlugin } from '../../../../../hooks/use_kibana';
import { getFriendlyNameForPartitionId } from '../../../../../../common/log_analysis';
import {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/infra/public/pages/logs/page_content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import React, { useContext } from 'react';
import { Switch } from 'react-router-dom';
import { Route } from '@kbn/shared-ux-router';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-plugin/public';
import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-shared-plugin/public';
import { LazyAlertDropdownWrapper } from '../../alerting/log_threshold';
import { HelpCenterContent } from '../../components/help_center_content';
import { useReadOnlyBadge } from '../../hooks/use_readonly_badge';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { EuiDescribedFormGroup, EuiFormRow, EuiLink, EuiSpacer } from '@elastic/
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useCallback, useMemo } from 'react';
import { useTrackPageview } from '@kbn/observability-shared-plugin/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { LogDataViewReference } from '../../../../common/log_views';
import { FormElement } from './form_elements';
import { getFormRowProps } from './form_field_props';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useCallback, useMemo } from 'react';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import { Prompt } from '@kbn/observability-plugin/public';
import { Prompt } from '@kbn/observability-shared-plugin/public';
import { useTrackPageview } from '@kbn/observability-shared-plugin/public';
import { SourceLoadingPage } from '../../../components/source_loading_page';
import { useLogsBreadcrumbs } from '../../../hooks/use_logs_breadcrumbs';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { EuiButton, EuiButtonEmpty, EuiCallOut, EuiEmptyPrompt, EuiSpacer } from
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useCallback } from 'react';
import { SavedObjectNotFound } from '@kbn/kibana-utils-plugin/common';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { useSelector } from '@xstate/react';
import { useLogViewContext } from '../../../hooks/use_log_view';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React from 'react';
import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiLink, EuiToolTip, IconType } from '@elastic/eui';
import { TimeRange } from '@kbn/es-query';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { encode } from '@kbn/rison';
import type { CloudProvider, HostNodeRow } from '../hooks/use_hosts_table';

Expand Down
3 changes: 1 addition & 2 deletions x-pack/plugins/infra/public/pages/metrics/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import { Route } from '@kbn/shared-ux-router';

import { EuiErrorBoundary, EuiHeaderLinks, EuiHeaderLink } from '@elastic/eui';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { HeaderMenuPortal, useLinkProps } from '@kbn/observability-shared-plugin/public';
import { MetricsSourceConfigurationProperties } from '../../../common/metrics_sources';
import { HelpCenterContent } from '../../components/help_center_content';
import { useReadOnlyBadge } from '../../hooks/use_readonly_badge';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ import {
} from '@elastic/eui';
import { FormattedMessage, FormattedDate } from '@kbn/i18n-react';
import { withTheme } from '@kbn/kibana-react-plugin/common';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useUiTracker } from '@kbn/observability-shared-plugin/public';
import { useLinkProps, useUiTracker } from '@kbn/observability-shared-plugin/public';
import { datemathToEpochMillis } from '../../../../../../../utils/datemath';
import { SnapshotMetricType } from '../../../../../../../../common/inventory_models/types';
import { useSorting } from '../../../../../../../hooks/use_sorting';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import moment from 'moment';
import { EuiTabs } from '@elastic/eui';
import { EuiTab } from '@elastic/eui';
import { MLJobsAwaitingNodeWarning } from '@kbn/ml-plugin/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { SubscriptionSplashPrompt } from '../../../../../../components/subscription_splash_content';
import { useInfraMLCapabilitiesContext } from '../../../../../../containers/ml/infra_ml_capabilities';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { EuiOutsideClickDetector } from '@elastic/eui';
import { EuiIcon, EuiButtonIcon } from '@elastic/eui';
import { euiStyled } from '@kbn/kibana-react-plugin/common';
import { useKibana } from '@kbn/kibana-react-plugin/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
import { InventoryItemType } from '../../../../../../common/inventory_models/types';
import { MetricsTab } from './tabs/metrics/metrics';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { EuiFieldSearch } from '@elastic/eui';
import { EuiFlexGroup } from '@elastic/eui';
import { EuiFlexItem } from '@elastic/eui';
import { EuiButtonEmpty } from '@elastic/eui';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { TabContent, TabProps } from './shared';
import { LogStream } from '../../../../../../components/log_stream';
import { useWaffleOptionsContext } from '../../../hooks/use_waffle_options';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import {
SectionLinks,
SectionLink,
ActionMenuDivider,
} from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
useLinkProps,
} from '@kbn/observability-shared-plugin/public';
import { AlertFlyout } from '../../../../../alerting/inventory/components/alert_flyout';
import { InfraWaffleMapNode, InfraWaffleMapOptions } from '../../../../../lib/lib';
import { getNodeDetailUrl, getNodeLogsUrl } from '../../../../link_to';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { EuiButton, EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem } from '@elastic/e
import { FormattedMessage } from '@kbn/i18n-react';
import React from 'react';
import { euiStyled } from '@kbn/kibana-react-plugin/common';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { ViewSourceConfigurationButton } from '../../../../components/source_configuration/view_source_configuration_button';

interface InvalidNodeErrorProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { i18n } from '@kbn/i18n';
import React, { useState } from 'react';
import { EuiTheme, withTheme } from '@kbn/kibana-react-plugin/common';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { withMetricPageProviders } from './page_providers';
import { useMetadata } from './hooks/use_metadata';
import { useMetricsBreadcrumbs } from '../../../hooks/use_metrics_breadcrumbs';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
} from '@elastic/eui';
import DateMath from '@kbn/datemath';
import { Capabilities } from '@kbn/core/public';
import { useLinkProps } from '@kbn/observability-plugin/public';
import { useLinkProps } from '@kbn/observability-shared-plugin/public';
import { MetricsSourceConfigurationProperties } from '../../../../../common/metrics_sources';
import { AlertFlyout } from '../../../../alerting/metric_threshold/components/alert_flyout';
import { MetricsExplorerSeries } from '../../../../../common/http_api/metrics_explorer';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import { encode } from '@kbn/rison';
import { v1 as uuidv1 } from 'uuid';
import { set } from '@kbn/safer-lodash-set';
import { LinkDescriptor } from '@kbn/observability-plugin/public';
import { LinkDescriptor } from '@kbn/observability-shared-plugin/public';
import { TIMESTAMP_FIELD } from '../../../../../../common/constants';
import { MetricsSourceConfigurationProperties } from '../../../../../../common/metrics_sources';
import { colorTransformer, Color } from '../../../../../../common/color_palette';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
import { i18n } from '@kbn/i18n';
import { FormattedMessage } from '@kbn/i18n-react';
import React, { useCallback } from 'react';
import { Prompt } from '@kbn/observability-plugin/public';
import { Prompt } from '@kbn/observability-shared-plugin/public';
import { SourceLoadingPage } from '../../../components/source_loading_page';
import { useSourceContext } from '../../../containers/metrics_source';
import { useInfraMLCapabilitiesContext } from '../../../containers/ml/infra_ml_capabilities';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
import React, { useContext, useState, useEffect, useCallback } from 'react';
import { useHistory } from 'react-router-dom';
import type { IHttpFetchError, ResponseErrorBody } from '@kbn/core-http-browser';
import { HeaderMenuPortal } from '@kbn/observability-plugin/public';
import { HeaderMenuPortal } from '@kbn/observability-shared-plugin/public';
import { useTitle } from '../hooks/use_title';
import { MonitoringToolbar } from '../../components/shared/toolbar';
import { useMonitoringTimeContainerContext } from '../hooks/use_monitoring_time';
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/monitoring/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"@kbn/features-plugin",
"@kbn/infra-plugin",
"@kbn/licensing-plugin",
"@kbn/observability-plugin",
"@kbn/telemetry-collection-xpack-plugin",
"@kbn/triggers-actions-ui-plugin",
"@kbn/expect",
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/infra/tour.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import expect from '@kbn/expect';
import { observTourStepStorageKey } from '@kbn/observability-plugin/public/components/shared/tour';
import { observTourStepStorageKey } from '@kbn/observability-shared-plugin/public/components/tour/tour';
import { API_BASE_PATH } from '@kbn/guided-onboarding-plugin/common';
import { FtrProviderContext } from '../../ftr_provider_context';

Expand Down
12 changes: 4 additions & 8 deletions x-pack/test/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,9 @@
"./api_integration/apis/telemetry/fixtures/*.json",
"./monitoring_api_integration/fixtures/**/*.json",
"../../typings/**/*",
"../../packages/kbn-test/types/ftr_globals/**/*",
],
"exclude": [
"target/**/*",
"*/plugins/**/*",
"*/packages/**/*",
"*/*/packages/**/*",
"../../packages/kbn-test/types/ftr_globals/**/*"
],
"exclude": ["target/**/*", "*/plugins/**/*", "*/packages/**/*", "*/*/packages/**/*"],
"kbn_references": [
{ "path": "../../test/tsconfig.json" },
"@kbn/core",
Expand Down Expand Up @@ -126,6 +121,7 @@
"@kbn/field-formats-plugin",
"@kbn/ml-anomaly-utils",
"@kbn/infra-forge",
"@kbn/maps-vector-tile-utils",
"@kbn/observability-shared-plugin",
"@kbn/maps-vector-tile-utils"
]
}

0 comments on commit ca614ce

Please sign in to comment.