ydb-embedded-ui 4.16.2 → 4.17.0

package/dist/store/reducers/tenants/utils.ts

@@ -1,5 +1,8 @@
 import type {TTenant} from '../../../types/api/tenant';
+import {formatBytes} from '../../../utils/bytesParsers';
+import {formatCPU} from '../../../utils/formatCPU/formatCPU';
 import {isNumeric} from '../../../utils/utils';
+import {METRIC_STATUS} from './contants';
 
 const getControlPlaneValue = (tenant: TTenant) => {
     const parts = tenant.Name?.split('/');
@@ -18,21 +21,40 @@ const getTenantBackend = (tenant: TTenant) => {
     return node.Host ? `${node.Host}${address ? address : ''}` : undefined;
 };
 
-const calculateTenantMetrics = (tenant: TTenant) => {
-    const {CoresUsed, MemoryUsed, StorageAllocatedSize, Metrics = {}} = tenant;
+export const calculateTenantMetrics = (tenant?: TTenant) => {
+    const {
+        CoresUsed,
+        MemoryUsed,
+        StorageAllocatedSize,
+        CoresLimit,
+        MemoryLimit,
+        StorageLimit,
+        Metrics = {},
+    } = tenant || {};
 
     const cpuFromCores = isNumeric(CoresUsed) ? Number(CoresUsed) * 1_000_000 : undefined;
     const cpuFromMetrics = isNumeric(Metrics.CPU) ? Number(Metrics.CPU) : undefined;
 
-    const cpu = cpuFromCores ?? cpuFromMetrics ?? 0;
+    const cpu = cpuFromCores ?? cpuFromMetrics ?? undefined;
 
     const rawMemory = MemoryUsed ?? Metrics.Memory;
-    const rawStorage = StorageAllocatedSize ?? Metrics.Storage;
 
-    const memory = isNumeric(rawMemory) ? Number(rawMemory) : 0;
-    const storage = isNumeric(rawStorage) ? Number(rawStorage) : 0;
+    const memory = isNumeric(rawMemory) ? Number(rawMemory) : undefined;
 
-    return {cpu, memory, storage};
+    // Blob storage - actual database size
+    const storage = isNumeric(StorageAllocatedSize) ? Number(StorageAllocatedSize) : undefined;
+    const cpuLimit = isNumeric(CoresLimit) ? Number(CoresLimit) : undefined;
+    const memoryLimit = isNumeric(MemoryLimit) ? Number(MemoryLimit) : undefined;
+    const storageLimit = isNumeric(StorageLimit) ? Number(StorageLimit) : undefined;
+
+    return {
+        cpu,
+        memory,
+        storage,
+        cpuLimit,
+        memoryLimit,
+        storageLimit,
+    };
 };
 
 const calculateTenantEntities = (tenant: TTenant) => {
@@ -66,3 +88,88 @@ export const prepareTenants = (tenants: TTenant[], useNodeAsBackend: boolean) =>
         };
     });
 };
+
+export const calculateUsage = (valueUsed?: number, valueLimit?: number): number | undefined => {
+    if (valueUsed && valueLimit) {
+        return (valueUsed * 100) / valueLimit;
+    }
+
+    return undefined;
+};
+
+export const formatUsage = (usage?: number) => {
+    if (usage) {
+        return `${usage.toFixed()}%`;
+    }
+
+    return undefined;
+};
+
+export const cpuUsageToStatus = (usage?: number) => {
+    if (!usage) {
+        return METRIC_STATUS.Unspecified;
+    }
+
+    if (usage > 70) {
+        return METRIC_STATUS.Danger;
+    }
+    if (usage > 60) {
+        return METRIC_STATUS.Warning;
+    }
+
+    return METRIC_STATUS.Good;
+};
+export const storageUsageToStatus = (usage?: number) => {
+    if (!usage) {
+        return METRIC_STATUS.Unspecified;
+    }
+
+    if (usage > 85) {
+        return METRIC_STATUS.Danger;
+    }
+    if (usage > 75) {
+        return METRIC_STATUS.Warning;
+    }
+
+    return METRIC_STATUS.Good;
+};
+
+export const memoryUsageToStatus = (usage?: number) => {
+    if (!usage) {
+        return METRIC_STATUS.Unspecified;
+    }
+
+    if (usage > 70) {
+        return METRIC_STATUS.Danger;
+    }
+    if (usage > 60) {
+        return METRIC_STATUS.Warning;
+    }
+
+    return METRIC_STATUS.Good;
+};
+
+export const formatTenantMetrics = ({
+    cpu,
+    storage,
+    memory,
+}: {
+    cpu?: number;
+    storage?: number;
+    memory?: number;
+}) => ({
+    cpu: formatCPU(cpu),
+    storage: formatBytes({value: storage, significantDigits: 2}) || undefined,
+    memory: formatBytes({value: memory, significantDigits: 2}) || undefined,
+});
+
+export const normalizeProgress = (progress: number) => {
+    if (progress >= 100) {
+        return 100;
+    }
+    if (progress <= 0) {
+        return 0;
+    }
+
+    return progress;
+};

