From 100790b7c033c0c562c58135fb0dfd6c7f37c02c Mon Sep 17 00:00:00 2001 From: Greg Thompson Date: Wed, 23 Oct 2019 12:52:41 -0500 Subject: [PATCH] loggingApp -> logsApp icon --- .../TransactionActionMenu/TransactionActionMenu.tsx | 8 ++++---- x-pack/legacy/plugins/infra/index.ts | 4 ++-- .../legacy/plugins/infra/public/register_feature.ts | 2 +- x-pack/legacy/plugins/infra/server/kibana.index.ts | 2 +- .../modules/logs_ui_analysis/logo.json | 2 +- .../components/logs/__snapshots__/logs.test.js.snap | 8 ++++---- .../monitoring/public/components/logs/logs.js | 2 +- .../__snapshots__/integration_group.test.tsx.snap | 12 ++++++------ .../components/functional/integration_group.tsx | 6 +++--- .../components/functional/integration_link.tsx | 2 +- .../plugins/watcher/common/types/action_types.ts | 2 +- .../watcher/public/models/action/logging_action.js | 2 +- 12 files changed, 26 insertions(+), 26 deletions(-) diff --git a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx index d4d62c4fd4d66..533bc845f14f9 100644 --- a/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx +++ b/x-pack/legacy/plugins/apm/public/components/shared/TransactionActionMenu/TransactionActionMenu.tsx @@ -81,7 +81,7 @@ export const TransactionActionMenu: FunctionComponent = ( const infraConfigItems: InfraConfigItem[] = [ { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showPodLogsLinkLabel', { defaultMessage: 'Show pod logs' } @@ -91,7 +91,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: { time } }, { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showContainerLogsLinkLabel', { defaultMessage: 'Show container logs' } @@ -101,7 +101,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: { time } }, { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showHostLogsLinkLabel', { defaultMessage: 'Show host logs' } @@ -111,7 +111,7 @@ export const TransactionActionMenu: FunctionComponent = ( query: { time } }, { - icon: 'loggingApp', + icon: 'logsApp', label: i18n.translate( 'xpack.apm.transactionActionMenu.showTraceLogsLinkLabel', { defaultMessage: 'Show trace logs' } diff --git a/x-pack/legacy/plugins/infra/index.ts b/x-pack/legacy/plugins/infra/index.ts index 7143cd5b374df..9bf679fb5ff80 100644 --- a/x-pack/legacy/plugins/infra/index.ts +++ b/x-pack/legacy/plugins/infra/index.ts @@ -56,7 +56,7 @@ export function infra(kibana: any) { defaultMessage: 'Explore your logs', }), icon: 'plugins/infra/images/logging_mono_white.svg', - euiIconType: 'loggingApp', + euiIconType: 'logsApp', id: 'infra:logs', order: 8001, title: i18n.translate('xpack.infra.linkLogsTitle', { @@ -76,7 +76,7 @@ export function infra(kibana: any) { { path: `/app/${APP_ID}#/logs`, label: logsSampleDataLinkLabel, - icon: 'loggingApp', + icon: 'logsApp', }, ]); }, diff --git a/x-pack/legacy/plugins/infra/public/register_feature.ts b/x-pack/legacy/plugins/infra/public/register_feature.ts index 952ab3e630f3e..bf56db77e360f 100644 --- a/x-pack/legacy/plugins/infra/public/register_feature.ts +++ b/x-pack/legacy/plugins/infra/public/register_feature.ts @@ -36,7 +36,7 @@ FeatureCatalogueRegistryProvider.register((i18n: I18nServiceType) => ({ defaultMessage: 'Stream logs in real time or scroll through historical views in a console-like experience.', }), - icon: 'loggingApp', + icon: 'logsApp', path: `/app/${APP_ID}#logs`, showOnHomePage: true, category: FeatureCatalogueCategory.DATA, diff --git a/x-pack/legacy/plugins/infra/server/kibana.index.ts b/x-pack/legacy/plugins/infra/server/kibana.index.ts index c412fc8b5e412..48ef846ec5275 100644 --- a/x-pack/legacy/plugins/infra/server/kibana.index.ts +++ b/x-pack/legacy/plugins/infra/server/kibana.index.ts @@ -73,7 +73,7 @@ export const initServerWithKibana = (kbnServer: KbnServer) => { name: i18n.translate('xpack.infra.featureRegistry.linkLogsTitle', { defaultMessage: 'Logs', }), - icon: 'loggingApp', + icon: 'logsApp', navLinkId: 'infra:logs', app: ['infra', 'kibana'], catalogue: ['infralogging'], diff --git a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json index ead765e474720..26b404ff331c6 100644 --- a/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json +++ b/x-pack/legacy/plugins/ml/server/models/data_recognizer/modules/logs_ui_analysis/logo.json @@ -1,3 +1,3 @@ { - "icon": "loggingApp" + "icon": "logsApp" } diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap index b108746a422bb..4affadd127530 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap +++ b/x-pack/legacy/plugins/monitoring/public/components/logs/__snapshots__/logs.test.js.snap @@ -2,7 +2,7 @@ exports[`Logs should render a link to filter by cluster uuid 1`] = ` @@ -26,7 +26,7 @@ exports[`Logs should render a link to filter by cluster uuid 1`] = ` exports[`Logs should render a link to filter by cluster uuid and index uuid 1`] = ` @@ -50,7 +50,7 @@ exports[`Logs should render a link to filter by cluster uuid and index uuid 1`] exports[`Logs should render a link to filter by cluster uuid and node uuid 1`] = ` @@ -275,7 +275,7 @@ exports[`Logs should render normally 1`] = ` size="m" /> diff --git a/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js b/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js index c59a3d595b14f..50e3cbd9af6c9 100644 --- a/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js +++ b/x-pack/legacy/plugins/monitoring/public/components/logs/logs.js @@ -169,7 +169,7 @@ export class Logs extends PureComponent { title={i18n.translate('xpack.monitoring.logs.listing.calloutTitle', { defaultMessage: 'Want to see more log entries?' })} - iconType="loggingApp" + iconType="logsApp" >

@@ -39,7 +39,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -47,7 +47,7 @@ exports[`IntegrationGroup will not display APM links when APM is unavailable 1`] @@ -71,7 +71,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable @@ -79,7 +79,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable @@ -87,7 +87,7 @@ exports[`IntegrationGroup will not display infra links when infra is unavailable diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx index 98f351aa202c6..da66235e37f1a 100644 --- a/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx +++ b/x-pack/legacy/plugins/uptime/public/components/functional/integration_group.tsx @@ -177,7 +177,7 @@ export const IntegrationGroup = ({ } )} href={getLoggingIpHref(summary, basePath)} - iconType="loggingApp" + iconType="logsApp" message={i18n.translate( 'xpack.uptime.monitorList.loggingIntegrationAction.ip.message', { @@ -200,7 +200,7 @@ export const IntegrationGroup = ({ } )} href={getLoggingKubernetesHref(summary, basePath)} - iconType="loggingApp" + iconType="logsApp" message={i18n.translate( 'xpack.uptime.monitorList.loggingIntegrationAction.kubernetes.message', { @@ -227,7 +227,7 @@ export const IntegrationGroup = ({ } )} href={getLoggingContainerHref(summary, basePath)} - iconType="loggingApp" + iconType="logsApp" message={i18n.translate( 'xpack.uptime.monitorList.loggingIntegrationAction.container.message', { diff --git a/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx b/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx index e586f083aea90..a545cd7c42927 100644 --- a/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx +++ b/x-pack/legacy/plugins/uptime/public/components/functional/integration_link.tsx @@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n'; interface IntegrationLinkProps { ariaLabel: string; href: string | undefined; - iconType: 'apmApp' | 'metricsApp' | 'loggingApp'; + iconType: 'apmApp' | 'metricsApp' | 'logsApp'; message: string; tooltipContent: string; } diff --git a/x-pack/legacy/plugins/watcher/common/types/action_types.ts b/x-pack/legacy/plugins/watcher/common/types/action_types.ts index 8247df3293d17..123bf0f58db9d 100644 --- a/x-pack/legacy/plugins/watcher/common/types/action_types.ts +++ b/x-pack/legacy/plugins/watcher/common/types/action_types.ts @@ -34,7 +34,7 @@ export interface EmailAction extends BaseAction { export interface LoggingAction extends BaseAction { type: LoggingActionType; - iconClass: 'loggingApp'; + iconClass: 'logsApp'; text: string; } diff --git a/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js b/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js index e11ebedc874c0..477ee9e2230b4 100644 --- a/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js +++ b/x-pack/legacy/plugins/watcher/public/models/action/logging_action.js @@ -68,7 +68,7 @@ export class LoggingAction extends BaseAction { static typeName = i18n.translate('xpack.watcher.models.loggingAction.typeName', { defaultMessage: 'Logging', }); - static iconClass = 'loggingApp'; + static iconClass = 'logsApp'; static selectMessage = i18n.translate('xpack.watcher.models.loggingAction.selectMessageText', { defaultMessage: 'Add an item to the logs.', });