diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx index a8c98d68e..c851b69c0 100644 --- a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx +++ b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx @@ -96,7 +96,7 @@ const BasicDashboard = ({ classes, usage }: IDashboardProps) => { return 0; }); } - + return []; }; diff --git a/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx index fefc8971f..05dac639c 100644 --- a/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx +++ b/portal-ui/src/screens/Console/Dashboard/Prometheus/PrDashboard.tsx @@ -298,11 +298,11 @@ const PrDashboard = ({ }, [loading, fetchUsage]); const summaryPanels = [ + [66, 44, 500, 501], + [50, 502], [80, 81, 1], [68, 52], [63, 70], - [66, 50, 44, 500], - [501, 502, 61, 62], ]; const resourcesPanels = [ [76, 77], @@ -359,7 +359,7 @@ const PrDashboard = ({ setCurTab(newValue); }} tabOptions={[ - { label: "Summary" }, + { label: "Usage" }, { label: "Traffic" }, { label: "Resources" }, ]} diff --git a/portal-ui/src/screens/Console/Dashboard/Prometheus/utils.tsx b/portal-ui/src/screens/Console/Dashboard/Prometheus/utils.tsx index 1a4dc4fb2..829f940a8 100644 --- a/portal-ui/src/screens/Console/Dashboard/Prometheus/utils.tsx +++ b/portal-ui/src/screens/Console/Dashboard/Prometheus/utils.tsx @@ -60,7 +60,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 50, - title: "Current Usable Capacity", + title: "Capacity", data: [], dataOuter: [{ name: "outer", value: 100 }], widgetConfiguration: { @@ -144,7 +144,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 66, - title: "Number of Buckets", + title: "Buckets", data: [], innerLabel: "N/A", type: widgetType.singleRep, @@ -153,7 +153,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 44, - title: "Number of Objects", + title: "Objects", data: [], innerLabel: "N/A", type: widgetType.singleRep, @@ -162,7 +162,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 63, - title: "S3 API Data Received Rate", + title: "API Data Received Rate", data: [], widgetConfiguration: [ { @@ -214,7 +214,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 60, - title: "S3 API Request Rate", + title: "API Request Rate", data: [], widgetConfiguration: [ { @@ -230,7 +230,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 70, - title: "S3 API Data Sent Rate", + title: "API Data Sent Rate", data: [], widgetConfiguration: [ { @@ -297,7 +297,7 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 71, - title: "S3 API Request Error Rate", + title: "API Request Error Rate", data: [], widgetConfiguration: [ { @@ -399,13 +399,13 @@ export const panelsConfiguration: IDashboardPanel[] = [ mergedPanels: [ { id: 53, - title: "Online Servers", + title: "Online", data: "N/A", type: widgetType.singleValue, }, { id: 69, - title: "Offline Servers", + title: "Offline", data: "N/A", type: widgetType.singleValue, }, @@ -417,25 +417,25 @@ export const panelsConfiguration: IDashboardPanel[] = [ mergedPanels: [ { id: 9, - title: "Online Disks", + title: "Online", data: "N/A", type: widgetType.singleValue, }, { id: 78, - title: "Offline Disks", + title: "Offline", data: "N/A", type: widgetType.singleValue, }, ], - title: "Disks", + title: "Drives", }, { id: 502, mergedPanels: [ { id: 65, - title: "Inbound Traffic", + title: "Upload", data: "N/A", type: widgetType.singleValue, @@ -443,14 +443,14 @@ export const panelsConfiguration: IDashboardPanel[] = [ }, { id: 64, - title: "Outbound Traffic", + title: "Download", data: "N/A", type: widgetType.singleValue, labelDisplayFunction: niceBytes, }, ], - title: "Total S3 Traffic", + title: "Network", }, ];