diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/card.types.ts b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/card.types.ts index 67a05ba12..5566188ee 100644 --- a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/card.types.ts +++ b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/card.types.ts @@ -15,7 +15,7 @@ export type DatabaseDetailsOverviewCardProps = { memory: number | string; disk: number | string; externalAccess: boolean; - monitoring: boolean; + monitoring?: string; backup?: Backup; } & OverviewCardProps; diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/database-details.tsx b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/database-details.tsx index 09e207378..9be94e9f4 100644 --- a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/database-details.tsx +++ b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cards/database-details.tsx @@ -40,6 +40,7 @@ export const DatabaseDetails = ({ monitoring, }: DatabaseDetailsOverviewCardProps) => { const schedules = backup?.schedules; + return ( {monitoring ? Messages.fields.enabled : Messages.fields.disabled} + {monitoring && ( + + {Messages.fields.monitoring(monitoring)} + + )} } diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.messages.ts b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.messages.ts index ec5c294c2..b4f61c259 100644 --- a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.messages.ts +++ b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.messages.ts @@ -26,6 +26,7 @@ export const Messages = { disk: (disk: string | number) => `Disk: ${disk}`, enabled: `Enabled`, disabled: `Disabled`, + monitoring: (name: string) => `Name: ${name}`, pitr: (isEnabled: string) => `${Messages.titles.pitr} ${isEnabled.toLocaleLowerCase()}`, }, diff --git a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.tsx b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.tsx index ddfd373eb..1cb2ee923 100644 --- a/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.tsx +++ b/ui/apps/everest/src/pages/db-cluster-details/cluster-overview/cluster-overview.tsx @@ -1,10 +1,10 @@ import { Stack } from '@mui/material'; -import { useParams } from 'react-router-dom'; +import { dbEngineToDbType } from '@percona/utils'; import { useDbClusterCredentials } from 'hooks/api/db-cluster/useCreateDbCluster'; import { useDbCluster } from 'hooks/api/db-cluster/useDbCluster'; import { useDbClusters } from 'hooks/api/db-clusters/useDbClusters'; +import { useParams } from 'react-router-dom'; import { ProxyExposeType } from 'shared-types/dbCluster.types'; -import { dbEngineToDbType } from '@percona/utils'; import { ConnectionDetails, DatabaseDetails } from './cards'; export const ClusterOverview = () => { @@ -52,7 +52,7 @@ export const ClusterOverview = () => { externalAccess={ dbCluster?.spec.proxy.expose.type === ProxyExposeType.external } - monitoring={!!dbCluster?.spec.monitoring.monitoringConfigName} + monitoring={dbCluster?.spec.monitoring.monitoringConfigName} />