}
body={
-
-
-
-
-
-
- {' '}
-
-
-
-
+ `cluster.${name}`)}>
+ {({ hasPrivileges }) =>
+ hasPrivileges ? (
+
+
+
+
+
+ ),
+ }}
+ />
+
+
+ {policies.length === 0 ? (
+
+
+
+ ) : (
+
+
+
+ )}
+
+
+ ) : (
+
+
+
+
+
+
+ {' '}
+
+
+
+
+ )
+ }
+
}
data-test-subj="emptyPrompt"
/>
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/index.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/index.ts
index 1e89132252bec..ddd579a1a292f 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/index.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/index.ts
@@ -8,3 +8,5 @@ export { SnapshotRestoreHome } from './home';
export { RepositoryAdd } from './repository_add';
export { RepositoryEdit } from './repository_edit';
export { RestoreSnapshot } from './restore_snapshot';
+export { PolicyAdd } from './policy_add';
+export { PolicyEdit } from './policy_edit';
diff --git a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/components/cron_editor/index.js b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_add/index.ts
similarity index 84%
rename from x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/components/cron_editor/index.js
rename to x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_add/index.ts
index 764ff52dc73b9..45fa1353210cf 100644
--- a/x-pack/legacy/plugins/rollup/public/crud_app/sections/job_create/steps/components/cron_editor/index.js
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_add/index.ts
@@ -4,4 +4,4 @@
* you may not use this file except in compliance with the Elastic License.
*/
-export { CronEditor } from './cron_editor';
+export { PolicyAdd } from './policy_add';
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_add/policy_add.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_add/policy_add.tsx
new file mode 100644
index 0000000000000..3f186dad142bb
--- /dev/null
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_add/policy_add.tsx
@@ -0,0 +1,132 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useEffect, useState } from 'react';
+import { RouteComponentProps } from 'react-router-dom';
+
+import { EuiPageBody, EuiPageContent, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { SlmPolicyPayload } from '../../../../common/types';
+
+import { PolicyForm, SectionError, SectionLoading } from '../../components';
+import { useAppDependencies } from '../../index';
+import { BASE_PATH, DEFAULT_POLICY_SCHEDULE } from '../../constants';
+import { breadcrumbService, docTitleService } from '../../services/navigation';
+import { addPolicy, useLoadIndicies } from '../../services/http';
+
+export const PolicyAdd: React.FunctionComponent = ({
+ history,
+ location: { pathname },
+}) => {
+ const {
+ core: {
+ i18n: { FormattedMessage },
+ },
+ } = useAppDependencies();
+ const [isSaving, setIsSaving] = useState(false);
+ const [saveError, setSaveError] = useState(null);
+
+ const {
+ error: errorLoadingIndices,
+ isLoading: isLoadingIndices,
+ data: { indices } = {
+ indices: [],
+ },
+ } = useLoadIndicies();
+
+ // Set breadcrumb and page title
+ useEffect(() => {
+ breadcrumbService.setBreadcrumbs('policyAdd');
+ docTitleService.setTitle('policyAdd');
+ }, []);
+
+ const onSave = async (newPolicy: SlmPolicyPayload) => {
+ setIsSaving(true);
+ setSaveError(null);
+ const { name } = newPolicy;
+ const { error } = await addPolicy(newPolicy);
+ setIsSaving(false);
+ if (error) {
+ setSaveError(error);
+ } else {
+ history.push(`${BASE_PATH}/policies/${name}`);
+ }
+ };
+
+ const onCancel = () => {
+ history.push(`${BASE_PATH}/policies`);
+ };
+
+ const emptyPolicy: SlmPolicyPayload = {
+ name: '',
+ snapshotName: '',
+ schedule: DEFAULT_POLICY_SCHEDULE,
+ repository: '',
+ config: {},
+ };
+
+ const renderSaveError = () => {
+ return saveError ? (
+
+ }
+ error={saveError}
+ data-test-subj="savePolicyApiError"
+ />
+ ) : null;
+ };
+
+ const clearSaveError = () => {
+ setSaveError(null);
+ };
+
+ return (
+
+
+
+
+
+
+
+
+ {isLoadingIndices ? (
+
+
+
+ ) : errorLoadingIndices ? (
+
+ }
+ error={errorLoadingIndices}
+ />
+ ) : (
+
+ )}
+
+
+ );
+};
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_edit/index.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_edit/index.ts
new file mode 100644
index 0000000000000..68414d0ccf506
--- /dev/null
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_edit/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+export { PolicyEdit } from './policy_edit';
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_edit/policy_edit.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_edit/policy_edit.tsx
new file mode 100644
index 0000000000000..4ada745062c6f
--- /dev/null
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/policy_edit/policy_edit.tsx
@@ -0,0 +1,210 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import React, { useEffect, useState, Fragment } from 'react';
+import { RouteComponentProps } from 'react-router-dom';
+
+import { EuiPageBody, EuiPageContent, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { SlmPolicyPayload } from '../../../../common/types';
+
+import { SectionError, SectionLoading, PolicyForm } from '../../components';
+import { BASE_PATH } from '../../constants';
+import { useAppDependencies } from '../../index';
+import { breadcrumbService, docTitleService } from '../../services/navigation';
+import { editPolicy, useLoadPolicy, useLoadIndicies } from '../../services/http';
+
+interface MatchParams {
+ name: string;
+}
+
+export const PolicyEdit: React.FunctionComponent> = ({
+ match: {
+ params: { name },
+ },
+ history,
+ location: { pathname },
+}) => {
+ const {
+ core: { i18n },
+ } = useAppDependencies();
+ const { FormattedMessage } = i18n;
+
+ // Set breadcrumb and page title
+ useEffect(() => {
+ breadcrumbService.setBreadcrumbs('policyEdit');
+ docTitleService.setTitle('policyEdit');
+ }, []);
+
+ // Policy state with default empty policy
+ const [policy, setPolicy] = useState({
+ name: '',
+ snapshotName: '',
+ schedule: '',
+ repository: '',
+ config: {},
+ });
+
+ const {
+ error: errorLoadingIndices,
+ isLoading: isLoadingIndices,
+ data: { indices } = {
+ indices: [],
+ },
+ } = useLoadIndicies();
+
+ // Load policy
+ const { error: errorLoadingPolicy, isLoading: isLoadingPolicy, data: policyData } = useLoadPolicy(
+ name
+ );
+
+ // Update policy state when data is loaded
+ useEffect(() => {
+ if (policyData && policyData.policy) {
+ setPolicy(policyData.policy);
+ }
+ }, [policyData]);
+
+ // Saving policy states
+ const [isSaving, setIsSaving] = useState(false);
+ const [saveError, setSaveError] = useState(null);
+
+ // Save policy
+ const onSave = async (editedPolicy: SlmPolicyPayload) => {
+ setIsSaving(true);
+ setSaveError(null);
+ const { error } = await editPolicy(editedPolicy);
+ setIsSaving(false);
+ if (error) {
+ setSaveError(error);
+ } else {
+ history.push(`${BASE_PATH}/policies/${name}`);
+ }
+ };
+
+ const onCancel = () => {
+ history.push(`${BASE_PATH}/policies/${name}`);
+ };
+
+ const renderLoading = () => {
+ return errorLoadingPolicy ? (
+
+
+
+ ) : (
+
+
+
+ );
+ };
+
+ const renderError = () => {
+ if (errorLoadingPolicy) {
+ const notFound = errorLoadingPolicy.status === 404;
+ const errorObject = notFound
+ ? {
+ data: {
+ error: i18n.translate('xpack.snapshotRestore.editPolicy.policyNotFoundErrorMessage', {
+ defaultMessage: `The policy '{name}' does not exist.`,
+ values: {
+ name,
+ },
+ }),
+ },
+ }
+ : errorLoadingPolicy;
+ return (
+
+ }
+ error={errorObject}
+ />
+ );
+ }
+
+ if (errorLoadingIndices) {
+ return (
+
+ }
+ error={errorLoadingIndices}
+ />
+ );
+ }
+ };
+
+ const renderSaveError = () => {
+ return saveError ? (
+
+ }
+ error={saveError}
+ />
+ ) : null;
+ };
+
+ const clearSaveError = () => {
+ setSaveError(null);
+ };
+
+ const renderContent = () => {
+ if (isLoadingPolicy || isLoadingIndices) {
+ return renderLoading();
+ }
+ if (errorLoadingPolicy || errorLoadingIndices) {
+ return renderError();
+ }
+
+ return (
+
+
+
+ );
+ };
+
+ return (
+
+
+
+
+
+
+
+
+ {renderContent()}
+
+
+ );
+};
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_add/repository_add.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_add/repository_add.tsx
index 28de033bd2d00..b4a76ff4329cf 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_add/repository_add.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_add/repository_add.tsx
@@ -5,6 +5,7 @@
*/
import React, { useEffect, useState } from 'react';
import { RouteComponentProps } from 'react-router-dom';
+import { parse } from 'querystring';
import { EuiPageBody, EuiPageContent, EuiSpacer, EuiTitle } from '@elastic/eui';
import { Repository, EmptyRepository } from '../../../../common/types';
@@ -12,10 +13,13 @@ import { Repository, EmptyRepository } from '../../../../common/types';
import { RepositoryForm, SectionError } from '../../components';
import { BASE_PATH, Section } from '../../constants';
import { useAppDependencies } from '../../index';
-import { breadcrumbService } from '../../services/navigation';
+import { breadcrumbService, docTitleService } from '../../services/navigation';
import { addRepository } from '../../services/http';
-export const RepositoryAdd: React.FunctionComponent = ({ history }) => {
+export const RepositoryAdd: React.FunctionComponent = ({
+ history,
+ location: { search },
+}) => {
const {
core: {
i18n: { FormattedMessage },
@@ -25,9 +29,10 @@ export const RepositoryAdd: React.FunctionComponent = ({ hi
const [isSaving, setIsSaving] = useState(false);
const [saveError, setSaveError] = useState(null);
- // Set breadcrumb
+ // Set breadcrumb and page title
useEffect(() => {
breadcrumbService.setBreadcrumbs('repositoryAdd');
+ docTitleService.setTitle('repositoryAdd');
}, []);
const onSave = async (newRepository: Repository | EmptyRepository) => {
@@ -39,7 +44,8 @@ export const RepositoryAdd: React.FunctionComponent = ({ hi
if (error) {
setSaveError(error);
} else {
- history.push(`${BASE_PATH}/${section}/${name}`);
+ const { redirect } = parse(search.replace(/^\?/, ''));
+ history.push(redirect ? (redirect as string) : `${BASE_PATH}/${section}/${name}`);
}
};
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_edit/repository_edit.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_edit/repository_edit.tsx
index 1c6b4eaba9d77..8544ea8f5ef1a 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_edit/repository_edit.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/repository_edit/repository_edit.tsx
@@ -12,7 +12,7 @@ import { Repository, EmptyRepository } from '../../../../common/types';
import { RepositoryForm, SectionError, SectionLoading } from '../../components';
import { BASE_PATH, Section } from '../../constants';
import { useAppDependencies } from '../../index';
-import { breadcrumbService } from '../../services/navigation';
+import { breadcrumbService, docTitleService } from '../../services/navigation';
import { editRepository, useLoadRepository } from '../../services/http';
interface MatchParams {
@@ -31,9 +31,10 @@ export const RepositoryEdit: React.FunctionComponent {
breadcrumbService.setBreadcrumbs('repositoryEdit');
+ docTitleService.setTitle('repositoryEdit');
}, []);
// Repository state with default empty repository
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/restore_snapshot/restore_snapshot.tsx b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/restore_snapshot/restore_snapshot.tsx
index baa46855184c3..53956cd007633 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/sections/restore_snapshot/restore_snapshot.tsx
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/sections/restore_snapshot/restore_snapshot.tsx
@@ -11,7 +11,7 @@ import { SnapshotDetails, RestoreSettings } from '../../../../common/types';
import { BASE_PATH } from '../../constants';
import { SectionError, SectionLoading, RestoreSnapshotForm } from '../../components';
import { useAppDependencies } from '../../index';
-import { breadcrumbService } from '../../services/navigation';
+import { breadcrumbService, docTitleService } from '../../services/navigation';
import { useLoadSnapshot, executeRestore } from '../../services/http';
interface MatchParams {
@@ -30,9 +30,10 @@ export const RestoreSnapshot: React.FunctionComponent {
breadcrumbService.setBreadcrumbs('restoreSnapshot');
+ docTitleService.setTitle('restoreSnapshot');
}, []);
// Snapshot details state with default empty snapshot
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/documentation/documentation_links.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/documentation/documentation_links.ts
index 324f4d026c0b9..219292e7b0813 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/documentation/documentation_links.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/documentation/documentation_links.ts
@@ -10,10 +10,16 @@ import { REPOSITORY_DOC_PATHS } from '../../constants';
class DocumentationLinksService {
private esDocBasePath: string = '';
private esPluginDocBasePath: string = '';
+ private esStackOverviewDocBasePath: string = '';
- public init(esDocBasePath: string, esPluginDocBasePath: string): void {
+ public init(
+ esDocBasePath: string,
+ esPluginDocBasePath: string,
+ esStackOverviewDocBasePath: string
+ ): void {
this.esDocBasePath = esDocBasePath;
this.esPluginDocBasePath = esPluginDocBasePath;
+ this.esStackOverviewDocBasePath = esStackOverviewDocBasePath;
}
public getRepositoryPluginDocUrl() {
@@ -42,7 +48,7 @@ class DocumentationLinksService {
}
public getSnapshotDocUrl() {
- return `${this.esDocBasePath}/modules-snapshots.html#_snapshot`;
+ return `${this.esDocBasePath}/modules-snapshots.html#snapshots-take-snapshot`;
}
public getRestoreDocUrl() {
@@ -56,6 +62,18 @@ class DocumentationLinksService {
public getIndexSettingsUrl() {
return `${this.esDocBasePath}/index-modules.html`;
}
+
+ public getDateMathIndexNamesUrl() {
+ return `${this.esDocBasePath}/date-math-index-names.html`;
+ }
+
+ public getSlmUrl() {
+ return `${this.esDocBasePath}/slm-api-put.html`;
+ }
+
+ public getCronUrl() {
+ return `${this.esStackOverviewDocBasePath}/trigger-schedule.html#schedule-cron`;
+ }
}
export const documentationLinksService = new DocumentationLinksService();
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/http/policy_requests.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/http/policy_requests.ts
index 6a2c9c685a01f..f8266833ec3e6 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/http/policy_requests.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/http/policy_requests.ts
@@ -4,8 +4,14 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { API_BASE_PATH } from '../../../../common/constants';
-import { SlmPolicy } from '../../../../common/types';
-import { UIM_POLICY_EXECUTE, UIM_POLICY_DELETE, UIM_POLICY_DELETE_MANY } from '../../constants';
+import { SlmPolicy, SlmPolicyPayload } from '../../../../common/types';
+import {
+ UIM_POLICY_EXECUTE,
+ UIM_POLICY_DELETE,
+ UIM_POLICY_DELETE_MANY,
+ UIM_POLICY_CREATE,
+ UIM_POLICY_UPDATE,
+} from '../../constants';
import { uiMetricService } from '../ui_metric';
import { httpService } from './http';
import { useRequest, sendRequest } from './use_request';
@@ -24,6 +30,13 @@ export const useLoadPolicy = (name: SlmPolicy['name']) => {
});
};
+export const useLoadIndicies = () => {
+ return useRequest({
+ path: httpService.addBasePath(`${API_BASE_PATH}policies/indices`),
+ method: 'get',
+ });
+};
+
export const executePolicy = async (name: SlmPolicy['name']) => {
const result = sendRequest({
path: httpService.addBasePath(`${API_BASE_PATH}policy/${encodeURIComponent(name)}/run`),
@@ -47,3 +60,29 @@ export const deletePolicies = async (names: Array) => {
trackUiMetric(names.length > 1 ? UIM_POLICY_DELETE_MANY : UIM_POLICY_DELETE);
return result;
};
+
+export const addPolicy = async (newPolicy: SlmPolicyPayload) => {
+ const result = sendRequest({
+ path: httpService.addBasePath(`${API_BASE_PATH}policies`),
+ method: 'put',
+ body: newPolicy,
+ });
+
+ const { trackUiMetric } = uiMetricService;
+ trackUiMetric(UIM_POLICY_CREATE);
+ return result;
+};
+
+export const editPolicy = async (editedPolicy: SlmPolicyPayload) => {
+ const result = await sendRequest({
+ path: httpService.addBasePath(
+ `${API_BASE_PATH}policies/${encodeURIComponent(editedPolicy.name)}`
+ ),
+ method: 'put',
+ body: editedPolicy,
+ });
+
+ const { trackUiMetric } = uiMetricService;
+ trackUiMetric(UIM_POLICY_UPDATE);
+ return result;
+};
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/breadcrumb.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/breadcrumb.ts
index fa9b886fa55b8..23d3f215d058c 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/breadcrumb.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/breadcrumb.ts
@@ -4,50 +4,128 @@
* you may not use this file except in compliance with the Elastic License.
*/
-import { BASE_PATH } from '../../constants';
import { textService } from '../text';
+import {
+ linkToHome,
+ linkToSnapshots,
+ linkToRepositories,
+ linkToPolicies,
+ linkToRestoreStatus,
+} from './';
class BreadcrumbService {
private chrome: any;
- private breadcrumbs: any = {
- management: {},
- home: {},
- repositoryAdd: {},
- repositoryEdit: {},
- restoreSnapshot: {},
+ private breadcrumbs: {
+ [key: string]: Array<{
+ text: string;
+ href?: string;
+ }>;
+ } = {
+ management: [],
+ home: [],
+ snapshots: [],
+ repositories: [],
+ policies: [],
+ restore_status: [],
+ repositoryAdd: [],
+ repositoryEdit: [],
+ restoreSnapshot: [],
+ policyAdd: [],
+ policyEdit: [],
};
public init(chrome: any, managementBreadcrumb: any): void {
this.chrome = chrome;
- this.breadcrumbs.management = managementBreadcrumb;
- this.breadcrumbs.home = {
- text: textService.breadcrumbs.home,
- href: `#${BASE_PATH}`,
- };
- this.breadcrumbs.repositoryAdd = {
- text: textService.breadcrumbs.repositoryAdd,
- };
- this.breadcrumbs.repositoryEdit = {
- text: textService.breadcrumbs.repositoryEdit,
- };
- this.breadcrumbs.restoreSnapshot = {
- text: textService.breadcrumbs.restoreSnapshot,
- };
+ this.breadcrumbs.management = [managementBreadcrumb];
+
+ // Home and sections
+ this.breadcrumbs.home = [
+ ...this.breadcrumbs.management,
+ {
+ text: textService.breadcrumbs.home,
+ href: linkToHome(),
+ },
+ ];
+ this.breadcrumbs.snapshots = [
+ ...this.breadcrumbs.home,
+ {
+ text: textService.breadcrumbs.snapshots,
+ href: linkToSnapshots(),
+ },
+ ];
+ this.breadcrumbs.repositories = [
+ ...this.breadcrumbs.home,
+ {
+ text: textService.breadcrumbs.repositories,
+ href: linkToRepositories(),
+ },
+ ];
+ this.breadcrumbs.policies = [
+ ...this.breadcrumbs.home,
+ {
+ text: textService.breadcrumbs.policies,
+ href: linkToPolicies(),
+ },
+ ];
+ this.breadcrumbs.restore_status = [
+ ...this.breadcrumbs.home,
+ {
+ text: textService.breadcrumbs.restore_status,
+ href: linkToRestoreStatus(),
+ },
+ ];
+
+ // Inner pages
+ this.breadcrumbs.repositoryAdd = [
+ ...this.breadcrumbs.repositories,
+ {
+ text: textService.breadcrumbs.repositoryAdd,
+ },
+ ];
+ this.breadcrumbs.repositoryEdit = [
+ ...this.breadcrumbs.repositories,
+ {
+ text: textService.breadcrumbs.repositoryEdit,
+ },
+ ];
+ this.breadcrumbs.restoreSnapshot = [
+ ...this.breadcrumbs.snapshots,
+ {
+ text: textService.breadcrumbs.restoreSnapshot,
+ },
+ ];
+ this.breadcrumbs.policyAdd = [
+ ...this.breadcrumbs.policies,
+ {
+ text: textService.breadcrumbs.policyAdd,
+ },
+ ];
+ this.breadcrumbs.policyEdit = [
+ ...this.breadcrumbs.policies,
+ {
+ text: textService.breadcrumbs.policyEdit,
+ },
+ ];
}
public setBreadcrumbs(type: string): void {
- if (!this.breadcrumbs[type]) {
- return;
- }
- if (type === 'home') {
- this.chrome.breadcrumbs.set([this.breadcrumbs.management, this.breadcrumbs.home]);
- } else {
- this.chrome.breadcrumbs.set([
- this.breadcrumbs.management,
- this.breadcrumbs.home,
- this.breadcrumbs[type],
- ]);
- }
+ const newBreadcrumbs = this.breadcrumbs[type]
+ ? [...this.breadcrumbs[type]]
+ : [...this.breadcrumbs.home];
+
+ // Pop off last breadcrumb
+ const lastBreadcrumb = newBreadcrumbs.pop() as {
+ text: string;
+ href?: string;
+ };
+
+ // Put last breadcrumb back without href
+ newBreadcrumbs.push({
+ ...lastBreadcrumb,
+ href: undefined,
+ });
+
+ this.chrome.breadcrumbs.set(newBreadcrumbs);
}
}
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/doc_title.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/doc_title.ts
new file mode 100644
index 0000000000000..a42d09f2a2f45
--- /dev/null
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/doc_title.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { textService } from '../text';
+
+class DocTitleService {
+ private changeDocTitle: any = () => {};
+
+ public init(changeDocTitle: any): void {
+ this.changeDocTitle = changeDocTitle;
+ }
+
+ public setTitle(page?: string): void {
+ if (!page || page === 'home') {
+ this.changeDocTitle(`${textService.breadcrumbs.home}`);
+ } else if (textService.breadcrumbs[page]) {
+ this.changeDocTitle(`${textService.breadcrumbs[page]} - ${textService.breadcrumbs.home}`);
+ }
+ }
+}
+
+export const docTitleService = new DocTitleService();
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/index.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/index.ts
index f1e3c537c5d70..badb47600329d 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/index.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/index.ts
@@ -5,4 +5,5 @@
*/
export { breadcrumbService } from './breadcrumb';
+export { docTitleService } from './doc_title';
export * from './links';
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/links.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/links.ts
index 9f8426e84e214..6f95000726106 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/links.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/navigation/links.ts
@@ -6,6 +6,10 @@
import { BASE_PATH } from '../../constants';
+export function linkToHome() {
+ return `#${BASE_PATH}`;
+}
+
export function linkToRepositories() {
return `#${BASE_PATH}/repositories`;
}
@@ -18,8 +22,10 @@ export function linkToEditRepository(repositoryName: string) {
return `#${BASE_PATH}/edit_repository/${encodeURIComponent(repositoryName)}`;
}
-export function linkToAddRepository() {
- return `#${BASE_PATH}/add_repository`;
+export function linkToAddRepository(redirect?: string) {
+ return `#${BASE_PATH}/add_repository${
+ redirect ? `?redirect=${encodeURIComponent(redirect)}` : ''
+ }`;
}
export function linkToSnapshots(repositoryName?: string, policyName?: string) {
@@ -44,6 +50,22 @@ export function linkToRestoreSnapshot(repositoryName: string, snapshotName: stri
)}`;
}
+export function linkToPolicies() {
+ return `#${BASE_PATH}/policies`;
+}
+
export function linkToPolicy(policyName: string) {
return `#${BASE_PATH}/policies/${encodeURIComponent(policyName)}`;
}
+
+export function linkToEditPolicy(policyName: string) {
+ return `#${BASE_PATH}/edit_policy/${encodeURIComponent(policyName)}`;
+}
+
+export function linkToAddPolicy() {
+ return `#${BASE_PATH}/add_policy`;
+}
+
+export function linkToRestoreStatus() {
+ return `#${BASE_PATH}/restore_status`;
+}
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/text/text.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/text/text.ts
index 50e6555e9bce4..ec92250373a05 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/text/text.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/text/text.ts
@@ -51,6 +51,18 @@ class TextService {
home: i18n.translate('xpack.snapshotRestore.home.breadcrumbTitle', {
defaultMessage: 'Snapshot and Restore',
}),
+ snapshots: i18n.translate('xpack.snapshotRestore.snapshots.breadcrumbTitle', {
+ defaultMessage: 'Snapshots',
+ }),
+ repositories: i18n.translate('xpack.snapshotRestore.repositories.breadcrumbTitle', {
+ defaultMessage: 'Repositories',
+ }),
+ policies: i18n.translate('xpack.snapshotRestore.policies.breadcrumbTitle', {
+ defaultMessage: 'Policies',
+ }),
+ restore_status: i18n.translate('xpack.snapshotRestore.restoreStatus.breadcrumbTitle', {
+ defaultMessage: 'Restore Status',
+ }),
repositoryAdd: i18n.translate('xpack.snapshotRestore.addRepository.breadcrumbTitle', {
defaultMessage: 'Add repository',
}),
@@ -60,6 +72,12 @@ class TextService {
restoreSnapshot: i18n.translate('xpack.snapshotRestore.restoreSnapshot.breadcrumbTitle', {
defaultMessage: 'Restore snapshot',
}),
+ policyAdd: i18n.translate('xpack.snapshotRestore.addPolicy.breadcrumbTitle', {
+ defaultMessage: 'Add policy',
+ }),
+ policyEdit: i18n.translate('xpack.snapshotRestore.editPolicy.breadcrumbTitle', {
+ defaultMessage: 'Edit policy',
+ }),
};
}
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/index.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/index.ts
index f987d432f02f6..7fd755497eec6 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/index.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/index.ts
@@ -11,3 +11,5 @@ export {
} from './validate_repository';
export { RestoreValidation, validateRestore } from './validate_restore';
+
+export { PolicyValidation, validatePolicy } from './validate_policy';
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/validate_policy.ts b/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/validate_policy.ts
new file mode 100644
index 0000000000000..53c62da97bdac
--- /dev/null
+++ b/x-pack/legacy/plugins/snapshot_restore/public/app/services/validation/validate_policy.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+import { SlmPolicyPayload } from '../../../../common/types';
+import { textService } from '../text';
+
+export interface PolicyValidation {
+ isValid: boolean;
+ errors: { [key: string]: React.ReactNode[] };
+}
+
+const isStringEmpty = (str: string | null): boolean => {
+ return str ? !Boolean(str.trim()) : true;
+};
+
+export const validatePolicy = (policy: SlmPolicyPayload): PolicyValidation => {
+ const i18n = textService.i18n;
+
+ const { name, snapshotName, schedule, repository, config } = policy;
+
+ const validation: PolicyValidation = {
+ isValid: true,
+ errors: {
+ name: [],
+ snapshotName: [],
+ schedule: [],
+ repository: [],
+ indices: [],
+ },
+ };
+
+ if (isStringEmpty(name)) {
+ validation.errors.name.push(
+ i18n.translate('xpack.snapshotRestore.policyValidation.nameRequiredError', {
+ defaultMessage: 'Policy name is required.',
+ })
+ );
+ }
+
+ if (isStringEmpty(snapshotName)) {
+ validation.errors.snapshotName.push(
+ i18n.translate('xpack.snapshotRestore.policyValidation.snapshotNameRequiredError', {
+ defaultMessage: 'Snapshot name is required.',
+ })
+ );
+ }
+
+ if (isStringEmpty(schedule)) {
+ validation.errors.schedule.push(
+ i18n.translate('xpack.snapshotRestore.policyValidation.scheduleRequiredError', {
+ defaultMessage: 'Schedule is required.',
+ })
+ );
+ }
+
+ if (isStringEmpty(repository)) {
+ validation.errors.repository.push(
+ i18n.translate('xpack.snapshotRestore.policyValidation.repositoryRequiredError', {
+ defaultMessage: 'Repository is required.',
+ })
+ );
+ }
+
+ if (config && typeof config.indices === 'string' && config.indices.trim().length === 0) {
+ validation.errors.indices.push(
+ i18n.translate('xpack.snapshotRestore.policyValidation.indexPatternRequiredError', {
+ defaultMessage: 'At least one index pattern is required.',
+ })
+ );
+ }
+
+ if (config && Array.isArray(config.indices) && config.indices.length === 0) {
+ validation.errors.indices.push(
+ i18n.translate('xpack.snapshotRestore.policyValidation.indicesRequiredError', {
+ defaultMessage: 'You must select at least one index.',
+ })
+ );
+ }
+
+ // Remove fields with no errors
+ validation.errors = Object.entries(validation.errors)
+ .filter(([key, value]) => value.length > 0)
+ .reduce((errs: PolicyValidation['errors'], [key, value]) => {
+ errs[key] = value;
+ return errs;
+ }, {});
+
+ // Set overall validations status
+ if (Object.keys(validation.errors).length > 0) {
+ validation.isValid = false;
+ }
+
+ return validation;
+};
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/plugin.ts b/x-pack/legacy/plugins/snapshot_restore/public/plugin.ts
index f590237bec737..cd6d7233722bd 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/plugin.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/plugin.ts
@@ -11,7 +11,7 @@ import { AppCore, AppPlugins } from './app/types';
import template from './index.html';
import { Core, Plugins } from './shim';
-import { breadcrumbService } from './app/services/navigation';
+import { breadcrumbService, docTitleService } from './app/services/navigation';
import { documentationLinksService } from './app/services/documentation';
import { httpService } from './app/services/http';
import { textService } from './app/services/text';
@@ -21,7 +21,7 @@ const REACT_ROOT_ID = 'snapshotRestoreReactRoot';
export class Plugin {
public start(core: Core, plugins: Plugins): void {
- const { i18n, routing, http, chrome, notification, documentation } = core;
+ const { i18n, routing, http, chrome, notification, documentation, docTitle } = core;
const { management, uiMetric } = plugins;
// Register management section
@@ -38,8 +38,13 @@ export class Plugin {
// Initialize services
textService.init(i18n);
breadcrumbService.init(chrome, management.constants.BREADCRUMB);
- documentationLinksService.init(documentation.esDocBasePath, documentation.esPluginDocBasePath);
uiMetricService.init(uiMetric.createUiStatsReporter);
+ documentationLinksService.init(
+ documentation.esDocBasePath,
+ documentation.esPluginDocBasePath,
+ documentation.esStackOverviewDocBasePath
+ );
+ docTitleService.init(docTitle.change);
const unmountReactApp = (): void => {
const elem = document.getElementById(REACT_ROOT_ID);
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/shared_imports.ts b/x-pack/legacy/plugins/snapshot_restore/public/shared_imports.ts
index 3d93b882733ab..c79eaa08de95f 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/shared_imports.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/shared_imports.ts
@@ -11,3 +11,8 @@ export {
sendRequest,
useRequest,
} from '../../../../../src/plugins/es_ui_shared/public/request';
+
+export {
+ CronEditor,
+ DAY,
+} from '../../../../../src/plugins/es_ui_shared/public/components/cron_editor';
diff --git a/x-pack/legacy/plugins/snapshot_restore/public/shim.ts b/x-pack/legacy/plugins/snapshot_restore/public/shim.ts
index 77604f90fd570..9c9d2d7d3ea86 100644
--- a/x-pack/legacy/plugins/snapshot_restore/public/shim.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/public/shim.ts
@@ -12,6 +12,7 @@ import { DOC_LINK_VERSION, ELASTIC_WEBSITE_URL } from 'ui/documentation_links';
import { management, MANAGEMENT_BREADCRUMB } from 'ui/management';
import { fatalError, toastNotifications } from 'ui/notify';
import routes from 'ui/routes';
+import { docTitle } from 'ui/doc_title/doc_title';
import { HashRouter } from 'react-router-dom';
@@ -52,6 +53,10 @@ export interface Core extends AppCore {
documentation: {
esDocBasePath: string;
esPluginDocBasePath: string;
+ esStackOverviewDocBasePath: string;
+ };
+ docTitle: {
+ change: typeof docTitle.change;
};
}
@@ -108,6 +113,10 @@ export function createShim(): { core: Core; plugins: Plugins } {
documentation: {
esDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/`,
esPluginDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/plugins/${DOC_LINK_VERSION}/`,
+ esStackOverviewDocBasePath: `${ELASTIC_WEBSITE_URL}guide/en/elastic-stack-overview/${DOC_LINK_VERSION}/`,
+ },
+ docTitle: {
+ change: docTitle.change,
},
},
plugins: {
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/client/elasticsearch_slm.ts b/x-pack/legacy/plugins/snapshot_restore/server/client/elasticsearch_slm.ts
index c37cc51f67eb0..79196f9bbe385 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/client/elasticsearch_slm.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/client/elasticsearch_slm.ts
@@ -60,4 +60,18 @@ export const elasticsearchJsPlugin = (Client: any, config: any, components: any)
],
method: 'PUT',
});
+
+ slm.updatePolicy = ca({
+ urls: [
+ {
+ fmt: '/_slm/policy/<%=name%>',
+ req: {
+ name: {
+ type: 'string',
+ },
+ },
+ },
+ ],
+ method: 'PUT',
+ });
};
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/lib/index.ts b/x-pack/legacy/plugins/snapshot_restore/server/lib/index.ts
index b0d65ff06d80e..6e54f997209ab 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/lib/index.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/lib/index.ts
@@ -9,7 +9,5 @@ export {
serializeRepositorySettings,
} from './repository_serialization';
export { cleanSettings } from './clean_settings';
-export { deserializeSnapshotDetails, deserializeSnapshotConfig } from './snapshot_serialization';
-export { deserializeRestoreShard } from './restore_serialization';
export { getManagedRepositoryName } from './get_managed_repository_name';
-export { deserializePolicy } from './policy_serialization';
+export { deserializeRestoreShard } from './restore_serialization';
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/app.ts b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/app.ts
index c97317858f98a..6c7ad0ae30387 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/app.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/app.ts
@@ -8,6 +8,7 @@ import { wrapCustomError } from '../../../../../server/lib/create_router/error_w
import {
APP_REQUIRED_CLUSTER_PRIVILEGES,
APP_RESTORE_INDEX_PRIVILEGES,
+ APP_SLM_CLUSTER_PRIVILEGES,
} from '../../../common/constants';
// NOTE: now we import it from our "public" folder, but when the Authorisation lib
// will move to the "es_ui_shared" plugin, it will be imported from its "static" folder
@@ -65,7 +66,7 @@ export const getPrivilegesHandler: RouterRouteHandler = async (
path: '/_security/user/_has_privileges',
method: 'POST',
body: {
- cluster: APP_REQUIRED_CLUSTER_PRIVILEGES,
+ cluster: [...APP_REQUIRED_CLUSTER_PRIVILEGES, ...APP_SLM_CLUSTER_PRIVILEGES],
},
}
);
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.test.ts b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.test.ts
index f2335d4f78dd9..52e6449559bcc 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.test.ts
@@ -4,7 +4,15 @@
* you may not use this file except in compliance with the Elastic License.
*/
import { Request, ResponseToolkit } from 'hapi';
-import { getAllHandler, getOneHandler, executeHandler, deleteHandler } from './policy';
+import {
+ getAllHandler,
+ getOneHandler,
+ executeHandler,
+ deleteHandler,
+ createHandler,
+ updateHandler,
+ getIndicesHandler,
+} from './policy';
describe('[Snapshot and Restore API Routes] Restore', () => {
const mockRequest = {} as Request;
@@ -209,4 +217,110 @@ describe('[Snapshot and Restore API Routes] Restore', () => {
).resolves.toEqual(expectedResponse);
});
});
+
+ describe('createHandler()', () => {
+ const name = 'fooPolicy';
+ const mockCreateRequest = ({
+ payload: {
+ name,
+ },
+ } as unknown) as Request;
+
+ it('should return successful ES response', async () => {
+ const mockEsResponse = { acknowledged: true };
+ const callWithRequest = jest
+ .fn()
+ .mockReturnValueOnce({})
+ .mockReturnValueOnce(mockEsResponse);
+ const expectedResponse = { ...mockEsResponse };
+ await expect(
+ createHandler(mockCreateRequest, callWithRequest, mockResponseToolkit)
+ ).resolves.toEqual(expectedResponse);
+ });
+
+ it('should return error if policy with the same name already exists', async () => {
+ const mockEsResponse = { [name]: {} };
+ const callWithRequest = jest.fn().mockReturnValue(mockEsResponse);
+ await expect(
+ createHandler(mockCreateRequest, callWithRequest, mockResponseToolkit)
+ ).rejects.toThrow();
+ });
+
+ it('should throw if ES error', async () => {
+ const callWithRequest = jest
+ .fn()
+ .mockReturnValueOnce({})
+ .mockRejectedValueOnce(new Error());
+ await expect(
+ createHandler(mockCreateRequest, callWithRequest, mockResponseToolkit)
+ ).rejects.toThrow();
+ });
+ });
+
+ describe('updateHandler()', () => {
+ const name = 'fooPolicy';
+ const mockCreateRequest = ({
+ params: {
+ name,
+ },
+ payload: {
+ name,
+ },
+ } as unknown) as Request;
+
+ it('should return successful ES response', async () => {
+ const mockEsResponse = { acknowledged: true };
+ const callWithRequest = jest
+ .fn()
+ .mockReturnValueOnce({ [name]: {} })
+ .mockReturnValueOnce(mockEsResponse);
+ const expectedResponse = { ...mockEsResponse };
+ await expect(
+ updateHandler(mockCreateRequest, callWithRequest, mockResponseToolkit)
+ ).resolves.toEqual(expectedResponse);
+ });
+
+ it('should throw if ES error', async () => {
+ const callWithRequest = jest.fn().mockRejectedValueOnce(new Error());
+ await expect(
+ updateHandler(mockCreateRequest, callWithRequest, mockResponseToolkit)
+ ).rejects.toThrow();
+ });
+ });
+
+ describe('getIndicesHandler()', () => {
+ it('should arrify and sort index names returned from ES', async () => {
+ const mockEsResponse = [
+ {
+ index: 'fooIndex',
+ },
+ {
+ index: 'barIndex',
+ },
+ ];
+ const callWithRequest = jest.fn().mockReturnValueOnce(mockEsResponse);
+ const expectedResponse = {
+ indices: ['barIndex', 'fooIndex'],
+ };
+ await expect(
+ getIndicesHandler(mockRequest, callWithRequest, mockResponseToolkit)
+ ).resolves.toEqual(expectedResponse);
+ });
+
+ it('should return empty array if no indices returned from ES', async () => {
+ const mockEsResponse: any[] = [];
+ const callWithRequest = jest.fn().mockReturnValueOnce(mockEsResponse);
+ const expectedResponse = { indices: [] };
+ await expect(
+ getIndicesHandler(mockRequest, callWithRequest, mockResponseToolkit)
+ ).resolves.toEqual(expectedResponse);
+ });
+
+ it('should throw if ES error', async () => {
+ const callWithRequest = jest.fn().mockRejectedValueOnce(new Error());
+ await expect(
+ getIndicesHandler(mockRequest, callWithRequest, mockResponseToolkit)
+ ).rejects.toThrow();
+ });
+ });
});
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.ts b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.ts
index 28b75b706bcad..ed16a44bccdc6 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/policy.ts
@@ -8,14 +8,17 @@ import {
wrapCustomError,
wrapEsError,
} from '../../../../../server/lib/create_router/error_wrappers';
-import { SlmPolicyEs, SlmPolicy } from '../../../common/types';
-import { deserializePolicy } from '../../lib';
+import { SlmPolicyEs, SlmPolicy, SlmPolicyPayload } from '../../../common/types';
+import { deserializePolicy, serializePolicy } from '../../../common/lib';
export function registerPolicyRoutes(router: Router) {
router.get('policies', getAllHandler);
router.get('policy/{name}', getOneHandler);
router.post('policy/{name}/run', executeHandler);
router.delete('policies/{names}', deleteHandler);
+ router.put('policies', createHandler);
+ router.put('policies/{name}', updateHandler);
+ router.get('policies/indices', getIndicesHandler);
}
export const getAllHandler: RouterRouteHandler = async (
@@ -96,3 +99,65 @@ export const deleteHandler: RouterRouteHandler = async (req, callWithRequest) =>
return response;
};
+
+export const createHandler: RouterRouteHandler = async (req, callWithRequest) => {
+ const policy = req.payload as SlmPolicyPayload;
+ const { name } = policy;
+ const conflictError = wrapCustomError(
+ new Error('There is already a policy with that name.'),
+ 409
+ );
+
+ // Check that policy with the same name doesn't already exist
+ try {
+ const policyByName = await callWithRequest('slm.policy', { name });
+ if (policyByName[name]) {
+ throw conflictError;
+ }
+ } catch (e) {
+ // Rethrow conflict error but silently swallow all others
+ if (e === conflictError) {
+ throw e;
+ }
+ }
+
+ // Otherwise create new policy
+ return await callWithRequest('slm.updatePolicy', {
+ name,
+ body: serializePolicy(policy),
+ });
+};
+
+export const updateHandler: RouterRouteHandler = async (req, callWithRequest) => {
+ const { name } = req.params;
+ const policy = req.payload as SlmPolicyPayload;
+
+ // Check that policy with the given name exists
+ // If it doesn't exist, 404 will be thrown by ES and will be returned
+ await callWithRequest('slm.policy', { name });
+
+ // Otherwise update policy
+ return await callWithRequest('slm.updatePolicy', {
+ name,
+ body: serializePolicy(policy),
+ });
+};
+
+export const getIndicesHandler: RouterRouteHandler = async (
+ req,
+ callWithRequest
+): Promise<{
+ indices: string[];
+}> => {
+ // Get indices
+ const indices: Array<{
+ index: string;
+ }> = await callWithRequest('cat.indices', {
+ format: 'json',
+ h: 'index',
+ });
+
+ return {
+ indices: indices.map(({ index }) => index).sort(),
+ };
+};
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.test.ts b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.test.ts
index ba422367415c0..5abadaab59d7e 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.test.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.test.ts
@@ -55,6 +55,10 @@ describe('[Snapshot and Restore API Routes] Snapshots', () => {
const mockRequest = {} as Request;
test('combines snapshots and their repositories returned from ES', async () => {
+ const mockSnapshotGetPolicyEsResponse = {
+ fooPolicy: {},
+ };
+
const mockSnapshotGetRepositoryEsResponse = {
fooRepository: {},
barRepository: {},
@@ -78,6 +82,7 @@ describe('[Snapshot and Restore API Routes] Snapshots', () => {
const callWithRequest = jest
.fn()
+ .mockReturnValueOnce(mockSnapshotGetPolicyEsResponse)
.mockReturnValueOnce(mockSnapshotGetRepositoryEsResponse)
.mockReturnValueOnce(mockGetSnapshotsFooResponse)
.mockReturnValueOnce(mockGetSnapshotsBarResponse);
@@ -85,6 +90,7 @@ describe('[Snapshot and Restore API Routes] Snapshots', () => {
const expectedResponse = {
errors: {},
repositories: ['fooRepository', 'barRepository'],
+ policies: ['fooPolicy'],
snapshots: [
{
...defaultSnapshot,
@@ -106,12 +112,17 @@ describe('[Snapshot and Restore API Routes] Snapshots', () => {
});
test('returns empty arrays if no snapshots returned from ES', async () => {
+ const mockSnapshotGetPolicyEsResponse = {};
const mockSnapshotGetRepositoryEsResponse = {};
- const callWithRequest = jest.fn().mockReturnValue(mockSnapshotGetRepositoryEsResponse);
+ const callWithRequest = jest
+ .fn()
+ .mockReturnValue(mockSnapshotGetPolicyEsResponse)
+ .mockReturnValue(mockSnapshotGetRepositoryEsResponse);
const expectedResponse = {
errors: [],
snapshots: [],
repositories: [],
+ policies: [],
};
const response = await getAllHandler(mockRequest, callWithRequest, mockResponseToolkit);
diff --git a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.ts b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.ts
index 5933f1e47bc12..ec973d500f84f 100644
--- a/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.ts
+++ b/x-pack/legacy/plugins/snapshot_restore/server/routes/api/snapshots.ts
@@ -6,8 +6,9 @@
import { Router, RouterRouteHandler } from '../../../../../server/lib/create_router';
import { wrapEsError } from '../../../../../server/lib/create_router/error_wrappers';
import { SnapshotDetails, SnapshotDetailsEs } from '../../../common/types';
+import { deserializeSnapshotDetails } from '../../../common/lib';
import { Plugins } from '../../../shim';
-import { deserializeSnapshotDetails, getManagedRepositoryName } from '../../lib';
+import { getManagedRepositoryName } from '../../lib';
let callWithInternalUser: any;
@@ -24,10 +25,22 @@ export const getAllHandler: RouterRouteHandler = async (
): Promise<{
snapshots: SnapshotDetails[];
errors: any[];
+ policies: string[];
repositories: string[];
managedRepository?: string;
}> => {
const managedRepository = await getManagedRepositoryName(callWithInternalUser);
+ let policies: string[] = [];
+
+ // Attempt to retrieve policies
+ // This could fail if user doesn't have access to read SLM policies
+ try {
+ const policiesByName = await callWithRequest('slm.policies');
+ policies = Object.keys(policiesByName);
+ } catch (e) {
+ // Silently swallow error as policy names aren't required in UI
+ }
+
const repositoriesByName = await callWithRequest('snapshot.getRepository', {
repository: '_all',
});
@@ -35,7 +48,7 @@ export const getAllHandler: RouterRouteHandler = async (
const repositoryNames = Object.keys(repositoriesByName);
if (repositoryNames.length === 0) {
- return { snapshots: [], errors: [], repositories: [] };
+ return { snapshots: [], errors: [], repositories: [], policies };
}
const snapshots: SnapshotDetails[] = [];
@@ -70,6 +83,7 @@ export const getAllHandler: RouterRouteHandler = async (
return {
snapshots,
+ policies,
repositories,
errors,
};
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index b43df00186bf2..f176e8c37ce5d 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -8712,26 +8712,6 @@
"xpack.rollupJobs.createAction.jobIdAlreadyExistsErrorMessage": "ID「{jobConfigId}」のジョブが既に存在します。",
"xpack.rollupJobs.createBreadcrumbTitle": "作成",
"xpack.rollupJobs.createTitle": "ロールアップジョブを作成",
- "xpack.rollupJobs.cronEditor.cronDaily.fieldHour.textAtLabel": "時点で",
- "xpack.rollupJobs.cronEditor.cronDaily.fieldTimeLabel": "時間",
- "xpack.rollupJobs.cronEditor.cronHourly.fieldMinute.textAtLabel": "時点で",
- "xpack.rollupJobs.cronEditor.cronHourly.fieldTimeLabel": "分",
- "xpack.rollupJobs.cronEditor.cronMonthly.fieldDateLabel": "日付",
- "xpack.rollupJobs.cronEditor.cronMonthly.fieldHour.textAtLabel": "時点で",
- "xpack.rollupJobs.cronEditor.cronMonthly.fieldTimeLabel": "時間",
- "xpack.rollupJobs.cronEditor.cronMonthly.textOnTheLabel": "On the",
- "xpack.rollupJobs.cronEditor.cronWeekly.fieldDateLabel": "日",
- "xpack.rollupJobs.cronEditor.cronWeekly.fieldHour.textAtLabel": "時点で",
- "xpack.rollupJobs.cronEditor.cronWeekly.fieldTimeLabel": "時間",
- "xpack.rollupJobs.cronEditor.cronWeekly.textOnLabel": "オン",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldDate.textOnTheLabel": "On the",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldDateLabel": "日付",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldHour.textAtLabel": "時点で",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldMonth.textInLabel": "In",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldMonthLabel": "月",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldTimeLabel": "時間",
- "xpack.rollupJobs.cronEditor.fieldFrequencyLabel": "頻度",
- "xpack.rollupJobs.cronEditor.textEveryLabel": "毎",
"xpack.rollupJobs.deleteAction.errorTitle": "ロールアップジョブの削除中にエラーが発生",
"xpack.rollupJobs.deleteAction.successMultipleNotificationTitle": "{count} 件のロールアップジョブが削除されました",
"xpack.rollupJobs.deleteAction.successSingleNotificationTitle": "ロールアップジョブ「{jobId}」が削除されました",
@@ -8815,25 +8795,6 @@
"xpack.rollupJobs.rollupIndexPatternsTitle": "ロールアップインデックスパターンを有効にする",
"xpack.rollupJobs.startJobsAction.errorTitle": "ロールアップジョブの開始中にエラーが発生",
"xpack.rollupJobs.stopJobsAction.errorTitle": "ロールアップジョブの停止中にエラーが発生",
- "xpack.rollupJobs.util.day.friday": "金曜日",
- "xpack.rollupJobs.util.day.monday": "月曜日",
- "xpack.rollupJobs.util.day.saturday": "土曜日",
- "xpack.rollupJobs.util.day.sunday": "日曜日",
- "xpack.rollupJobs.util.day.thursday": "木曜日",
- "xpack.rollupJobs.util.day.tuesday": "火曜日",
- "xpack.rollupJobs.util.day.wednesday": "水曜日",
- "xpack.rollupJobs.util.month.april": "4 月",
- "xpack.rollupJobs.util.month.august": "8 月",
- "xpack.rollupJobs.util.month.december": "12 月",
- "xpack.rollupJobs.util.month.february": "2 月",
- "xpack.rollupJobs.util.month.january": "1 月",
- "xpack.rollupJobs.util.month.july": "7 月",
- "xpack.rollupJobs.util.month.june": "6 月",
- "xpack.rollupJobs.util.month.march": "3 月",
- "xpack.rollupJobs.util.month.may": "5 月",
- "xpack.rollupJobs.util.month.november": "11 月",
- "xpack.rollupJobs.util.month.october": "10 月",
- "xpack.rollupJobs.util.month.september": "9 月",
"xpack.searchProfiler.aggregationProfileTabTitle": "集約プロフィール",
"xpack.searchProfiler.basicLicenseTitle": "ベーシック",
"xpack.searchProfiler.formIndexLabel": "インデックス",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index a1d580fb5ad88..db1e85aacb385 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -8855,26 +8855,6 @@
"xpack.rollupJobs.createAction.jobIdAlreadyExistsErrorMessage": "ID 为 “{jobConfigId}” 的作业已存在。",
"xpack.rollupJobs.createBreadcrumbTitle": "创建",
"xpack.rollupJobs.createTitle": "创建汇总/打包作业",
- "xpack.rollupJobs.cronEditor.cronDaily.fieldHour.textAtLabel": "在",
- "xpack.rollupJobs.cronEditor.cronDaily.fieldTimeLabel": "时间",
- "xpack.rollupJobs.cronEditor.cronHourly.fieldMinute.textAtLabel": "在",
- "xpack.rollupJobs.cronEditor.cronHourly.fieldTimeLabel": "分钟",
- "xpack.rollupJobs.cronEditor.cronMonthly.fieldDateLabel": "日期",
- "xpack.rollupJobs.cronEditor.cronMonthly.fieldHour.textAtLabel": "在",
- "xpack.rollupJobs.cronEditor.cronMonthly.fieldTimeLabel": "时间",
- "xpack.rollupJobs.cronEditor.cronMonthly.textOnTheLabel": "处于",
- "xpack.rollupJobs.cronEditor.cronWeekly.fieldDateLabel": "天",
- "xpack.rollupJobs.cronEditor.cronWeekly.fieldHour.textAtLabel": "在",
- "xpack.rollupJobs.cronEditor.cronWeekly.fieldTimeLabel": "时间",
- "xpack.rollupJobs.cronEditor.cronWeekly.textOnLabel": "开启",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldDate.textOnTheLabel": "处于",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldDateLabel": "日期",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldHour.textAtLabel": "在",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldMonth.textInLabel": "于",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldMonthLabel": "月",
- "xpack.rollupJobs.cronEditor.cronYearly.fieldTimeLabel": "时间",
- "xpack.rollupJobs.cronEditor.fieldFrequencyLabel": "频率",
- "xpack.rollupJobs.cronEditor.textEveryLabel": "所有",
"xpack.rollupJobs.deleteAction.errorTitle": "删除汇总/打包作业时出错",
"xpack.rollupJobs.deleteAction.successMultipleNotificationTitle": "已删除 {count} 个汇总/打包作业",
"xpack.rollupJobs.deleteAction.successSingleNotificationTitle": "已删除汇总/打包作业“{jobId}”",
@@ -8958,25 +8938,6 @@
"xpack.rollupJobs.rollupIndexPatternsTitle": "启用汇总索引模式",
"xpack.rollupJobs.startJobsAction.errorTitle": "启动汇总/打包作业时出错",
"xpack.rollupJobs.stopJobsAction.errorTitle": "停止汇总/打包作业时出错",
- "xpack.rollupJobs.util.day.friday": "星期五",
- "xpack.rollupJobs.util.day.monday": "星期一",
- "xpack.rollupJobs.util.day.saturday": "星期六",
- "xpack.rollupJobs.util.day.sunday": "星期日",
- "xpack.rollupJobs.util.day.thursday": "星期四",
- "xpack.rollupJobs.util.day.tuesday": "星期二",
- "xpack.rollupJobs.util.day.wednesday": "星期三",
- "xpack.rollupJobs.util.month.april": "四月",
- "xpack.rollupJobs.util.month.august": "八月",
- "xpack.rollupJobs.util.month.december": "十二月",
- "xpack.rollupJobs.util.month.february": "二月",
- "xpack.rollupJobs.util.month.january": "一月",
- "xpack.rollupJobs.util.month.july": "七月",
- "xpack.rollupJobs.util.month.june": "六月",
- "xpack.rollupJobs.util.month.march": "三月",
- "xpack.rollupJobs.util.month.may": "五月",
- "xpack.rollupJobs.util.month.november": "十一月",
- "xpack.rollupJobs.util.month.october": "十月",
- "xpack.rollupJobs.util.month.september": "九月",
"xpack.searchProfiler.aggregationProfileTabTitle": "聚合配置文件",
"xpack.searchProfiler.basicLicenseTitle": "基础级",
"xpack.searchProfiler.formIndexLabel": "索引",