Skip to content

Commit

Permalink
Fix broken links and update snapshots.
Browse files Browse the repository at this point in the history
  • Loading branch information
cjcenizal committed May 15, 2020
1 parent 58b6e10 commit 68c0eb4
Show file tree
Hide file tree
Showing 36 changed files with 43 additions and 47 deletions.
4 changes: 1 addition & 3 deletions src/plugins/data/public/search/long_query_notification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,7 @@ export function LongQueryNotification(props: Props) {
<EuiButton
size="s"
onClick={async () => {
await props.application.navigateToApp(
'kibana#/management/elasticsearch/license_management'
);
await props.application.navigateToApp('kibana#/management/stack/license_management');
}}
>
<FormattedMessage
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/management/public/management_sections.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const managementSections = [
title: (
<ManagementSectionTitle
text="Ingest"
tip="Manage how data is transformed and loaded into the cluster"
tip="Manage how to transform data and load it into the cluster."
/>
),
},
Expand All @@ -57,21 +57,21 @@ export const managementSections = [
id: ManagementSectionId.InsightsAndAlerting,
title: (
<ManagementSectionTitle
text="Insights and Alerting"
text="Alerts and Insights"
tip="Manage how to detect changes in your data"
/>
),
},
{
id: ManagementSectionId.Security,
title: <ManagementSectionTitle text="Security" tip="Control access to data and apps" />,
title: <ManagementSectionTitle text="Security" tip="Control access to features and data" />,
},
{
id: ManagementSectionId.Kibana,
title: <ManagementSectionTitle text="Kibana" tip="Customize Kibana and manage its internals" />,
title: <ManagementSectionTitle text="Kibana" tip="Customize Kibana and manage saved objects" />,
},
{
id: ManagementSectionId.Stack,
title: <ManagementSectionTitle text="Stack" tip="Upgrade the Stack and manage your license" />,
title: <ManagementSectionTitle text="Stack" tip="Manage your license and upgrade the Stack" />,
},
];
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ export class WatcherFlyout extends Component<
)}{' '}
<ApmPluginContext.Provider value={this.context}>
<KibanaLink
path={`/management/elasticsearch/watcher/watches/watch/${id}`}
path={`/management/insightsAndAlerting/watcher/watches/watch/${id}`}
>
{i18n.translate(
'xpack.apm.serviceDetails.enableErrorReportsPanel.watchCreatedNotificationText.viewWatchLinkText',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export class ServiceIntegrations extends React.Component<Props, State> {
),
icon: 'watchesApp',
href: core.http.basePath.prepend(
'/app/kibana#/management/elasticsearch/watcher'
'/app/kibana#/management/insightsAndAlerting/watcher'
),
target: '_blank',
onClick: () => this.closePopover()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function NoServicesMessage({ historicalDataFound, status }: Props) {
defaultMessage:
'You may also have old data that needs to be migrated.'
})}{' '}
<KibanaLink path="/management/elasticsearch/upgrade_assistant">
<KibanaLink path="/management/stack/upgrade_assistant">
{i18n.translate('xpack.apm.servicesTable.UpgradeAssistantLink', {
defaultMessage:
'Learn more by visiting the Kibana Upgrade Assistant'
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function ServiceOverview() {
<EuiLink
href={url.format({
pathname: core.http.basePath.prepend('/app/kibana'),
hash: '/management/elasticsearch/upgrade_assistant'
hash: '/management/stack/upgrade_assistant'
})}
>
{i18n.translate(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface Props {
export const LicensePrompt = ({ text, showBetaBadge = false }: Props) => {
const licensePageUrl = useKibanaUrl(
'/app/kibana',
'/management/elasticsearch/license_management/home'
'/management/stack/license_management/home'
);

const renderLicenseBody = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { useApmPluginContext } from '../../hooks/useApmPluginContext';
export function InvalidLicenseNotification() {
const { core } = useApmPluginContext();
const manageLicenseURL = core.http.basePath.prepend(
'/app/kibana#/management/elasticsearch/license_management'
'/app/kibana#/management/stack/license_management'
);

return (
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/setHelpExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export function setHelpExtension({ chrome, http }: CoreStart) {
linkType: 'custom',
href: url.format({
pathname: http.basePath.prepend('/app/kibana'),
hash: '/management/elasticsearch/upgrade_assistant'
hash: '/management/stack/upgrade_assistant'
}),
content: i18n.translate('xpack.apm.helpMenu.upgradeAssistantLink', {
defaultMessage: 'Upgrade assistant'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ export const getIndexListUri = (filter: any) => {

export const getILMPolicyPath = (policyName: string) => {
return encodeURI(
`#/management/elasticsearch/index_lifecycle_management/policies/edit/${encodeURIComponent(
policyName
)}`
`#/management/data/index_lifecycle_management/policies/edit/${encodeURIComponent(policyName)}`
);
};
2 changes: 1 addition & 1 deletion x-pack/plugins/ingest_pipelines/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const PLUGIN_ID = 'ingest_pipelines';

export const PLUGIN_MIN_LICENSE_TYPE = basicLicense;

export const BASE_PATH = '/management/elasticsearch/ingest_pipelines';
export const BASE_PATH = '/management/ingest/ingest_pipelines';

export const API_BASE_PATH = '/api/ingest_pipelines';

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/licensing/public/plugin.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ describe('licensing plugin', () => {
expect(coreStart.overlays.banners.add).toHaveBeenCalledTimes(1);
expect(mountExpiredBannerMock).toHaveBeenCalledWith({
type: 'gold',
uploadUrl: '/app/kibana#/management/elasticsearch/license_management/upload_license',
uploadUrl: '/app/kibana#/management/stack/license_management/upload_license',
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/licensing/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup> {

private showExpiredBanner(license: ILicense) {
const uploadUrl = this.coreStart!.http.basePath.prepend(
'/app/kibana#/management/elasticsearch/license_management/upload_license'
'/app/kibana#/management/stack/license_management/upload_license'
);
this.coreStart!.overlays.banners.add(
mountExpiredBanner({
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/logstash/public/application/breadcrumbs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export function getPipelineListBreadcrumbs() {
text: i18n.translate('xpack.logstash.pipelines.listBreadcrumb', {
defaultMessage: 'Pipelines',
}),
href: '#/management/logstash/pipelines',
href: '#/management/ingest/pipelines',
},
];
}
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/logstash/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export class LogstashPlugin implements Plugin<void, void, SetupDeps> {
defaultMessage: 'Create, delete, update, and clone data ingestion pipelines.',
}),
icon: 'pipelineApp',
path: '/app/kibana#/management/logstash/pipelines',
path: '/app/kibana#/management/ingest/pipelines',
showOnHomePage: true,
category: FeatureCatalogueCategory.ADMIN,
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export const DatavisualizerSelector: FC = () => {
footer={
<EuiButton
target="_blank"
href="kibana#/management/elasticsearch/license_management/home"
href="kibana#/management/stack/license_management/home"
>
<FormattedMessage
id="xpack.ml.datavisualizer.selector.startTrialButtonLabel"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export const ResultsLinks: FC<Props> = ({
/>
}
description=""
href={`${basePath.get()}/app/kibana#/management/elasticsearch/index_management/indices/filter/${index}`}
href={`${basePath.get()}/app/kibana#/management/data/index_management/indices/filter/${index}`}
/>
</EuiFlexItem>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ class CreateWatchService {
saveWatch(watchModel)
.then(() => {
this.status.watch = this.STATUS.SAVED;
this.config.watcherEditURL = `${basePath.get()}/app/kibana#/management/elasticsearch/watcher/watches/watch/${id}/edit?_g=()`;
this.config.watcherEditURL = `${basePath.get()}/app/kibana#/management/insightsAndAlerting/watcher/watches/watch/${id}/edit?_g=()`;
resolve({
id,
url: this.config.watcherEditURL,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const OverviewSideBar: FC<Props> = ({ createAnomalyDetectionJobDisabled }

const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
const docsLink = `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/xpack-ml.html`;
const transformsLink = `${basePath.get()}/app/kibana#/management/elasticsearch/transform`;
const transformsLink = `${basePath.get()}/app/kibana#/management/data/transform`;

return (
<EuiFlexItem grow={1}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ const handleClickIncompatibleLicense = (scope, clusterName) => {
};

const handleClickInvalidLicense = (scope, clusterName) => {
const licensingPath = `${Legacy.shims.getBasePath()}/app/kibana#/management/elasticsearch/license_management/home`;
const licensingPath = `${Legacy.shims.getBasePath()}/app/kibana#/management/data/license_management/home`;

licenseWarning(scope, {
title: toMountPoint(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const LicenseUpdateInfoForRemote = ({ isPrimaryCluster }) => {

export function License(props) {
const { status, type, isExpired, expiryDate } = props;
const licenseManagement = `${Legacy.shims.getBasePath()}/app/kibana#/management/elasticsearch/license_management`;
const licenseManagement = `${Legacy.shims.getBasePath()}/app/kibana#/management/stack/license_management`;
return (
<EuiPage>
<EuiScreenReaderOnly>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ export const SelectRuleType: React.FC<SelectRuleTypeProps> = ({
const setQuery = useCallback(() => setType('query'), [setType]);
const mlCardDisabled = isReadOnly || !hasValidLicense || !isMlAdmin;
const licensingUrl = useKibana().services.application.getUrlForApp('kibana', {
path: '#/management/elasticsearch/license_management',
path: '#/management/stack/license_management',
});

return (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export const UpgradeContentsComponent = () => (
</EuiFlexItem>
<EuiFlexItem grow={false}>
<EuiButton
href={`${useBasePath()}/app/kibana#/management/elasticsearch/license_management`}
href={`${useBasePath()}/app/kibana#/management/stack/license_management`}
iconType="gear"
target="_blank"
>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/transform/public/register_feature.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
'Use transforms to pivot existing Elasticsearch indices into summarized or entity-centric indices.',
}),
icon: 'managementApp', // there is currently no Transforms icon, so using the general management app icon
path: '/app/kibana#/management/elasticsearch/transform',
path: '/app/kibana#/management/data/transform',
showOnHomePage: true,
category: FeatureCatalogueCategory.ADMIN,
});
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const ShowLicenseInfo = () => {
<p>{labels.START_TRAIL_DESC}</p>
<EuiButton
color="primary"
href={basePath + `/app/kibana#/management/elasticsearch/license_management/home`}
href={basePath + `/app/kibana#/management/stack/license_management/home`}
target="_blank"
>
{labels.START_TRAIL}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ describe('<WatchList />', () => {

expect(findTestSubject(idColumn, `watchIdColumn-${watch1.id}`).length).toBe(1);
expect(findTestSubject(idColumn, `watchIdColumn-${watch1.id}`).props().href).toEqual(
`#/management/elasticsearch/watcher/watches/watch/${watch1.id}/status`
`#/management/insightsAndAlerting/watcher/watches/watch/${watch1.id}/status`
);
});

Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/watcher/public/application/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export const App = (deps: AppDeps) => {
iconType="help"
>
{message}{' '}
<EuiLink href="#/management/elasticsearch/license_management/home">
<EuiLink href="#/management/stack/license_management/home">
<FormattedMessage
id="xpack.watcher.app.licenseErrorLinkText"
defaultMessage="Manage your license."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const listBreadcrumb: Breadcrumb = {
text: i18n.translate('xpack.watcher.breadcrumb.listLabel', {
defaultMessage: 'Watcher',
}),
href: '#/management/elasticsearch/watcher/watches/',
href: '#/management/stack/watcher/watches/',
};

export const createBreadcrumb: Breadcrumb = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const MonitoringWatchEdit = ({ pageTitle }: { pageTitle: string }) => {
values={{
watchName: watch.name,
watchStatusLink: (
<EuiLink href={`#/management/elasticsearch/watcher/watches/watch/${watch.id}/status`}>
<EuiLink href={`#/management/stack/watcher/watches/watch/${watch.id}/status`}>
<FormattedMessage
id="xpack.watcher.sections.watchEdit.monitoring.header.watchLinkTitle"
defaultMessage="View watch status."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export const WatchList = () => {
return (
<EuiLink
data-test-subj={`watchIdColumn-${id}`}
href={`#/management/elasticsearch/watcher/watches/watch/${id}/status`}
href={`#/management/stack/watcher/watches/watch/${id}/status`}
>
{id}
</EuiLink>
Expand Down Expand Up @@ -326,7 +326,7 @@ export const WatchList = () => {
)}
iconType="pencil"
color="primary"
href={`#/management/elasticsearch/watcher/watches/watch/${watch.id}/edit`}
href={`#/management/stack/watcher/watches/watch/${watch.id}/edit`}
data-test-subj="editWatchButton"
/>
</EuiToolTip>
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/watcher/public/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class WatcherUIPlugin implements Plugin<void, void, Dependencies, any> {
defaultMessage: 'Detect changes in your data by creating, managing, and monitoring alerts.',
}),
icon: 'watchesApp',
path: '/app/kibana#/management/elasticsearch/watcher/watches',
path: '/app/kibana#/management/stack/watcher/watches',
showOnHomePage: false,
};

Expand Down

0 comments on commit 68c0eb4

Please sign in to comment.