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.

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

171991 consistent naming #174273

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .buildkite/ftr_configs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ enabled:
- x-pack/test/functional/apps/ml/short_tests/config.ts
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
- x-pack/test/functional/apps/monitoring/config.ts
- x-pack/test/functional/apps/observability_log_explorer/config.ts
- x-pack/test/functional/apps/observability_logs_explorer/config.ts
- x-pack/test/functional/apps/painless_lab/config.ts
- x-pack/test/functional/apps/remote_clusters/config.ts
- x-pack/test/functional/apps/reporting_management/config.ts
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/scripts/steps/storybooks/build_and_upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const STORYBOOKS = [
'dashboard_enhanced',
'dashboard',
'data',
'log_explorer',
'logs_explorer',
'embeddable',
'expression_error',
'expression_image',
Expand Down
8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -497,9 +497,9 @@ packages/kbn-lint-ts-projects-cli @elastic/kibana-operations
x-pack/plugins/lists @elastic/security-detection-engine
examples/locator_examples @elastic/appex-sharedux
examples/locator_explorer @elastic/appex-sharedux
x-pack/plugins/log_explorer @elastic/obs-ux-logs-team
packages/kbn-logging @elastic/kibana-core
packages/kbn-logging-mocks @elastic/kibana-core
x-pack/plugins/logs_explorer @elastic/obs-ux-logs-team
x-pack/plugins/logs_shared @elastic/obs-ux-logs-team
x-pack/plugins/logstash @elastic/logstash
packages/kbn-managed-vscode-config @elastic/kibana-operations
Expand Down Expand Up @@ -567,7 +567,7 @@ x-pack/packages/observability/alert_details @elastic/obs-ux-management-team
x-pack/packages/observability/alerting_test_data @elastic/obs-ux-management-team
x-pack/test/cases_api_integration/common/plugins/observability @elastic/response-ops
x-pack/packages/observability/get_padded_alert_time_range_util @elastic/obs-ux-management-team
x-pack/plugins/observability_log_explorer @elastic/obs-ux-logs-team
x-pack/plugins/observability_logs_explorer @elastic/obs-ux-logs-team
x-pack/plugins/observability_onboarding @elastic/obs-ux-logs-team
x-pack/plugins/observability @elastic/obs-ux-management-team
x-pack/plugins/observability_shared @elastic/observability-ui
Expand Down Expand Up @@ -1044,7 +1044,7 @@ x-pack/plugins/infra/server/lib/alerting @elastic/obs-ux-management-team
/x-pack/test/functional/apps/monitoring @elastic/obs-ux-infra_services-team
/x-pack/test/api_integration/apis/monitoring @elastic/obs-ux-infra_services-team
/x-pack/test/api_integration/apis/monitoring_collection @elastic/obs-ux-infra_services-team
/x-pack/test_serverless/functional/test_suites/observability/observability_log_explorer @elastic/obs-ux-logs-team
/x-pack/test_serverless/functional/test_suites/observability/observability_logs_explorer @elastic/obs-ux-logs-team

# Fleet
/fleet_packages.json @elastic/fleet
Expand Down Expand Up @@ -1075,7 +1075,7 @@ x-pack/plugins/infra/server/lib/alerting @elastic/obs-ux-management-team

# Logs
/x-pack/test/api_integration/apis/logs_ui @elastic/obs-ux-logs-team
/x-pack/test/functional/apps/observability_log_explorer @elastic/obs-ux-logs-team
/x-pack/test/functional/apps/observability_logs_explorer @elastic/obs-ux-logs-team

# Observability onboarding tour
/x-pack/plugins/observability_shared/public/components/tour @elastic/platform-onboarding
Expand Down
2 changes: 1 addition & 1 deletion config/serverless.es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ xpack.apm.enabled: false

xpack.cloudSecurityPosture.enabled: false
xpack.infra.enabled: false
xpack.observabilityLogExplorer.enabled: false
xpack.observabilityLogsExplorer.enabled: false
xpack.observability.enabled: false
xpack.securitySolution.enabled: false
xpack.serverless.observability.enabled: false
Expand Down
2 changes: 1 addition & 1 deletion config/serverless.security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
enterpriseSearch.enabled: false
xpack.apm.enabled: false
xpack.infra.enabled: false
xpack.observabilityLogExplorer.enabled: false
xpack.observabilityLogsExplorer.enabled: false
xpack.observability.enabled: false

## Cloud settings
Expand Down
8 changes: 4 additions & 4 deletions docs/developer/plugin-list.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -647,8 +647,8 @@ the infrastructure monitoring use-case within Kibana.
using the CURL scripts in the scripts folder.


|{kib-repo}blob/{branch}/x-pack/plugins/log_explorer/README.md[logExplorer]
|This plugin is home to the <LogExplorer /> component and related types. It implements several of the underlying concepts that the Observability Log Explorer app builds upon.
|{kib-repo}blob/{branch}/x-pack/plugins/logs_explorer/README.md[logsExplorer]
|This plugin is home to the <LogExplorer /> component and related types. It implements several of the underlying concepts that the Observability Logs Explorer app builds upon.


|{kib-repo}blob/{branch}/x-pack/plugins/logs_shared/README.md[logsShared]
Expand Down Expand Up @@ -692,8 +692,8 @@ Elastic.
|This document gives an overview of the features of the Observability AI Assistant at the time of writing, and how to use them. At a high level, the Observability AI Assistant offers contextual insights, and a chat functionality that we enrich with function calling, allowing the LLM to hook into the user's data. We also allow the LLM to store things it considers new information as embeddings into Elasticsearch, and query this knowledge base when it decides it needs more information, using ELSER.


|{kib-repo}blob/{branch}/x-pack/plugins/observability_log_explorer/README.md[observabilityLogExplorer]
|This plugin provides an app based on the LogExplorer component from the log_explorer plugin, but adds observability-specific affordances.
|{kib-repo}blob/{branch}/x-pack/plugins/observability_logs_explorer/README.md[observabilityLogsExplorer]
|This plugin provides an app based on the LogExplorer component from the logs_explorer plugin, but adds observability-specific affordances.


|{kib-repo}blob/{branch}/x-pack/plugins/observability_onboarding/README.md[observabilityOnboarding]
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -517,9 +517,9 @@
"@kbn/lists-plugin": "link:x-pack/plugins/lists",
"@kbn/locator-examples-plugin": "link:examples/locator_examples",
"@kbn/locator-explorer-plugin": "link:examples/locator_explorer",
"@kbn/log-explorer-plugin": "link:x-pack/plugins/log_explorer",
"@kbn/logging": "link:packages/kbn-logging",
"@kbn/logging-mocks": "link:packages/kbn-logging-mocks",
"@kbn/logs-explorer-plugin": "link:x-pack/plugins/logs_explorer",
"@kbn/logs-shared-plugin": "link:x-pack/plugins/logs_shared",
"@kbn/logstash-plugin": "link:x-pack/plugins/logstash",
"@kbn/management-cards-navigation": "link:packages/kbn-management/cards_navigation",
Expand Down Expand Up @@ -583,7 +583,7 @@
"@kbn/observability-alerting-test-data": "link:x-pack/packages/observability/alerting_test_data",
"@kbn/observability-fixtures-plugin": "link:x-pack/test/cases_api_integration/common/plugins/observability",
"@kbn/observability-get-padded-alert-time-range-util": "link:x-pack/packages/observability/get_padded_alert_time_range_util",
"@kbn/observability-log-explorer-plugin": "link:x-pack/plugins/observability_log_explorer",
"@kbn/observability-logs-explorer-plugin": "link:x-pack/plugins/observability_logs_explorer",
"@kbn/observability-onboarding-plugin": "link:x-pack/plugins/observability_onboarding",
"@kbn/observability-plugin": "link:x-pack/plugins/observability",
"@kbn/observability-shared-plugin": "link:x-pack/plugins/observability_shared",
Expand Down
2 changes: 1 addition & 1 deletion packages/deeplinks/observability/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

export const LOGS_APP_ID = 'logs';

export const OBSERVABILITY_LOG_EXPLORER_APP_ID = 'observability-log-explorer';
export const OBSERVABILITY_LOG_EXPLORER_APP_ID = 'observability-logs-explorer';

export const OBSERVABILITY_OVERVIEW_APP_ID = 'observability-overview';

Expand Down
4 changes: 2 additions & 2 deletions packages/deeplinks/observability/locators/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
* Side Public License, v 1.
*/

export * from './log_explorer';
export * from './observability_log_explorer';
export * from './logs_explorer';
export * from './observability_logs_explorer';
export * from './observability_onboarding';
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*/

import { SerializableRecord } from '@kbn/utility-types';
import { LogExplorerNavigationParams } from './log_explorer';
import { LogExplorerNavigationParams } from './logs_explorer';

// Will become a union once we have more origins
export interface ObservabilityLogExplorerLocationState extends SerializableRecord {
Expand Down
4 changes: 2 additions & 2 deletions packages/kbn-optimizer/limits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ pageLoadAssetSize:
licensing: 29004
links: 44490
lists: 22900
logExplorer: 54342
logsExplorer: 54342
logsShared: 281060
logstash: 53548
management: 46112
Expand All @@ -105,7 +105,7 @@ pageLoadAssetSize:
noDataPage: 5000
observability: 115443
observabilityAIAssistant: 25000
observabilityLogExplorer: 46650
observabilityLogsExplorer: 46650
observabilityOnboarding: 19573
observabilityShared: 52256
osquery: 107090
Expand Down
2 changes: 1 addition & 1 deletion src/dev/storybook/aliases.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const storybookAliases = {
infra: 'x-pack/plugins/infra/.storybook',
kibana_react: 'src/plugins/kibana_react/.storybook',
lists: 'x-pack/plugins/lists/.storybook',
log_explorer: 'x-pack/plugins/log_explorer/.storybook',
logs_explorer: 'x-pack/plugins/logs_explorer/.storybook',
management: 'packages/kbn-management/storybook/config',
observability: 'x-pack/plugins/observability/.storybook',
observability_ai_assistant: 'x-pack/plugins/observability_ai_assistant/.storybook',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import React from 'react';
import { EuiHeader, EuiHeaderSection, EuiHeaderSectionItem } from '@elastic/eui';
import { TopNavMenuBadges, TopNavMenuItems } from '@kbn/navigation-plugin/public';
import { LogExplorerTabs } from '../../../../components/log_explorer_tabs';
import { LogExplorerTabs } from '../../../../components/logs_explorer_tabs';
import { useDiscoverServices } from '../../../../hooks/use_discover_services';
import { useDiscoverTopNav } from './use_discover_topnav';
import type { DiscoverStateContainer } from '../../services/discover_state';
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/public/application/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export interface DiscoverCustomizationContext {
*/
displayMode: DiscoverDisplayMode;
/**
* Whether or not to show the Log Explorer tabs
* Whether or not to show the Logs Explorer tabs
*/
showLogExplorerTabs: boolean;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
import { withSuspense } from '@kbn/shared-ux-utility';
import { lazy } from 'react';

export type { LogExplorerTabsProps } from './log_explorer_tabs';
export type { LogExplorerTabsProps } from './logs_explorer_tabs';

export const LogExplorerTabs = withSuspense(lazy(() => import('./log_explorer_tabs')));
export const LogExplorerTabs = withSuspense(lazy(() => import('./logs_explorer_tabs')));
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import userEvent from '@testing-library/user-event';
import { render, screen } from '@testing-library/react';
import React from 'react';
import { discoverServiceMock } from '../../__mocks__/services';
import { LogExplorerTabs, LogExplorerTabsProps } from './log_explorer_tabs';
import { LogExplorerTabs, LogExplorerTabsProps } from './logs_explorer_tabs';
import { DISCOVER_APP_LOCATOR } from '../../../common';
import { ALL_DATASETS_LOCATOR_ID } from '@kbn/deeplinks-observability';

Expand Down Expand Up @@ -76,7 +76,7 @@ describe('LogExplorerTabs', () => {
expect(mockLogExplorerLocator.navigate).toHaveBeenCalledWith({});
});

it('should render Log Explorer as the selected tab', () => {
it('should render Logs Explorer as the selected tab', () => {
const { mockDiscoverLocator, mockLogExplorerLocator } = renderTabs('log-explorer');
expect(getLogExplorerTab()).toHaveAttribute('aria-selected', 'true');
userEvent.click(getLogExplorerTab());
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/discover/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ export type {
} from './customizations';
export { SEARCH_EMBEDDABLE_TYPE, SEARCH_EMBEDDABLE_CELL_ACTIONS_TRIGGER_ID } from './embeddable';
export { loadSharingDataHelpers } from './utils';
export { LogExplorerTabs, type LogExplorerTabsProps } from './components/log_explorer_tabs';
export { LogExplorerTabs, type LogExplorerTabsProps } from './components/logs_explorer_tabs';
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export const applicationUsageSchema = {
maps: commonSchema,
ml: commonSchema,
monitoring: commonSchema,
'observability-log-explorer': commonSchema,
'observability-logs-explorer': commonSchema,
'observability-overview': commonSchema,
observabilityOnboarding: commonSchema,
observabilityAIAssistant: commonSchema,
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/telemetry/schema/oss_plugins.json
Original file line number Diff line number Diff line change
Expand Up @@ -4587,7 +4587,7 @@
}
}
},
"observability-log-explorer": {
"observability-logs-explorer": {
"properties": {
"appId": {
"type": "keyword",
Expand Down Expand Up @@ -11538,4 +11538,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
'xpack.observability.unsafe.alertDetails.observability.enabled (boolean)',
'xpack.observability.unsafe.thresholdRule.enabled (any)', // conditional, is actually a boolean
'xpack.observability_onboarding.ui.enabled (boolean)',
'xpack.observabilityLogExplorer.navigation.showAppLink (any)', // conditional, is actually a boolean
'xpack.observabilityLogsExplorer.navigation.showAppLink (any)', // conditional, is actually a boolean
];
// We don't assert that actualExposedConfigKeys and expectedExposedConfigKeys are equal, because test failure messages with large
// arrays are hard to grok. Instead, we take the difference between the two arrays and assert them separately, that way it's
Expand Down
14 changes: 8 additions & 6 deletions tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -988,12 +988,12 @@
"@kbn/locator-examples-plugin/*": ["examples/locator_examples/*"],
"@kbn/locator-explorer-plugin": ["examples/locator_explorer"],
"@kbn/locator-explorer-plugin/*": ["examples/locator_explorer/*"],
"@kbn/log-explorer-plugin": ["x-pack/plugins/log_explorer"],
"@kbn/log-explorer-plugin/*": ["x-pack/plugins/log_explorer/*"],
"@kbn/logging": ["packages/kbn-logging"],
"@kbn/logging/*": ["packages/kbn-logging/*"],
"@kbn/logging-mocks": ["packages/kbn-logging-mocks"],
"@kbn/logging-mocks/*": ["packages/kbn-logging-mocks/*"],
"@kbn/logs-explorer-plugin": ["x-pack/plugins/logs_explorer"],
"@kbn/logs-explorer-plugin/*": ["x-pack/plugins/logs_explorer/*"],
"@kbn/logs-shared-plugin": ["x-pack/plugins/logs_shared"],
"@kbn/logs-shared-plugin/*": ["x-pack/plugins/logs_shared/*"],
"@kbn/logstash-plugin": ["x-pack/plugins/logstash"],
Expand Down Expand Up @@ -1128,8 +1128,8 @@
"@kbn/observability-fixtures-plugin/*": ["x-pack/test/cases_api_integration/common/plugins/observability/*"],
"@kbn/observability-get-padded-alert-time-range-util": ["x-pack/packages/observability/get_padded_alert_time_range_util"],
"@kbn/observability-get-padded-alert-time-range-util/*": ["x-pack/packages/observability/get_padded_alert_time_range_util/*"],
"@kbn/observability-log-explorer-plugin": ["x-pack/plugins/observability_log_explorer"],
"@kbn/observability-log-explorer-plugin/*": ["x-pack/plugins/observability_log_explorer/*"],
"@kbn/observability-logs-explorer-plugin": ["x-pack/plugins/observability_logs_explorer"],
"@kbn/observability-logs-explorer-plugin/*": ["x-pack/plugins/observability_logs_explorer/*"],
"@kbn/observability-onboarding-plugin": ["x-pack/plugins/observability_onboarding"],
"@kbn/observability-onboarding-plugin/*": ["x-pack/plugins/observability_onboarding/*"],
"@kbn/observability-plugin": ["x-pack/plugins/observability"],
Expand Down Expand Up @@ -1728,7 +1728,9 @@
"@kbn/zod-helpers/*": ["packages/kbn-zod-helpers/*"],
// END AUTOMATED PACKAGE LISTING
// Allows for importing from `kibana` package for the exported types.
"@emotion/core": ["typings/@emotion"]
"@emotion/core": [
"typings/@emotion"
]
},
// Support .tsx files and transform JSX into calls to React.createElement
"jsx": "react",
Expand Down Expand Up @@ -1801,4 +1803,4 @@
"@kbn/ambient-storybook-types"
]
}
}
}
Loading