diff --git a/libs/domains/observability/data-access/src/lib/domains-observability-data-access.ts b/libs/domains/observability/data-access/src/lib/domains-observability-data-access.ts index 711c6ed4a54..d2a3b07c355 100644 --- a/libs/domains/observability/data-access/src/lib/domains-observability-data-access.ts +++ b/libs/domains/observability/data-access/src/lib/domains-observability-data-access.ts @@ -15,7 +15,6 @@ import { const clusterApi = new ClustersApi() const alertRulesApi = new AlertRulesApi() const alertReceiversApi = new AlertReceiversApi() -const organizationApi = new OrganizationMainCallsApi() export const observability = createQueryKeys('observability', { containerName: ({ @@ -167,6 +166,40 @@ export const observability = createQueryKeys('observability', { return response.data.metrics && (JSON.parse(response.data.metrics).data[0] as string) }, }), + podNames: ({ + clusterId, + statefulsetName, + startDate, + endDate, + }: { + clusterId: string + statefulsetName: string + startDate: string + endDate: string + }) => ({ + queryKey: ['podNames', clusterId, statefulsetName], + async queryFn() { + const endpoint = `api/v1/label/pod/values?match[]=kube_pod_owner{owner_kind="StatefulSet",owner_name="${statefulsetName}"}` + const response = await clusterApi.getClusterMetrics( + clusterId, + endpoint, + '', + startDate, + endDate, + undefined, + undefined, + undefined, + 'True', + 'True', + undefined, + 'prometheus', + 'false', + 'service_overview', + 'pod_names' + ) + return response.data.metrics && (JSON.parse(response.data.metrics).data as string[]) + }, + }), metrics: ({ clusterId, query, diff --git a/libs/domains/observability/feature/src/index.ts b/libs/domains/observability/feature/src/index.ts index 38ed77972df..310d50b36b9 100644 --- a/libs/domains/observability/feature/src/index.ts +++ b/libs/domains/observability/feature/src/index.ts @@ -17,6 +17,7 @@ export * from './lib/hooks/use-edit-alert-rule/use-edit-alert-rule' export * from './lib/hooks/use-alert-rules/use-alert-rules' export * from './lib/hooks/use-environment/use-environment' export * from './lib/hooks/use-container-name/use-container-name' +export * from './lib/hooks/use-pod-names/use-pod-names' export * from './lib/hooks/use-ingress-name/use-ingress-name' export * from './lib/hooks/use-hpa-name/use-hpa-name' export * from './lib/hooks/use-alerts/use-alerts' diff --git a/libs/domains/observability/feature/src/lib/hooks/use-container-name/use-container-name.ts b/libs/domains/observability/feature/src/lib/hooks/use-container-name/use-container-name.ts index 67295573d6f..6db2c915973 100644 --- a/libs/domains/observability/feature/src/lib/hooks/use-container-name/use-container-name.ts +++ b/libs/domains/observability/feature/src/lib/hooks/use-container-name/use-container-name.ts @@ -11,8 +11,16 @@ export interface UseContainerNameProps { // Retrieves the container name associated with a specific service export function useContainerName({ clusterId, serviceId, resourceType, startDate, endDate }: UseContainerNameProps) { + const queryOptions = observability.containerName({ + clusterId, + serviceId, + resourceType, + startDate, + endDate, + }) + return useQuery({ - ...observability.containerName({ clusterId, serviceId, resourceType, startDate, endDate }), + ...queryOptions, enabled: Boolean(clusterId && serviceId), }) } diff --git a/libs/domains/observability/feature/src/lib/hooks/use-pod-names/use-pod-names.ts b/libs/domains/observability/feature/src/lib/hooks/use-pod-names/use-pod-names.ts new file mode 100644 index 00000000000..babdda6af25 --- /dev/null +++ b/libs/domains/observability/feature/src/lib/hooks/use-pod-names/use-pod-names.ts @@ -0,0 +1,18 @@ +import { useQuery } from '@tanstack/react-query' +import { observability } from '@qovery/domains/observability/data-access' + +export interface UsePodNamesProps { + clusterId: string + statefulsetName: string + startDate: string + endDate: string + enabled?: boolean +} + +// Retrieves pod names for a StatefulSet using kube_pod_owner +export function usePodNames({ clusterId, statefulsetName, startDate, endDate, enabled = true }: UsePodNamesProps) { + return useQuery({ + ...observability.podNames({ clusterId, statefulsetName, startDate, endDate }), + enabled: enabled && Boolean(clusterId && statefulsetName), + }) +} diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/card-instance-status/card-instance-status.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/card-instance-status/card-instance-status.tsx index 88a87d1042e..9a40495e8be 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/card-instance-status/card-instance-status.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/card-instance-status/card-instance-status.tsx @@ -58,11 +58,13 @@ export function CardInstanceStatus({ clusterId, containerName, namespace, + podNames, }: { serviceId: string clusterId: string containerName: string namespace: string + podNames?: string[] }) { const { queryTimeRange, subQueryTimeRange, startTimestamp, endTimestamp } = useDashboardContext() const [isModalOpen, setIsModalOpen] = useState(false) @@ -134,6 +136,7 @@ export function CardInstanceStatus({ serviceId={serviceId} containerName={containerName} namespace={namespace} + podNames={podNames} /> @@ -146,6 +149,7 @@ export function CardInstanceStatus({ containerName={containerName} isFullscreen namespace={namespace} + podNames={podNames} /> diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/card-storage/card-storage.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/card-storage/card-storage.tsx index 3eaa0b0d6f0..73352f2c6c6 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/card-storage/card-storage.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/card-storage/card-storage.tsx @@ -62,7 +62,7 @@ export function CardStorage({ serviceId, clusterId }: { serviceId: string; clust }) const rawValue = Number(metricsPercentage?.data?.result[0]?.value[1]) - const value = Number.isFinite(rawValue) ? Math.round(rawValue) : 0 + const value = Number.isFinite(rawValue) ? rawValue : 0 const maxUsageBytes = Number(metricsMaxStorage?.data?.result[0]?.value[1]) @@ -89,8 +89,14 @@ export function CardStorage({ serviceId, clusterId }: { serviceId: string; clust const totalStorageGiB = value > 0 ? maxUsageGiB / (value / 100) : 0 const title = `${maxUsageDisplay} ${maxUsageUnit} max storage usage` - const description = - value > 0 ? `${value}% of your ${totalStorageGiB.toFixed(1)} GiB storage allowance` : `No storage usage data` + + let description + if (value > 0) { + const displayValue = value < 0.01 ? '< 0.01' : value < 1 ? value.toFixed(2) : Math.round(value).toString() + description = `${displayValue}% of your ${totalStorageGiB.toFixed(1)} GiB storage allowance` + } else { + description = 'No storage usage data' + } return ( <> diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/cpu-chart/cpu-chart.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/cpu-chart/cpu-chart.tsx index 5dfd1395422..b7676ebc37b 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/cpu-chart/cpu-chart.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/cpu-chart/cpu-chart.tsx @@ -9,26 +9,40 @@ import { convertPodName } from '../../../util-chart/convert-pod-name' import { processMetricsData } from '../../../util-chart/process-metrics-data' import { useDashboardContext } from '../../../util-filter/dashboard-context' -const queryCpuUsage = (rateInterval: string, containerName: string) => ` - sum by (pod) (rate(container_cpu_usage_seconds_total{container="${containerName}"}[${rateInterval}])) -` +const queryCpuUsage = (rateInterval: string, containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum by (pod) (rate(container_cpu_usage_seconds_total{pod=~"${podFilter}"}[${rateInterval}]))` + } + return `sum by (pod) (rate(container_cpu_usage_seconds_total{container="${containerName}"}[${rateInterval}]))` +} -const queryCpuLimit = (containerName: string) => ` - sum (bottomk(1, kube_pod_container_resource_limits{resource="cpu",container="${containerName}"})) -` +const queryCpuLimit = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum (bottomk(1, kube_pod_container_resource_limits{resource="cpu",pod=~"${podFilter}"}))` + } + return `sum (bottomk(1, kube_pod_container_resource_limits{resource="cpu",container="${containerName}"}))` +} -const queryCpuRequest = (containerName: string) => ` - sum (bottomk(1, kube_pod_container_resource_requests{resource="cpu",container="${containerName}"})) -` +const queryCpuRequest = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum (bottomk(1, kube_pod_container_resource_requests{resource="cpu",pod=~"${podFilter}"}))` + } + return `sum (bottomk(1, kube_pod_container_resource_requests{resource="cpu",container="${containerName}"}))` +} export function CpuChart({ clusterId, serviceId, containerName, + podNames, }: { clusterId: string serviceId: string containerName: string + podNames?: string[] }) { const { startTimestamp, endTimestamp, useLocalTime, timeRange } = useDashboardContext() const getColorByPod = usePodColor() @@ -58,7 +72,7 @@ export function CpuChart({ const { data: metrics, isLoading: isLoadingMetrics } = useMetrics({ clusterId, - query: queryCpuUsage(rateInterval, containerName), + query: queryCpuUsage(rateInterval, containerName, podNames), startTimestamp, endTimestamp, timeRange, @@ -68,7 +82,7 @@ export function CpuChart({ const { data: limitMetrics, isLoading: isLoadingLimit } = useMetrics({ clusterId, - query: queryCpuLimit(containerName), + query: queryCpuLimit(containerName, podNames), startTimestamp, endTimestamp, timeRange, @@ -78,7 +92,7 @@ export function CpuChart({ const { data: requestMetrics, isLoading: isLoadingRequest } = useMetrics({ clusterId, - query: queryCpuRequest(containerName), + query: queryCpuRequest(containerName, podNames), startTimestamp, endTimestamp, timeRange, diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/disk-chart/disk-chart.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/disk-chart/disk-chart.tsx index 95b21f8b9f5..31ffb3e86c3 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/disk-chart/disk-chart.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/disk-chart/disk-chart.tsx @@ -6,30 +6,48 @@ import { addTimeRangePadding } from '../../../util-chart/add-time-range-padding' import { processMetricsData } from '../../../util-chart/process-metrics-data' import { useDashboardContext } from '../../../util-filter/dashboard-context' -const queryDiskReadNvme = (containerName: string) => ` - sum by (device) (rate(container_fs_reads_bytes_total{container="${containerName}", device=~"/dev/nvme0.*"}[1m])) -` +const queryDiskReadNvme = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum by (device) (rate(container_fs_reads_bytes_total{pod=~"${podFilter}", device=~"/dev/nvme0.*"}[1m]))` + } + return `sum by (device) (rate(container_fs_reads_bytes_total{container="${containerName}", device=~"/dev/nvme0.*"}[1m]))` +} -const queryDiskReadNonNvme = (containerName: string) => ` - sum by (device) (rate(container_fs_reads_bytes_total{container="${containerName}", device!~"/dev/nvme0.*", device!=""}[1m])) -` +const queryDiskReadNonNvme = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum by (device) (rate(container_fs_reads_bytes_total{pod=~"${podFilter}", device!~"/dev/nvme.*", device!=""}[1m]))` + } + return `sum by (device) (rate(container_fs_reads_bytes_total{container="${containerName}", device!~"/dev/nvme.*", device!=""}[1m]))` +} -const queryDiskWriteNvme = (containerName: string) => ` - sum by (device) (rate(container_fs_writes_bytes_total{container="${containerName}", device=~"/dev/nvme0.*"}[1m])) -` +const queryDiskWriteNvme = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum by (device) (rate(container_fs_writes_bytes_total{pod=~"${podFilter}", device=~"/dev/nvme.*"}[1m]))` + } + return `sum by (device) (rate(container_fs_writes_bytes_total{container="${containerName}", device=~"/dev/nvme.*"}[1m]))` +} -const queryDiskWriteNonNvme = (containerName: string) => ` - sum by (device) (rate(container_fs_writes_bytes_total{container=${containerName}"", device!~"/dev/nvme0.*", device!=""}[1m])) -` +const queryDiskWriteNonNvme = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum by (device) (rate(container_fs_writes_bytes_total{pod=~"${podFilter}", device!~"/dev/nvme.*", device!=""}[1m]))` + } + return `sum by (device) (rate(container_fs_writes_bytes_total{container="${containerName}", device!~"/dev/nvme.*", device!=""}[1m]))` +} export function DiskChart({ clusterId, serviceId, containerName, + podNames, }: { clusterId: string serviceId: string containerName: string + podNames?: string[] }) { const { startTimestamp, endTimestamp, useLocalTime, timeRange } = useDashboardContext() @@ -37,7 +55,7 @@ export function DiskChart({ clusterId, startTimestamp, endTimestamp, - query: queryDiskReadNvme(containerName), + query: queryDiskReadNvme(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'disk_chart_read_ephemeral', @@ -47,7 +65,7 @@ export function DiskChart({ clusterId, startTimestamp, endTimestamp, - query: queryDiskReadNonNvme(containerName), + query: queryDiskReadNonNvme(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'disk_chart_read_persistent', @@ -57,7 +75,7 @@ export function DiskChart({ clusterId, startTimestamp, endTimestamp, - query: queryDiskWriteNvme(containerName), + query: queryDiskWriteNvme(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'disk_chart_read_ephemeral', @@ -67,7 +85,7 @@ export function DiskChart({ clusterId, startTimestamp, endTimestamp, - query: queryDiskWriteNonNvme(containerName), + query: queryDiskWriteNonNvme(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'disk_chart_write_persistent', diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/instance-status-chart/instance-status-chart.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/instance-status-chart/instance-status-chart.tsx index 0662dba7471..0e11e4e4311 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/instance-status-chart/instance-status-chart.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/instance-status-chart/instance-status-chart.tsx @@ -15,7 +15,25 @@ sum by (condition) ( ) ` -const queryRestartWithReason = (containerName: string, timeRange: string) => ` +const queryRestartWithReason = (containerName: string, timeRange: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return ` +sum by (reason) ( + sum by (pod) ( + increase(kube_pod_container_status_restarts_total{pod=~"${podFilter}"}[${timeRange}]) + ) + * + on(pod) group_left(reason) + sum by (pod, reason) ( + max without(instance, job, endpoint, service, prometheus, uid) ( + kube_pod_container_status_last_terminated_reason{pod=~"${podFilter}"} + ) + ) +) +` + } + return ` sum by (reason) ( sum by (pod) ( increase(kube_pod_container_status_restarts_total{container="${containerName}"}[${timeRange}]) @@ -29,6 +47,7 @@ sum by (reason) ( ) ) ` +} const queryK8sEvent = (serviceId: string, dynamicRange: string) => ` sum by (pod,reason)( @@ -199,12 +218,14 @@ export function InstanceStatusChart({ containerName, isFullscreen, namespace, + podNames, }: { clusterId: string serviceId: string containerName: string namespace: string isFullscreen?: boolean + podNames?: string[] }) { const { startTimestamp, endTimestamp, useLocalTime, hideEvents, timeRange } = useDashboardContext() @@ -239,7 +260,7 @@ export function InstanceStatusChart({ startTimestamp, endTimestamp, timeRange, - query: queryRestartWithReason(containerName, timeRange), + query: queryRestartWithReason(containerName, timeRange, podNames), boardShortName: 'service_overview', metricShortName: 'instance_status_restart', }) diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/memory-chart/memory-chart.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/memory-chart/memory-chart.tsx index 26c95ba4f80..14d5828e4ea 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/memory-chart/memory-chart.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/memory-chart/memory-chart.tsx @@ -9,26 +9,40 @@ import { convertPodName } from '../../../util-chart/convert-pod-name' import { processMetricsData } from '../../../util-chart/process-metrics-data' import { useDashboardContext } from '../../../util-filter/dashboard-context' -const queryMemoryUsage = (containerName: string) => ` - sum by (pod) (container_memory_working_set_bytes{container="${containerName}"}) -` +const queryMemoryUsage = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum by (pod) (container_memory_working_set_bytes{pod=~"${podFilter}"})` + } + return `sum by (pod) (container_memory_working_set_bytes{container="${containerName}"})` +} -const queryMemoryLimit = (containerName: string) => ` - sum (bottomk(1, kube_pod_container_resource_limits{resource="memory", container="${containerName}"})) -` +const queryMemoryLimit = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum (bottomk(1, kube_pod_container_resource_limits{resource="memory", pod=~"${podFilter}"}))` + } + return `sum (bottomk(1, kube_pod_container_resource_limits{resource="memory", container="${containerName}"}))` +} -const queryMemoryRequest = (containerName: string) => ` - sum (bottomk(1, kube_pod_container_resource_requests{resource="memory", container="${containerName}"})) -` +const queryMemoryRequest = (containerName: string, podNames?: string[]) => { + if (podNames && podNames.length > 0) { + const podFilter = podNames.join('|') + return `sum (bottomk(1, kube_pod_container_resource_requests{resource="memory", pod=~"${podFilter}"}))` + } + return `sum (bottomk(1, kube_pod_container_resource_requests{resource="memory", container="${containerName}"}))` +} export function MemoryChart({ clusterId, serviceId, containerName, + podNames, }: { clusterId: string serviceId: string containerName: string + podNames?: string[] }) { const { startTimestamp, endTimestamp, useLocalTime, timeRange } = useDashboardContext() const getColorByPod = usePodColor() @@ -55,7 +69,7 @@ export function MemoryChart({ clusterId, startTimestamp, endTimestamp, - query: queryMemoryUsage(containerName), + query: queryMemoryUsage(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'memory', @@ -65,7 +79,7 @@ export function MemoryChart({ clusterId, startTimestamp, endTimestamp, - query: queryMemoryLimit(containerName), + query: queryMemoryLimit(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'memory_limit', @@ -75,7 +89,7 @@ export function MemoryChart({ clusterId, startTimestamp, endTimestamp, - query: queryMemoryRequest(containerName), + query: queryMemoryRequest(containerName, podNames), timeRange, boardShortName: 'service_overview', metricShortName: 'memory_request', diff --git a/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx b/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx index b6630f7f206..8d6017c091d 100644 --- a/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx +++ b/libs/domains/observability/feature/src/lib/service/service-dashboard/service-dashboard.tsx @@ -1,12 +1,15 @@ import clsx from 'clsx' import { subHours } from 'date-fns' +import { DatabaseModeEnum } from 'qovery-typescript-axios' import { useParams } from 'react-router-dom' +import { type Database } from '@qovery/domains/services/data-access' import { useService } from '@qovery/domains/services/feature' import { Button, Callout, Chart, Heading, Icon, InputSelectSmall, Section, Tooltip } from '@qovery/shared/ui' import { useContainerName } from '../../hooks/use-container-name/use-container-name' import { useEnvironment } from '../../hooks/use-environment/use-environment' import { useIngressName } from '../../hooks/use-ingress-name/use-ingress-name' import { useNamespace } from '../../hooks/use-namespace/use-namespace' +import { usePodNames } from '../../hooks/use-pod-names/use-pod-names' import { DashboardProvider, useDashboardContext } from '../../util-filter/dashboard-context' import { CardHTTPErrors } from './card-http-errors/card-http-errors' import { CardInstanceStatus } from './card-instance-status/card-instance-status' @@ -27,9 +30,10 @@ import { PrivateNetworkRequestStatusChart } from './private-network-request-stat import { SelectTimeRange } from './select-time-range/select-time-range' function ServiceDashboardContent() { - const { environmentId = '', applicationId = '' } = useParams() + const { environmentId = '', applicationId = '', databaseId = '' } = useParams() - const { data: service } = useService({ serviceId: applicationId }) + const serviceId = applicationId || databaseId + const { data: service } = useService({ serviceId }) const { data: environment } = useEnvironment({ environmentId }) const { expandCharts, @@ -55,23 +59,40 @@ function ServiceDashboardContent() { (service?.serviceType === 'CONTAINER' && (service?.ports || []).some((port) => !port.publicly_accessible))) const hasStorage = - (service?.serviceType === 'CONTAINER' || service?.serviceType === 'APPLICATION') && - (service.storage || []).length > 0 + service?.serviceType === 'DATABASE' || + ((service?.serviceType === 'CONTAINER' || service?.serviceType === 'APPLICATION') && + Array.isArray(service.storage) && + service.storage.length > 0) const now = new Date() const oneHourAgo = subHours(now, 1) const { data: containerName, isFetched: isFetchedContainerName } = useContainerName({ clusterId: environment?.cluster_id ?? '', - serviceId: applicationId, + serviceId: serviceId, resourceType: hasStorage ? 'statefulset' : 'deployment', startDate: oneHourAgo.toISOString(), endDate: now.toISOString(), }) + // For container databases, retrieve pod names via kube_pod_owner + const isContainerDatabase = + service?.serviceType === 'DATABASE' && (service as Database)?.mode === DatabaseModeEnum.CONTAINER + + const { data: podNamesData, isFetched: isFetchedPodNames } = usePodNames({ + clusterId: environment?.cluster_id ?? '', + statefulsetName: containerName ?? '', + startDate: oneHourAgo.toISOString(), + endDate: now.toISOString(), + enabled: isContainerDatabase, + }) + + // Ensure podNames is always an array or undefined + const podNames = isContainerDatabase && Array.isArray(podNamesData) ? podNamesData : undefined + const { data: namespace, isFetched: isFetchedNamespace } = useNamespace({ clusterId: environment?.cluster_id ?? '', - serviceId: applicationId, + serviceId: serviceId, resourceType: hasStorage ? 'statefulset' : 'deployment', startDate: oneHourAgo.toISOString(), endDate: now.toISOString(), @@ -79,7 +100,7 @@ function ServiceDashboardContent() { const { data: ingressName = '' } = useIngressName({ clusterId: environment?.cluster_id ?? '', - serviceId: applicationId, + serviceId: serviceId, enabled: hasPublicPort, startDate: oneHourAgo.toISOString(), endDate: now.toISOString(), @@ -113,7 +134,8 @@ function ServiceDashboardContent() { ) } - if (!environment || !service || !containerName || !namespace) + // For container databases, wait for podNames to be loaded before rendering + if (!environment || !service || !containerName || !namespace || (isContainerDatabase && !podNames)) return (
@@ -190,23 +212,24 @@ function ServiceDashboardContent() {
{hasPublicPort && ( @@ -214,22 +237,18 @@ function ServiceDashboardContent() { {hasOnlyPrivatePorts && ( )} - {hasStorage && } + {hasStorage && } {hasPublicPort && ( - + )} {hasOnlyPrivatePorts && ( )} @@ -240,14 +259,29 @@ function ServiceDashboardContent() { Resources
- +
- +
{hasStorage && (
- +
)}
@@ -259,21 +293,21 @@ function ServiceDashboardContent() {
@@ -287,21 +321,21 @@ function ServiceDashboardContent() {
diff --git a/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.spec.tsx b/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.spec.tsx index 06fcefc16ea..a6b9716bef8 100644 --- a/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.spec.tsx +++ b/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.spec.tsx @@ -35,6 +35,7 @@ jest.mock('@qovery/domains/observability/feature', () => ({ EnableObservabilityContent: () =>
Enable Content
, EnableObservabilityVideo: () =>
Enable Video
, DatabaseRdsDashboard: () =>
Database RDS Dashboard
, + ServiceDashboard: () =>
Service Dashboard
, })) jest.mock('./placeholder-monitoring', () => ({ @@ -131,7 +132,7 @@ describe('PageMonitoringFeature', () => { expect(screen.getByText('Database RDS Dashboard')).toBeInTheDocument() }) - it('should not show monitoring for non-AWS providers', () => { + it('should not show monitoring for managed databases on non-AWS providers', () => { mockUseService.mockReturnValue({ data: { serviceType: 'DATABASE', mode: DatabaseModeEnum.MANAGED }, isFetched: true, @@ -149,7 +150,25 @@ describe('PageMonitoringFeature', () => { expect(screen.getByText('Enable Content')).toBeInTheDocument() }) - it('should not show monitoring for container mode databases', () => { + it('should show service dashboard for container databases on GCP when metrics are enabled', () => { + mockUseService.mockReturnValue({ + data: { serviceType: 'DATABASE', mode: DatabaseModeEnum.CONTAINER }, + isFetched: true, + }) + mockUseCluster.mockReturnValue({ + data: { + cloud_provider: 'GCP', + metrics_parameters: { enabled: true }, + }, + isFetched: true, + }) + mockUseDeploymentStatus.mockReturnValue({ data: { state: 'RUNNING' } }) + + render() + expect(screen.getByText('Service Dashboard')).toBeInTheDocument() + }) + + it('should show service dashboard for container mode databases when metrics are enabled', () => { mockUseService.mockReturnValue({ data: { serviceType: 'DATABASE', mode: DatabaseModeEnum.CONTAINER }, isFetched: true, @@ -159,7 +178,26 @@ describe('PageMonitoringFeature', () => { cloud_provider: 'AWS', metrics_parameters: { enabled: true, - configuration: { cloud_watch_export_config: { enabled: true } }, + }, + }, + isFetched: true, + }) + mockUseDeploymentStatus.mockReturnValue({ data: { state: 'RUNNING' } }) + + render() + expect(screen.getByText('Service Dashboard')).toBeInTheDocument() + }) + + it('should show upsell for container mode databases when metrics are disabled', () => { + mockUseService.mockReturnValue({ + data: { serviceType: 'DATABASE', mode: DatabaseModeEnum.CONTAINER }, + isFetched: true, + }) + mockUseCluster.mockReturnValue({ + data: { + cloud_provider: 'AWS', + metrics_parameters: { + enabled: false, }, }, isFetched: true, diff --git a/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.tsx b/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.tsx index b1f600f41c9..87c029af8a4 100644 --- a/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.tsx +++ b/libs/pages/database/src/lib/feature/page-monitoring-feature/page-monitoring-feature.tsx @@ -1,6 +1,7 @@ import { DatabaseModeEnum } from 'qovery-typescript-axios' import { useMemo } from 'react' import { useParams } from 'react-router-dom' +import { match } from 'ts-pattern' import { useCluster } from '@qovery/domains/clusters/feature' import { useEnvironment } from '@qovery/domains/environments/feature' import { @@ -8,6 +9,7 @@ import { EnableObservabilityButtonContactUs, EnableObservabilityContent, EnableObservabilityVideo, + ServiceDashboard, } from '@qovery/domains/observability/feature' import { type Database } from '@qovery/domains/services/data-access' import { useDeploymentStatus, useService } from '@qovery/domains/services/feature' @@ -30,11 +32,17 @@ export function PageMonitoringFeature() { const hasMetrics = useMemo( () => - cluster?.cloud_provider === 'AWS' && - cluster?.metrics_parameters?.enabled && - cluster?.metrics_parameters?.configuration?.cloud_watch_export_config?.enabled && service?.serviceType === 'DATABASE' && - (service as Database)?.mode === DatabaseModeEnum.MANAGED, + cluster?.metrics_parameters?.enabled && + match((service as Database)?.mode) + .with(DatabaseModeEnum.MANAGED, () => { + return ( + cluster?.cloud_provider === 'AWS' && + cluster?.metrics_parameters?.configuration?.cloud_watch_export_config?.enabled + ) + }) + .with(DatabaseModeEnum.CONTAINER, () => true) + .otherwise(() => false), [ cluster?.cloud_provider, cluster?.metrics_parameters?.configuration?.cloud_watch_export_config?.enabled, @@ -73,17 +81,19 @@ export function PageMonitoringFeature() {
) - return noMetricsAvailable ? ( -
-
- - Monitoring is not available - Deploy this database to view monitoring data + if (noMetricsAvailable) { + return ( +
+
+ + Monitoring is not available + Deploy this database to view monitoring data +
-
- ) : ( - - ) + ) + } + + return (service as Database)?.mode === DatabaseModeEnum.CONTAINER ? : } export default PageMonitoringFeature diff --git a/libs/pages/database/src/lib/ui/container/container.tsx b/libs/pages/database/src/lib/ui/container/container.tsx index a5eb0f0a386..03d4afbffbb 100644 --- a/libs/pages/database/src/lib/ui/container/container.tsx +++ b/libs/pages/database/src/lib/ui/container/container.tsx @@ -51,12 +51,18 @@ export function Container({ service, environment, children }: PropsWithChildren< const hasMetrics = useMemo( () => - cluster?.cloud_provider === 'AWS' && - cluster?.metrics_parameters?.enabled && - cluster?.metrics_parameters?.configuration?.cloud_watch_export_config?.enabled && service?.serviceType === 'DATABASE' && - (service?.type === 'POSTGRESQL' || service?.type === 'MYSQL') && - (service as Database)?.mode === DatabaseModeEnum.MANAGED, + cluster?.metrics_parameters?.enabled && + match((service as Database)?.mode) + .with(DatabaseModeEnum.MANAGED, () => { + return ( + cluster?.cloud_provider === 'AWS' && + cluster?.metrics_parameters?.configuration?.cloud_watch_export_config?.enabled && + (service?.type === 'POSTGRESQL' || service?.type === 'MYSQL') + ) + }) + .with(DatabaseModeEnum.CONTAINER, () => true) + .otherwise(() => false), [ cluster?.cloud_provider, cluster?.metrics_parameters?.configuration?.cloud_watch_export_config?.enabled,