Merge branch 'v3' into PMM-13166_nodes_monitor_db

percona · Oct 3, 2024 · 4476cbc · 4476cbc
2 parents 4bd8d20 + f551f2b
commit 4476cbc
Show file tree

Hide file tree

Showing 18 changed files with 226 additions and 211 deletions.
diff --git a/public/app/percona/backup/components/AddBackupPage/AddBackupPage.test.tsx b/public/app/percona/backup/components/AddBackupPage/AddBackupPage.test.tsx
@@ -5,9 +5,11 @@ import { Router } from 'react-router-dom';
 
 import { locationService } from '@grafana/runtime';
 import { getRouteComponentProps } from 'app/core/navigation/__mocks__/routeProps';
+import { wrapWithGrafanaContextMock } from 'app/percona/shared/helpers/testUtils';
 import { configureStore } from 'app/store/configureStore';
 import { StoreState } from 'app/types';
 
+import { BackupType } from '../../Backup.types';
 import { LocationType } from '../StorageLocations/StorageLocations.types';
 
 import AddBackupPage from './AddBackupPage';
@@ -18,8 +20,8 @@ jest.mock('../BackupInventory/BackupInventory.service');
 jest.mock('./AddBackupPage.service');
 jest.mock('app/percona/backup/components/StorageLocations/StorageLocations.service');
 