package/dist/store/state-url-mapping.js

@@ -54,6 +54,9 @@ const paramSetup = {
         summaryTab: {
             stateKey: 'tenant.summaryTab',
         },
+        metricsTab: {
+            stateKey: 'tenant.metricsTab',
+        },
         shardsMode: {
             stateKey: 'shardsWorkload.filters.mode',
         },

package/dist/styles/constants.scss

@@ -1,3 +1,5 @@
 :root {
     --tenant-object-info-max-value-width: 300px;
+
+    --diagnostics-section-title-margin: 20px;
 }

package/dist/types/api/tenant.ts

@@ -57,6 +57,9 @@ export interface TTenant {
 
     MonitoringEndpoint?: string; // additional
     ControlPlane?: ControlPlane; // additional
+
+    CoresLimit?: string; // TODO: check correctness in backend protos when fully supported
+    StorageLimit?: string; // TODO: check correctness in backend protos when fully supported
 }
 
 interface THiveDomainStatsStateCount {

package/dist/utils/constants.ts

@@ -88,6 +88,7 @@ export const LANGUAGE_KEY = 'language';
 export const INVERTED_DISKS_KEY = 'invertedDisks';
 export const USE_NODES_ENDPOINT_IN_DIAGNOSTICS_KEY = 'useNodesEndpointInDiagnostics';
 export const ENABLE_ADDITIONAL_QUERY_MODES = 'enableAdditionalQueryModes';
+export const ENABLE_NEW_TENANT_DIAGNOSTICS_DESIGN = 'enableNewTenantDiagnosticsDesign';
 export const SAVED_QUERIES_KEY = 'saved_queries';
 export const ASIDE_HEADER_COMPACT_KEY = 'asideHeaderCompact';
 export const QUERIES_HISTORY_KEY = 'queries_history';

package/dist/utils/formatCPU/formatCPU.ts

@@ -0,0 +1,20 @@
+import {configuredNumeral} from '../numeral';
+import i18n from './i18n';
+
+export const formatCPU = (value?: number) => {
+    if (value === undefined) {
+        return undefined;
+    }
+
+    const rawCores = value / 1000000;
+    let cores = rawCores.toPrecision(3);
+    if (rawCores >= 1000) {
+        cores = rawCores.toFixed();
+    }
+    if (rawCores < 0.001) {
+        cores = '0';
+    }
+    const localizedCores = configuredNumeral(Number(cores)).format('0.[000]');
+
+    return `${localizedCores} ${i18n('cores', {count: cores})}`;
+};

package/dist/utils/formatCPU/i18n/en.json

@@ -0,0 +1,3 @@
+{
+  "cores": ["core", "cores", "cores", "cores"]
+}

package/dist/utils/formatCPU/i18n/index.ts

@@ -0,0 +1,11 @@
+import {i18n, Lang} from '../../i18n';
+
+import en from './en.json';
+import ru from './ru.json';
+
+const COMPONENT = 'ydb-format-cpu';
+
+i18n.registerKeyset(Lang.En, COMPONENT, en);
+i18n.registerKeyset(Lang.Ru, COMPONENT, ru);
+
+export default i18n.keyset(COMPONENT);

package/dist/utils/formatCPU/i18n/ru.json

@@ -0,0 +1,3 @@
+{
+  "cores": ["ядро", "ядра", "ядер", "ядер"]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-embedded-ui",
-  "version": "4.16.2",
+  "version": "4.17.0",
   "files": [
     "dist"
   ],