-const AddBackupPageWrapper: FC<PropsWithChildren> = ({ children }) => {
-  return (
+const AddBackupPageWrapper: FC<PropsWithChildren> = ({ children }) =>
+  wrapWithGrafanaContextMock(
     <Provider
       store={configureStore({
         percona: {
@@ -46,7 +48,6 @@ const AddBackupPageWrapper: FC<PropsWithChildren> = ({ children }) => {
       <Router history={locationService.getHistory()}>{children}</Router>
     </Provider>
   );
-};
 
 describe('AddBackupPage', () => {
   it('should render fields', async () => {
@@ -77,7 +78,7 @@ describe('AddBackupPage', () => {
       <AddBackupPageWrapper>
         <AddBackupPage
           {...getRouteComponentProps({
-            match: { params: { type: 'scheduled_task_id', id: '' }, isExact: true, path: '', url: '' },
+            match: { params: { type: BackupType.SCHEDULED, id: '' }, isExact: true, path: '', url: '' },
           })}
         />
       </AddBackupPageWrapper>
@@ -94,7 +95,7 @@ describe('AddBackupPage', () => {
       <AddBackupPageWrapper>
         <AddBackupPage
           {...getRouteComponentProps({
-            match: { params: { type: 'scheduled_task_id', id: '' }, isExact: true, path: '', url: '' },
+            match: { params: { type: BackupType.SCHEDULED, id: '' }, isExact: true, path: '', url: '' },
           })}
         />
       </AddBackupPageWrapper>
@@ -124,7 +125,7 @@ describe('AddBackupPage', () => {
       <AddBackupPageWrapper>
         <AddBackupPage
           {...getRouteComponentProps({
-            match: { params: { type: 'scheduled_task_id', id: '' }, isExact: true, path: '', url: '' },
+            match: { params: { type: BackupType.SCHEDULED, id: '' }, isExact: true, path: '', url: '' },
           })}
         />
       </AddBackupPageWrapper>
@@ -157,7 +158,7 @@ describe('AddBackupPage', () => {
       <AddBackupPageWrapper>
         <AddBackupPage
           {...getRouteComponentProps({
-            match: { params: { type: 'scheduled_task_id', id: '' }, isExact: true, path: '', url: '' },
+            match: { params: { type: BackupType.SCHEDULED, id: '' }, isExact: true, path: '', url: '' },
           })}
         />
       </AddBackupPageWrapper>

diff --git a/public/app/percona/backup/components/AddBackupPage/AddBackupPage.tsx b/public/app/percona/backup/components/AddBackupPage/AddBackupPage.tsx
diff --git a/public/app/percona/backup/components/BackupInventory/BackupInventory.service.ts b/public/app/percona/backup/components/BackupInventory/BackupInventory.service.ts
@@ -55,7 +55,7 @@ export const BackupInventoryService = {
   },
   async restore(serviceId: string, artifactId: string, pitrTimestamp?: string, token?: CancelToken) {
     return api.post(
-      `${BASE_URL}/restore:start`,
+      `${BASE_URL}/restores:start`,
       {
         service_id: serviceId,
         artifact_id: artifactId,

diff --git a/public/app/percona/backup/components/BackupInventory/BackupInventory.tsx b/public/app/percona/backup/components/BackupInventory/BackupInventory.tsx
@@ -287,7 +287,7 @@ export const BackupInventory: FC = () => {
 
   const onBackupClick = (backup: BackupRow | null) => {
     if (backup) {
-      locationService.push(`/backup/${backup.id}/edit`);
+      locationService.push(`/backup/${backup.type}/${backup.id}/edit`);
     } else {
       locationService.push(NEW_BACKUP_URL);
     }

diff --git a/public/app/percona/backup/components/RestoreHistory/RestoreHistory.service.ts b/public/app/percona/backup/components/RestoreHistory/RestoreHistory.service.ts
@@ -43,9 +43,9 @@ export const RestoreHistoryService = {
       })
     );
   },
-  async getLogs(restoreId: string, offset: number, limit: number, cancelToken?: CancelToken): Promise<BackupLogs> {
+  async getLogs(artefactId: string, offset: number, limit: number, cancelToken?: CancelToken): Promise<BackupLogs> {
     const { logs = [], end } = await api.get<BackupLogResponse, { offset: number; limit: number }>(
-      `${BASE_URL}/${restoreId}/logs`,
+      `${BASE_URL}/${artefactId}/logs`,
       false,
       { cancelToken, params: { offset, limit } }
     );

diff --git a/public/app/percona/backup/components/RestoreHistory/RestoreHistory.tsx b/public/app/percona/backup/components/RestoreHistory/RestoreHistory.tsx
@@ -200,7 +200,7 @@ export const RestoreHistory: FC = () => {
 
   const getLogs = useCallback(
     async (startingChunk: number, offset: number, token?: CancelToken) =>
-      RestoreHistoryService.getLogs(selectedRestore!.id, startingChunk, offset, token),
+      RestoreHistoryService.getLogs(selectedRestore!.artifactId, startingChunk, offset, token),
     [selectedRestore]
   );
 

diff --git a/public/app/percona/backup/components/ScheduledBackups/ScheduledBackups.service.ts b/public/app/percona/backup/components/ScheduledBackups/ScheduledBackups.service.ts
@@ -87,6 +87,6 @@ export const ScheduledBackupsService = {
     return api.put(`${BASE_URL}:changeScheduled`, { scheduled_backup_id: id, enabled });
   },
   async delete(id: string) {
-    return api.delete(`${BASE_URL}/scheduled/${id}`);
+    return api.delete(`${BASE_URL}/${id}`);
   },
 };
diff --git a/public/app/percona/backup/components/ScheduledBackups/ScheduledBackups.tsx b/public/app/percona/backup/components/ScheduledBackups/ScheduledBackups.tsx
@@ -8,6 +8,7 @@ import { locationService } from '@grafana/runtime';
 import { LinkButton, useStyles } from '@grafana/ui';
 import { appEvents } from 'app/core/app_events';
 import { Page } from 'app/core/components/Page/Page';
+import { BackupType } from 'app/percona/backup/Backup.types';
 import { DeleteModal } from 'app/percona/shared/components/Elements/DeleteModal';
 import { FeatureLoader } from 'app/percona/shared/components/Elements/FeatureLoader';
 import { ExtendedColumn, FilterFieldTypes, Table } from 'app/percona/shared/components/Elements/Table';
@@ -241,7 +242,7 @@ export const ScheduledBackups: FC = () => {
   };
 
   const onEditClick = (backup: ScheduledBackup) => {
-    locationService.push(`/backup${backup.id}/edit`);
+    locationService.push(`/backup/${BackupType.SCHEDULED}/${backup.id}/edit`);
   };
 
   const getCellProps = useCallback(

diff --git a/public/app/percona/check/__mocks__/stubs.ts b/public/app/percona/check/__mocks__/stubs.ts
@@ -168,7 +168,7 @@ export const allChecksStub: CheckDetails[] = [
     name: 'test1',
     summary: 'Test 1',
     description: 'Test number 1',
-    interval: 'STANDARD',
+    interval: 'ADVISOR_CHECK_INTERVAL_STANDARD',
     readMoreUrl: 'https://example.com',
     category: '',
     family: 'ADVISOR_CHECK_FAMILY_MONGODB',
@@ -177,15 +177,15 @@ export const allChecksStub: CheckDetails[] = [
     name: 'test2',
     summary: 'Test 2',
     description: 'Test number 2',
-    interval: 'RARE',
+    interval: 'ADVISOR_CHECK_INTERVAL_RARE',
     category: '',
     family: 'ADVISOR_CHECK_FAMILY_MONGODB',
   },
   {
     name: 'test3',
     summary: 'Test 3',
     description: 'Test number 3',
-    interval: 'STANDARD',
+    interval: 'ADVISOR_CHECK_INTERVAL_STANDARD',
     disabled: true,
     readMoreUrl: 'https://example.com',
     category: '',
@@ -194,15 +194,15 @@ export const allChecksStub: CheckDetails[] = [
   {
     name: 'test4',
     summary: 'Test 4',
-    interval: 'FREQUENT',
+    interval: 'ADVISOR_CHECK_INTERVAL_FREQUENT',
     category: '',
     family: 'ADVISOR_CHECK_FAMILY_MONGODB',
   },
   {
     name: 'test5',
     summary: 'Test 5',
     disabled: true,
-    interval: 'STANDARD',
+    interval: 'ADVISOR_CHECK_INTERVAL_STANDARD',
     category: '',
     family: 'ADVISOR_CHECK_FAMILY_MONGODB',
   },

diff --git a/public/app/percona/check/components/AllChecksTab/AllChecksTab.constants.ts b/public/app/percona/check/components/AllChecksTab/AllChecksTab.constants.ts
@@ -11,7 +11,8 @@ export const STATUS_OPTIONS: Array<SelectableValue<string>> = [
 ];
 export const INTERVAL_OPTIONS: Array<SelectableValue<Interval | string>> = [
   { value: 'all', label: 'All' },
-  { value: Interval.FREQUENT, label: Interval.FREQUENT },
-  { value: Interval.STANDARD, label: Interval.STANDARD },
-  { value: Interval.RARE, label: Interval.RARE },
+  { value: Interval.ADVISOR_CHECK_INTERVAL_FREQUENT, label: Interval.ADVISOR_CHECK_INTERVAL_FREQUENT },
+  { value: Interval.ADVISOR_CHECK_INTERVAL_STANDARD, label: Interval.ADVISOR_CHECK_INTERVAL_STANDARD },
+  { value: Interval.ADVISOR_CHECK_INTERVAL_RARE, label: Interval.ADVISOR_CHECK_INTERVAL_RARE },
+  { value: Interval.ADVISOR_CHECK_INTERVAL_UNSPECIFIED, label: Interval.ADVISOR_CHECK_INTERVAL_UNSPECIFIED },
 ];
diff --git a/public/app/percona/check/components/AllChecksTab/AllChecksTab.tsx b/public/app/percona/check/components/AllChecksTab/AllChecksTab.tsx
@@ -143,16 +143,20 @@ export const AllChecksTab: FC<GrafanaRouteComponentProps<{ category: string }>>
         type: FilterFieldTypes.DROPDOWN,
         options: [
           {
-            label: Interval.STANDARD,
-            value: Interval.STANDARD,
+            label: Interval.ADVISOR_CHECK_INTERVAL_STANDARD,
+            value: Interval.ADVISOR_CHECK_INTERVAL_STANDARD,
           },
           {
-            label: Interval.RARE,
-            value: Interval.RARE,
+            label: Interval.ADVISOR_CHECK_INTERVAL_RARE,
+            value: Interval.ADVISOR_CHECK_INTERVAL_RARE,
           },
           {
-            label: Interval.FREQUENT,
-            value: Interval.FREQUENT,
+            label: Interval.ADVISOR_CHECK_INTERVAL_FREQUENT,
+            value: Interval.ADVISOR_CHECK_INTERVAL_FREQUENT,
+          },
+          {
+            label: Interval.ADVISOR_CHECK_INTERVAL_UNSPECIFIED,
+            value: Interval.ADVISOR_CHECK_INTERVAL_UNSPECIFIED,
           },
         ],
       },

diff --git a/.../check/components/AllChecksTab/ChangeCheckIntervalModal/ChangeCheckIntervalModal.test.tsx b/.../check/components/AllChecksTab/ChangeCheckIntervalModal/ChangeCheckIntervalModal.test.tsx
@@ -17,7 +17,7 @@ jest.mock('app/core/app_events', () => {
 const TEST_CHECK: CheckDetails = {
   summary: 'Test',
   name: 'test',
-  interval: 'STANDARD',
+  interval: 'ADVISOR_CHECK_INTERVAL_STANDARD',
   description: 'test description',
   disabled: false,
   category: '',

diff --git a/public/app/percona/check/types.ts b/public/app/percona/check/types.ts
@@ -77,9 +77,10 @@ export enum AlertState {
 }
 
 export enum Interval {
-  STANDARD = 'Standard',
-  RARE = 'Rare',
-  FREQUENT = 'Frequent',
+  ADVISOR_CHECK_INTERVAL_STANDARD = 'Standard',
+  ADVISOR_CHECK_INTERVAL_RARE = 'Rare',
+  ADVISOR_CHECK_INTERVAL_FREQUENT = 'Frequent',
+  ADVISOR_CHECK_INTERVAL_UNSPECIFIED = 'Unspecified',
 }
 
 export interface CheckDetails {

diff --git a/public/app/percona/pmm-dump/PMMDump.tsx b/public/app/percona/pmm-dump/PMMDump.tsx
@@ -12,7 +12,7 @@ import { DumpStatus, DumpStatusColor, DumpStatusText, PMMDumpServices } from 'ap
 import { DetailsRow } from 'app/percona/shared/components/Elements/DetailsRow/DetailsRow';
 import { Action } from 'app/percona/shared/components/Elements/MultipleActions';
 import { ExtendedColumn, FilterFieldTypes, Table } from 'app/percona/shared/components/Elements/Table';
-import { usePerconaNavModel } from 'app/percona/shared/components/hooks/perconaNavModel';
+import { PMM_DUMP_PAGE } from 'app/percona/shared/components/PerconaBootstrapper/PerconaNavigation';
 import {
   deletePmmDumpAction,
   downloadPmmDumpAction,
@@ -44,7 +44,6 @@ export const PMMDump = () => {
   const [selectedDump, setSelectedDump] = useState<PMMDumpServices | null>(null);
   const [isSendToSupportModalOpened, setIsSendToSupportModalOpened] = useState(false);
   const [logsModalVisible, setLogsModalVisible] = useState(false);
-  const navModel = usePerconaNavModel('pmm-dump');
 
   const loadData = useCallback(async () => {
     try {
@@ -280,7 +279,12 @@ export const PMMDump = () => {
   );
 
   return (
-    <Page navId="pmmdump" navModel={navModel}>
+    <Page
+      navModel={{
+        main: PMM_DUMP_PAGE,
+        node: PMM_DUMP_PAGE,
+      }}
+    >
       <Page.Contents>
         <div className={styles.createDatasetArea}>
           {selectedRows.length > 0 ? (

diff --git a/public/app/percona/settings/Settings.service.ts b/public/app/percona/settings/Settings.service.ts
@@ -35,7 +35,7 @@ export const SettingsService = {
 
 const toModel = (response: SettingsPayload): Settings => ({
   awsPartitions: response.aws_partitions.values,
-  updatesEnabled: response.enable_updates,
+  updatesEnabled: response.updates_enabled,
   telemetryEnabled: response.telemetry_enabled,
   telemetrySummaries: response.telemetry_summaries || [],
   metricsResolutions: response.metrics_resolutions,

diff --git a/public/app/percona/settings/Settings.types.ts b/public/app/percona/settings/Settings.types.ts
@@ -96,7 +96,7 @@ export interface SettingsPayload
     values: string[];
   };
   platform_email: string;
-  enable_updates: boolean;
+  updates_enabled: boolean;
   telemetry_enabled: boolean;
   advisor_enabled: boolean;
   alerting_enabled: boolean;

diff --git a/public/app/percona/shared/services/updates/Updates.service.ts b/public/app/percona/shared/services/updates/Updates.service.ts
@@ -1,8 +1,8 @@
 import { api } from '../../helpers/api';
 
-import { CheckUpdatesBody, CheckUpdatesResponse } from './Updates.types';
+import { CheckUpdatesParams, CheckUpdatesResponse } from './Updates.types';
 
 export const UpdatesService = {
-  getCurrentVersion: (body: CheckUpdatesBody = { force: false }) =>
-    api.post<CheckUpdatesResponse, CheckUpdatesBody>('/v1/Updates/Check', body, true),
+  getCurrentVersion: (params: CheckUpdatesParams = { force: false }) =>
+    api.get<CheckUpdatesResponse, CheckUpdatesParams>('/v1/server/updates', true, { params }),
 };
diff --git a/public/app/percona/shared/services/updates/Updates.types.ts b/public/app/percona/shared/services/updates/Updates.types.ts
@@ -1,4 +1,4 @@
-export interface CheckUpdatesBody {
+export interface CheckUpdatesParams {
   force: boolean;
   only_installed_version?: boolean;
 }