bfg-common 1.6.95 → 1.6.97

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/lib/config/utils.ts

@@ -9,11 +9,15 @@ import type {
   UI_T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/lib/models/types'
 import type { UI_I_Localization } from '~/lib/models/interfaces'
+import type { UI_T_Project } from '~/lib/models/types'
 
 const hostItemsFunc = (
   chart: UI_T_ChartHost,
   localization: UI_I_Localization,
-  type: UI_T_AdvancedType
+  type: UI_T_AdvancedType,
+  project: UI_T_Project,
+  powerData: UI_I_AdvancedCounterItem[],
+  temperatureData: UI_I_AdvancedCounterItem[]
 ): UI_I_AdvancedCounterItem[] => {
   const cpu: UI_I_AdvancedCounterItem[] = [
     {
@@ -49,7 +53,8 @@ const hostItemsFunc = (
       description: localization.inventoryMonitor.totalCpuUsageMhz,
       measurement: localization.inventoryMonitor.numberOfMhz,
       units: localization.inventoryMonitor.mhz,
-      nameEn: 'commonUsageMhz',
+      // nameEn: 'commonUsageMhz',
+      nameEn: 'totalMHz',
       testId: 'counters-table-common-usage-mhz',
     },
     {
@@ -58,7 +63,8 @@ const hostItemsFunc = (
       description: localization.inventoryMonitor.averageProcLoadMhz,
       measurement: localization.inventoryMonitor.numberOfMhz,
       units: localization.inventoryMonitor.mhz,
-      nameEn: 'averageCoreFrequency',
+      // nameEn: 'averageCoreFrequency',
+      nameEn: 'averageMHz',
       testId: 'counters-table-average-core-frequency',
     },
   ]
@@ -609,334 +615,944 @@ const hostItemsFunc = (
     },
   ]
 
+  const hyperConvergedInfrastructure: UI_I_AdvancedCounterItem[] = []
+  const nfs: UI_I_AdvancedCounterItem[] = [
+    {
+      id: 1,
+      name: localization.inventoryMonitor.readThroughput,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.kbs,
+      nameEn: 'read rate',
+      testId: 'counters-table-nfs-item-1',
+    },
+    {
+      id: 2,
+      name: localization.inventoryMonitor.readOperationLatency,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'read latency',
+      testId: 'counters-table-nfs-item-2',
+    },
+    {
+      id: 3,
+      name: localization.inventoryMonitor.numberOfReadRequests,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.item,
+      nameEn: 'read requests',
+      testId: 'counters-table-nfs-item-3',
+    },
+    {
+      id: 4,
+      name: localization.inventoryMonitor.readCommandsIssued,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.item,
+      nameEn: 'read commands issued',
+      testId: 'counters-table-nfs-item-4',
+    },
+    {
+      id: 5,
+      name: localization.inventoryMonitor.readCommandsLatency,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'read commands latency',
+      testId: 'counters-table-nfs-item-5',
+    },
+    {
+      id: 6,
+      name: localization.inventoryMonitor.writeThroughput,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.kbs,
+      nameEn: 'write rate',
+      testId: 'counters-table-nfs-item-6',
+    },
+    {
+      id: 7,
+      name: localization.inventoryMonitor.writeOperationLatency,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'write latency',
+      testId: 'counters-table-nfs-item-7',
+    },
+    {
+      id: 8,
+      name: localization.inventoryMonitor.numberOfWriteRequests,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.item,
+      nameEn: 'write requests',
+      testId: 'counters-table-nfs-item-8',
+    },
+    {
+      id: 9,
+      name: localization.inventoryMonitor.avgCommandsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'average commands issued per second',
+      testId: 'counters-table-nfs-item-9',
+    },
+    {
+      id: 10,
+      name: localization.inventoryMonitor.avgReadReqSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'average read requests per second',
+      testId: 'counters-table-nfs-item-10',
+    },
+    {
+      id: 11,
+      name: localization.inventoryMonitor.avgWriteReqSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'average write requests per second',
+      testId: 'counters-table-nfs-item-11',
+    },
+    {
+      id: 12,
+      name: localization.inventoryMonitor.readOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'READ ops_per_sec',
+      testId: 'counters-table-nfs-item-12',
+    },
+    {
+      id: 13,
+      name: localization.inventoryMonitor.readThroughput2,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.bS,
+      nameEn: 'READ bytes_per_sec',
+      testId: 'counters-table-nfs-item-13',
+    },
+    {
+      id: 14,
+      name: localization.inventoryMonitor.readRetransSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'READ retrans_per_sec',
+      testId: 'counters-table-nfs-item-14',
+    },
+    {
+      id: 15,
+      name: localization.inventoryMonitor.readTimeoutsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'READ timeouts_per_sec',
+      testId: 'counters-table-nfs-item-15',
+    },
+    {
+      id: 16,
+      name: localization.inventoryMonitor.avgReadExecTime,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'READ avg_exec_ms',
+      testId: 'counters-table-nfs-item-16',
+    },
+    {
+      id: 17,
+      name: localization.inventoryMonitor.avgReadRtt,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'READ avg_rtt_ms',
+      testId: 'counters-table-nfs-item-17',
+    },
+    {
+      id: 18,
+      name: localization.inventoryMonitor.writeOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'WRITE ops_per_sec',
+      testId: 'counters-table-nfs-item-18',
+    },
+    {
+      id: 19,
+      name: localization.inventoryMonitor.writeThroughput2,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.bS,
+      nameEn: 'WRITE bytes_per_sec',
+      testId: 'counters-table-nfs-item-19',
+    },
+    {
+      id: 20,
+      name: localization.inventoryMonitor.writeRetransSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'WRITE retrans_per_sec',
+      testId: 'counters-table-nfs-item-20',
+    },
+    {
+      id: 21,
+      name: localization.inventoryMonitor.writeTimeoutsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'WRITE timeouts_per_sec',
+      testId: 'counters-table-nfs-item-21',
+    },
+    {
+      id: 22,
+      name: localization.inventoryMonitor.avgWriteExecTime,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'WRITE avg_exec_ms',
+      testId: 'counters-table-nfs-item-22',
+    },
+    {
+      id: 23,
+      name: localization.inventoryMonitor.avgWriteRtt,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'WRITE avg_rtt_ms',
+      testId: 'counters-table-nfs-item-23',
+    },
+    {
+      id: 24,
+      name: localization.inventoryMonitor.getAttributesSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'GETATTR ops_per_sec',
+      testId: 'counters-table-nfs-item-24',
+    },
+    {
+      id: 25,
+      name: localization.inventoryMonitor.lookupOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'LOOKUP ops_per_sec',
+      testId: 'counters-table-nfs-item-25',
+    },
+    {
+      id: 26,
+      name: localization.inventoryMonitor.accessCheckSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'ACCESS ops_per_sec',
+      testId: 'counters-table-nfs-item-26',
+    },
+    {
+      id: 27,
+      name: localization.inventoryMonitor.totalOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'TOTAL ops_per_sec',
+      testId: 'counters-table-nfs-item-27',
+    },
+    {
+      id: 28,
+      name: localization.inventoryMonitor.totalThroughput,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.bS,
+      nameEn: 'TOTAL bytes_per_sec',
+      testId: 'counters-table-nfs-item-28',
+    },
+    {
+      id: 29,
+      name: localization.inventoryMonitor.totalRetransSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'TOTAL retrans_per_sec',
+      testId: 'counters-table-nfs-item-29',
+    },
+    {
+      id: 30,
+      name: localization.inventoryMonitor.totalTimeoutsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.itemSec,
+      nameEn: 'TOTAL timeouts_per_sec',
+      testId: 'counters-table-nfs-item-30',
+    },
+    {
+      id: 31,
+      name: localization.inventoryMonitor.avgTotalExecTime,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'TOTAL avg_exec_ms',
+      testId: 'counters-table-nfs-item-31',
+    },
+    {
+      id: 32,
+      name: localization.inventoryMonitor.avgTotalRtt,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.ms,
+      nameEn: 'TOTAL avg_rtt_ms',
+      testId: 'counters-table-nfs-item-32',
+    },
+    {
+      id: 33,
+      name: localization.inventoryMonitor.nullOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.NULL_per_sec',
+      testId: 'counters-table-nfs-item-33',
+    },
+    {
+      id: 34,
+      name: localization.inventoryMonitor.compoundOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.COMPOUND_per_sec',
+      testId: 'counters-table-nfs-item-34',
+    },
+    {
+      id: 35,
+      name: localization.inventoryMonitor.openOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.OPEN_per_sec',
+      testId: 'counters-table-nfs-item-35',
+    },
+    {
+      id: 36,
+      name: localization.inventoryMonitor.openConfirmSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.OPEN_CONFIRM_per_sec',
+      testId: 'counters-table-nfs-item-36',
+    },
+    {
+      id: 37,
+      name: localization.inventoryMonitor.openNoattrSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.OPEN_NOATTR_per_sec',
+      testId: 'counters-table-nfs-item-37',
+    },
+    {
+      id: 38,
+      name: localization.inventoryMonitor.openDowngradeSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.OPEN_DOWNGRADE_per_sec',
+      testId: 'counters-table-nfs-item-38',
+    },
+    {
+      id: 39,
+      name: localization.inventoryMonitor.closeOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.CLOSE_per_sec',
+      testId: 'counters-table-nfs-item-39',
+    },
+    {
+      id: 40,
+      name: localization.inventoryMonitor.setattrOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.SETATTR_per_sec',
+      testId: 'counters-table-nfs-item-40',
+    },
+    {
+      id: 41,
+      name: localization.inventoryMonitor.fsinfoOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.FSINFO_per_sec',
+      testId: 'counters-table-nfs-item-41',
+    },
+    {
+      id: 42,
+      name: localization.inventoryMonitor.renewOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.RENEW_per_sec',
+      testId: 'counters-table-nfs-item-42',
+    },
+    {
+      id: 43,
+      name: localization.inventoryMonitor.setclientidSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.SETCLIENTID_per_sec',
+      testId: 'counters-table-nfs-item-43',
+    },
+    {
+      id: 44,
+      name: localization.inventoryMonitor.setclientidConfirmSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.SETCLIENTID_CONFIRM_per_sec',
+      testId: 'counters-table-nfs-item-44',
+    },
+    {
+      id: 45,
+      name: localization.inventoryMonitor.lockOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.LOCK_per_sec',
+      testId: 'counters-table-nfs-item-45',
+    },
+    {
+      id: 46,
+      name: localization.inventoryMonitor.locktOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.LOCKT_per_sec',
+      testId: 'counters-table-nfs-item-46',
+    },
+    {
+      id: 47,
+      name: localization.inventoryMonitor.lockuOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.LOCKU_per_sec',
+      testId: 'counters-table-nfs-item-47',
+    },
+    {
+      id: 48,
+      name: localization.inventoryMonitor.accessOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.ACCESS_per_sec',
+      testId: 'counters-table-nfs-item-48',
+    },
+    {
+      id: 49,
+      name: localization.inventoryMonitor.getattrOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.GETATTR_per_sec',
+      testId: 'counters-table-nfs-item-49',
+    },
+    {
+      id: 50,
+      name: localization.inventoryMonitor.lookupOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.LOOKUP_per_sec',
+      testId: 'counters-table-nfs-item-50',
+    },
+    {
+      id: 51,
+      name: localization.inventoryMonitor.lookupRootSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.LOOKUP_ROOT_per_sec',
+      testId: 'counters-table-nfs-item-51',
+    },
+    {
+      id: 52,
+      name: localization.inventoryMonitor.readOpsSec2,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.READ_per_sec',
+      testId: 'counters-table-nfs-item-52',
+    },
+    {
+      id: 53,
+      name: localization.inventoryMonitor.readdirOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.READDIR_per_sec',
+      testId: 'counters-table-nfs-item-53',
+    },
+    {
+      id: 54,
+      name: localization.inventoryMonitor.readlinkSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.READLINK_per_sec',
+      testId: 'counters-table-nfs-item-54',
+    },
+    {
+      id: 55,
+      name: localization.inventoryMonitor.removeOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.REMOVE_per_sec',
+      testId: 'counters-table-nfs-item-55',
+    },
+    {
+      id: 56,
+      name: localization.inventoryMonitor.renameOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.RENAME_per_sec',
+      testId: 'counters-table-nfs-item-56',
+    },
+    {
+      id: 57,
+      name: localization.inventoryMonitor.linkOpsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.LINK_per_sec',
+      testId: 'counters-table-nfs-item-57',
+    },
+    {
+      id: 58,
+      name: localization.inventoryMonitor.symlinkSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.SYMLINK_per_sec',
+      testId: 'counters-table-nfs-item-58',
+    },
+    {
+      id: 59,
+      name: localization.inventoryMonitor.createopsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.CREATE_per_sec',
+      testId: 'counters-table-nfs-item-59',
+    },
+    {
+      id: 60,
+      name: localization.inventoryMonitor.pathconfSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.PATHCONF_per_sec',
+      testId: 'counters-table-nfs-item-60',
+    },
+    {
+      id: 61,
+      name: localization.inventoryMonitor.statfsSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.STATFS_per_sec',
+      testId: 'counters-table-nfs-item-61',
+    },
+    {
+      id: 62,
+      name: localization.inventoryMonitor.writeOpsSec2,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.WRITE_per_sec',
+      testId: 'counters-table-nfs-item-62',
+    },
+    {
+      id: 63,
+      name: localization.inventoryMonitor.commitSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.COMMIT_per_sec',
+      testId: 'counters-table-nfs-item-63',
+    },
+    {
+      id: 64,
+      name: localization.inventoryMonitor.delegreturnSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.DELEGRETURN_per_sec',
+      testId: 'counters-table-nfs-item-64',
+    },
+    {
+      id: 65,
+      name: localization.inventoryMonitor.getfhSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.GETFH_per_sec',
+      testId: 'counters-table-nfs-item-65',
+    },
+    {
+      id: 66,
+      name: localization.inventoryMonitor.secinfoSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.SECINFO_per_sec',
+      testId: 'counters-table-nfs-item-66',
+    },
+    {
+      id: 67,
+      name: localization.inventoryMonitor.restorefhSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.RESTOREFH_per_sec',
+      testId: 'counters-table-nfs-item-67',
+    },
+    {
+      id: 68,
+      name: localization.inventoryMonitor.savefhSec,
+      description: '--',
+      measurement: '--',
+      units: localization.inventoryMonitor.opsSec,
+      nameEn: 'rpc.client.proc4.SAVEFH_per_sec',
+      testId: 'counters-table-nfs-item-68',
+    },
+  ]
+  const services: UI_I_AdvancedCounterItem[] = []
+  let power: UI_I_AdvancedCounterItem[] = []
+  let temperature: UI_I_AdvancedCounterItem[] = []
+
   if (['zone', 'datacenter', 'cluster', 'host'].includes(type)) {
     cpu.push(
-      ...[
-        {
-          id: 5,
-          name: localization.inventoryMonitor.cpuReady,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription1,
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu ready',
-          testId: 'counters-table-cpu-ready',
-        },
-        {
-          id: 6,
-          name: localization.inventoryMonitor.cpuDemand,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription2,
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu demand',
-          testId: 'counters-table-cpu-demand',
-        },
-        {
-          id: 7,
-          name: localization.inventoryMonitor.cpuContentionAvg.replace(
+      {
+        id: 5,
+        name: localization.inventoryMonitor.cpuReady,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription1,
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu ready',
+        testId: 'counters-table-cpu-ready',
+      },
+      {
+        id: 6,
+        name: localization.inventoryMonitor.cpuDemand,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription2,
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu demand',
+        testId: 'counters-table-cpu-demand',
+      },
+      {
+        id: 7,
+        name: localization.inventoryMonitor.cpuContentionAvg.replace(
+          '{0}',
+          '10'
+        ),
+        description:
+          localization.inventoryMonitor.psiSomeCpuPressureAveragedOver.replace(
             '{0}',
             '10'
           ),
-          description:
-            localization.inventoryMonitor.psiSomeCpuPressureAveragedOver.replace(
-              '{0}',
-              '10'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu contention avg10',
-          testId: 'counters-table-cpu-contention-avg10',
-        },
-        {
-          id: 8,
-          name: localization.inventoryMonitor.cpuContentionAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu contention avg10',
+        testId: 'counters-table-cpu-contention-avg10',
+      },
+      {
+        id: 8,
+        name: localization.inventoryMonitor.cpuContentionAvg.replace(
+          '{0}',
+          '60'
+        ),
+        description:
+          localization.inventoryMonitor.psiSomeCpuPressureAveragedOver.replace(
             '{0}',
             '60'
           ),
-          description:
-            localization.inventoryMonitor.psiSomeCpuPressureAveragedOver.replace(
-              '{0}',
-              '60'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu contention avg60',
-          testId: 'counters-table-cpu-contention-avg60',
-        },
-        {
-          id: 9,
-          name: localization.inventoryMonitor.cpuContentionAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu contention avg60',
+        testId: 'counters-table-cpu-contention-avg60',
+      },
+      {
+        id: 9,
+        name: localization.inventoryMonitor.cpuContentionAvg.replace(
+          '{0}',
+          '300'
+        ),
+        description:
+          localization.inventoryMonitor.psiSomeCpuPressureAveragedOver.replace(
             '{0}',
             '300'
           ),
-          description:
-            localization.inventoryMonitor.psiSomeCpuPressureAveragedOver.replace(
-              '{0}',
-              '300'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu contention avg300',
-          testId: 'counters-table-cpu-contention-avg300',
-        },
-        {
-          id: 10,
-          name: localization.inventoryMonitor.cpuCoStopAvg.replace('{0}', '10'),
-          description:
-            localization.inventoryMonitor.psiFullCpuPressureAveragedOver.replace(
-              '{0}',
-              '10'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu co-stop avg10',
-          testId: 'counters-table-cpu-co-stop-avg10',
-        },
-        {
-          id: 11,
-          name: localization.inventoryMonitor.cpuCoStopAvg.replace('{0}', '60'),
-          description:
-            localization.inventoryMonitor.psiFullCpuPressureAveragedOver.replace(
-              '{0}',
-              '60'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu co-stop avg60',
-          testId: 'counters-table-cpu-co-stop-avg60',
-        },
-        {
-          id: 12,
-          name: localization.inventoryMonitor.cpuCoStopAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu contention avg300',
+        testId: 'counters-table-cpu-contention-avg300',
+      },
+      {
+        id: 10,
+        name: localization.inventoryMonitor.cpuCoStopAvg.replace('{0}', '10'),
+        description:
+          localization.inventoryMonitor.psiFullCpuPressureAveragedOver.replace(
+            '{0}',
+            '10'
+          ),
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu co-stop avg10',
+        testId: 'counters-table-cpu-co-stop-avg10',
+      },
+      {
+        id: 11,
+        name: localization.inventoryMonitor.cpuCoStopAvg.replace('{0}', '60'),
+        description:
+          localization.inventoryMonitor.psiFullCpuPressureAveragedOver.replace(
+            '{0}',
+            '60'
+          ),
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu co-stop avg60',
+        testId: 'counters-table-cpu-co-stop-avg60',
+      },
+      {
+        id: 12,
+        name: localization.inventoryMonitor.cpuCoStopAvg.replace('{0}', '300'),
+        description:
+          localization.inventoryMonitor.psiFullCpuPressureAveragedOver.replace(
             '{0}',
             '300'
           ),
-          description:
-            localization.inventoryMonitor.psiFullCpuPressureAveragedOver.replace(
-              '{0}',
-              '300'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'cpu co-stop avg300',
-          testId: 'counters-table-cpu-co-stop-avg300',
-        },
-      ]
+        measurement: '',
+        units: '%',
+        nameEn: 'cpu co-stop avg300',
+        testId: 'counters-table-cpu-co-stop-avg300',
+      }
     )
     memory.push(
-      ...[
-        {
-          id: 7,
-          name: localization.inventoryMonitor.memoryAvailable,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription,
-          measurement: '',
-          units: localization.inventoryMonitor.kilobytes,
-          nameEn: 'available',
-          testId: 'counters-table-memory-available',
-        },
-        {
-          id: 8,
-          name: localization.inventoryMonitor.commitLimit,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription10,
-          measurement: '',
-          units: localization.inventoryMonitor.kilobytes,
-          nameEn: 'commit limit',
-          testId: 'counters-table-commit-limit',
-        },
-        {
-          id: 9,
-          name: localization.inventoryMonitor.committedAs,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription11,
-          measurement: '',
-          units: localization.inventoryMonitor.kilobytes,
-          nameEn: 'committed as',
-          testId: 'counters-table-committed-as',
-        },
-        {
-          id: 10,
-          name: localization.inventoryMonitor.pageFaultsPerSec,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription12,
-          measurement: '',
-          units: localization.inventoryMonitor.faultsPerSecond,
-          nameEn: 'page faults per sec',
-          testId: 'counters-table-page-faults-per-sec',
-        },
-        {
-          id: 11,
-          name: localization.inventoryMonitor.majorPageFaultsPerSec,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription13,
-          measurement: '',
-          units: localization.inventoryMonitor.faultsPerSecond,
-          nameEn: 'major page faults per sec',
-          testId: 'counters-table-major-page-faults-per-sec',
-        },
-        {
-          id: 12,
-          name: localization.inventoryMonitor.swapInPerSec,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription14,
-          measurement: '',
-          units: localization.inventoryMonitor.pagesPerSecond,
-          nameEn: 'swap in per sec',
-          testId: 'counters-table-swap-in-per-sec',
-        },
-        {
-          id: 13,
-          name: localization.inventoryMonitor.swapOutPerSec,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription15,
-          measurement: '',
-          units: localization.inventoryMonitor.pagesPerSecond,
-          nameEn: 'swap out per sec',
-          testId: 'counters-table-swap-out-per-sec',
-        },
-        {
-          id: 14,
-          name: localization.inventoryMonitor.memoryPressureSomeAvg.replace(
+      {
+        id: 7,
+        name: localization.inventoryMonitor.memoryAvailable,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription,
+        measurement: '',
+        units: localization.inventoryMonitor.kilobytes,
+        nameEn: 'available',
+        testId: 'counters-table-memory-available',
+      },
+      {
+        id: 8,
+        name: localization.inventoryMonitor.commitLimit,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription10,
+        measurement: '',
+        units: localization.inventoryMonitor.kilobytes,
+        nameEn: 'commit limit',
+        testId: 'counters-table-commit-limit',
+      },
+      {
+        id: 9,
+        name: localization.inventoryMonitor.committedAs,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription11,
+        measurement: '',
+        units: localization.inventoryMonitor.kilobytes,
+        nameEn: 'committed as',
+        testId: 'counters-table-committed-as',
+      },
+      {
+        id: 10,
+        name: localization.inventoryMonitor.pageFaultsPerSec,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription12,
+        measurement: '',
+        units: localization.inventoryMonitor.faultsPerSecond,
+        nameEn: 'page faults per sec',
+        testId: 'counters-table-page-faults-per-sec',
+      },
+      {
+        id: 11,
+        name: localization.inventoryMonitor.majorPageFaultsPerSec,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription13,
+        measurement: '',
+        units: localization.inventoryMonitor.faultsPerSecond,
+        nameEn: 'major page faults per sec',
+        testId: 'counters-table-major-page-faults-per-sec',
+      },
+      {
+        id: 12,
+        name: localization.inventoryMonitor.swapInPerSec,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription14,
+        measurement: '',
+        units: localization.inventoryMonitor.pagesPerSecond,
+        nameEn: 'swap in per sec',
+        testId: 'counters-table-swap-in-per-sec',
+      },
+      {
+        id: 13,
+        name: localization.inventoryMonitor.swapOutPerSec,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription15,
+        measurement: '',
+        units: localization.inventoryMonitor.pagesPerSecond,
+        nameEn: 'swap out per sec',
+        testId: 'counters-table-swap-out-per-sec',
+      },
+      {
+        id: 14,
+        name: localization.inventoryMonitor.memoryPressureSomeAvg.replace(
+          '{0}',
+          '10'
+        ),
+        description:
+          localization.inventoryMonitor.psiSomeMemoryPressureAveragedOver.replace(
             '{0}',
             '10'
           ),
-          description:
-            localization.inventoryMonitor.psiSomeMemoryPressureAveragedOver.replace(
-              '{0}',
-              '10'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'memory pressure some avg10',
-          testId: 'counters-table-memory-pressure-some-avg10',
-        },
-        {
-          id: 15,
-          name: localization.inventoryMonitor.memoryPressureSomeAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'memory pressure some avg10',
+        testId: 'counters-table-memory-pressure-some-avg10',
+      },
+      {
+        id: 15,
+        name: localization.inventoryMonitor.memoryPressureSomeAvg.replace(
+          '{0}',
+          '60'
+        ),
+        description:
+          localization.inventoryMonitor.psiSomeMemoryPressureAveragedOver.replace(
             '{0}',
             '60'
           ),
-          description:
-            localization.inventoryMonitor.psiSomeMemoryPressureAveragedOver.replace(
-              '{0}',
-              '60'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'memory pressure some avg60',
-          testId: 'counters-table-memory-pressure-some-avg60',
-        },
-        {
-          id: 16,
-          name: localization.inventoryMonitor.memoryPressureSomeAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'memory pressure some avg60',
+        testId: 'counters-table-memory-pressure-some-avg60',
+      },
+      {
+        id: 16,
+        name: localization.inventoryMonitor.memoryPressureSomeAvg.replace(
+          '{0}',
+          '300'
+        ),
+        description:
+          localization.inventoryMonitor.psiSomeMemoryPressureAveragedOver.replace(
             '{0}',
             '300'
           ),
-          description:
-            localization.inventoryMonitor.psiSomeMemoryPressureAveragedOver.replace(
-              '{0}',
-              '300'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'memory pressure some avg300',
-          testId: 'counters-table-memory-pressure-some-avg300',
-        },
-        {
-          id: 17,
-          name: localization.inventoryMonitor.memoryPressureFullAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'memory pressure some avg300',
+        testId: 'counters-table-memory-pressure-some-avg300',
+      },
+      {
+        id: 17,
+        name: localization.inventoryMonitor.memoryPressureFullAvg.replace(
+          '{0}',
+          '10'
+        ),
+        description:
+          localization.inventoryMonitor.psiFullMemoryPressureAveragedOver.replace(
             '{0}',
             '10'
           ),
-          description:
-            localization.inventoryMonitor.psiFullMemoryPressureAveragedOver.replace(
-              '{0}',
-              '10'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'memory pressure full avg10',
-          testId: 'counters-table-memory-pressure-full-avg10',
-        },
-        {
-          id: 18,
-          name: localization.inventoryMonitor.memoryPressureFullAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'memory pressure full avg10',
+        testId: 'counters-table-memory-pressure-full-avg10',
+      },
+      {
+        id: 18,
+        name: localization.inventoryMonitor.memoryPressureFullAvg.replace(
+          '{0}',
+          '60'
+        ),
+        description:
+          localization.inventoryMonitor.psiFullMemoryPressureAveragedOver.replace(
             '{0}',
             '60'
           ),
-          description:
-            localization.inventoryMonitor.psiFullMemoryPressureAveragedOver.replace(
-              '{0}',
-              '60'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'memory pressure full avg60',
-          testId: 'counters-table-memory-pressure-full-avg60',
-        },
-        {
-          id: 19,
-          name: localization.inventoryMonitor.memoryPressureFullAvg.replace(
+        measurement: '',
+        units: '%',
+        nameEn: 'memory pressure full avg60',
+        testId: 'counters-table-memory-pressure-full-avg60',
+      },
+      {
+        id: 19,
+        name: localization.inventoryMonitor.memoryPressureFullAvg.replace(
+          '{0}',
+          '300'
+        ),
+        description:
+          localization.inventoryMonitor.psiFullMemoryPressureAveragedOver.replace(
             '{0}',
             '300'
           ),
-          description:
-            localization.inventoryMonitor.psiFullMemoryPressureAveragedOver.replace(
-              '{0}',
-              '300'
-            ),
-          measurement: '',
-          units: '%',
-          nameEn: 'memory pressure full avg300',
-          testId: 'counters-table-memory-pressure-full-avg300',
-        },
-      ]
+        measurement: '',
+        units: '%',
+        nameEn: 'memory pressure full avg300',
+        testId: 'counters-table-memory-pressure-full-avg300',
+      }
     )
     network.push(
-      ...[
-        {
-          id: 21,
-          name: localization.inventoryMonitor.totalLinkSpeed,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription22,
-          measurement: '',
-          units: localization.common.ms,
-          nameEn: 'total link speed',
-          testId: 'counters-table-total-link-speed',
-        },
-        {
-          id: 22,
-          name: localization.inventoryMonitor.totalUtilizationPercent,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription23,
-          measurement: '',
-          units: '%',
-          nameEn: 'total utilization percent',
-          testId: 'counters-table-total-utilization-percent',
-        },
-        {
-          id: 23,
-          name: localization.inventoryMonitor.interfaceLinkSpeed,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription24,
-          measurement: '',
-          units: localization.common.ms,
-          nameEn: 'link speed',
-          testId: 'counters-table-interface-link-speed',
-        },
-        {
-          id: 24,
-          name: localization.inventoryMonitor.interfaceUtilizationPercent,
-          description:
-            localization.inventoryMonitor.advancedCpuMetricsDescription25,
-          measurement: '',
-          units: '%',
-          nameEn: 'utilization percent',
-          testId: 'counters-table-interface-utilization-percent',
-        },
-      ]
+      {
+        id: 21,
+        name: localization.inventoryMonitor.totalLinkSpeed,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription22,
+        measurement: '',
+        units: localization.common.ms,
+        nameEn: 'total link speed',
+        testId: 'counters-table-total-link-speed',
+      },
+      {
+        id: 22,
+        name: localization.inventoryMonitor.totalUtilizationPercent,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription23,
+        measurement: '',
+        units: '%',
+        nameEn: 'total utilization percent',
+        testId: 'counters-table-total-utilization-percent',
+      },
+      {
+        id: 23,
+        name: localization.inventoryMonitor.interfaceLinkSpeed,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription24,
+        measurement: '',
+        units: localization.common.ms,
+        nameEn: 'link speed',
+        testId: 'counters-table-interface-link-speed',
+      },
+      {
+        id: 24,
+        name: localization.inventoryMonitor.interfaceUtilizationPercent,
+        description:
+          localization.inventoryMonitor.advancedCpuMetricsDescription25,
+        measurement: '',
+        units: '%',
+        nameEn: 'utilization percent',
+        testId: 'counters-table-interface-utilization-percent',
+      }
     )
   }
 
@@ -948,6 +1564,22 @@ const hostItemsFunc = (
     disk,
   }
 
+  if (
+    ['power', 'temperature'].includes(chart) &&
+    (!power.length || !temperature.length)
+  ) {
+    power = powerData
+    temperature = temperatureData
+  }
+
+  if (project === 'procurator') {
+    hostItems['hyperConvergedInfrastructure'] = hyperConvergedInfrastructure
+    hostItems['nfs'] = nfs
+    hostItems['services'] = services
+    hostItems['power'] = power
+    hostItems['temperature'] = temperature
+  }
+
   return hostItems[chart]
 }
 
@@ -956,42 +1588,43 @@ const vmItemsFunc = (
   localization: UI_I_Localization
 ): UI_I_AdvancedCounterItem[] => {
   const disk: UI_I_AdvancedCounterItem[] = [
-    {
-      id: 0,
-      name: localization.inventoryMonitor.readBytes,
-      description: localization.inventoryMonitor.averageNumberBytes,
-      measurement: localization.common.read,
-      units: localization.common.bytes,
-      nameEn: 'read bytes',
-      testId: 'counters-table-read-bytes-item',
-    },
-    {
-      id: 1,
-      name: localization.inventoryMonitor.writeBytes,
-      description: localization.inventoryMonitor.averageNumberBytesWrittenDisk,
-      measurement: localization.common.write,
-      units: localization.common.bytes,
-      nameEn: 'write bytes',
-      testId: 'counters-table-write-bytes-item',
-    },
-    {
-      id: 2,
-      name: localization.inventoryMonitor.readCount,
-      description: localization.inventoryMonitor.averageNumberOfReadCount,
-      measurement: localization.common.read,
-      units: localization.common.num,
-      nameEn: 'read count',
-      testId: 'counters-table-read-count-item',
-    },
-    {
-      id: 3,
-      name: localization.inventoryMonitor.writeCount,
-      description: localization.inventoryMonitor.averageNumberOfWriteCount,
-      measurement: localization.common.write,
-      units: localization.common.num,
-      nameEn: 'write count',
-      testId: 'counters-table-write-count-item',
-    },
+    // {
+    //   id: 0,
+    //   name: localization.inventoryMonitor.readBytes,
+    //   description: localization.inventoryMonitor.averageNumberBytes,
+    //   measurement: localization.common.read,
+    //   units: localization.common.bytes,
+    //   nameEn: 'read bytes',
+    //   testId: 'counters-table-read-bytes-item',
+    // },
+    // {
+    //   id: 1,
+    //   name: localization.inventoryMonitor.writeBytes,
+    //   description: localization.inventoryMonitor.averageNumberBytesWrittenDisk,
+    //   measurement: localization.common.write,
+    //   units: localization.common.bytes,
+    //   nameEn: 'write bytes',
+    //   testId: 'counters-table-write-bytes-item',
+    // },
+    // {
+    //   id: 2,
+    //   name: localization.inventoryMonitor.readCount,
+    //   description: localization.inventoryMonitor.averageNumberOfReadCount,
+    //   measurement: localization.common.read,
+    //   units: localization.common.num,
+    //   nameEn: 'read count',
+    //   testId: 'counters-table-read-count-item',
+    // },
+    // {
+    //   id: 3,
+    //   name: localization.inventoryMonitor.writeCount,
+    //   description: localization.inventoryMonitor.averageNumberOfWriteCount,
+    //   measurement: localization.common.write,
+    //   units: localization.common.num,
+    //   nameEn: 'write count',
+    //   testId: 'counters-table-write-count-item',
+    // },
+
     // {
     //   id: 2,
     //   name: localization.inventoryMonitor.diskDevicesShares,
@@ -1019,202 +1652,662 @@ const vmItemsFunc = (
     //   nameEn: 'disk devices size',
     //   testId: 'counters-table-disk-devices-size-item',
     // },
-  ]
-  const network: UI_I_AdvancedCounterItem[] = [
+
+    // New Update Start
     {
       id: 0,
-      name: localization.inventoryMonitor.packetsReceived,
-      description: localization.inventoryMonitor.amountReceivedPackets,
-      measurement: localization.inventoryMonitor.measuresInPackets,
-      units: localization.inventoryMonitor.packets,
-      nameEn: 'packets received',
-      testId: 'counters-table-packets-received-item',
+      name: localization.inventoryMonitor.diskRead,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription1,
+      measurement: '',
+      units: localization.inventoryMonitor.kBps,
+      nameEn: 'readBytes',
+      testId: 'counters-table-vm-disk-readBytes-item',
     },
     {
       id: 1,
-      name: localization.inventoryMonitor.packetsTransmitted,
-      description: localization.inventoryMonitor.amountTransmittedPackets,
-      measurement: localization.inventoryMonitor.measuresInPackets,
-      units: localization.inventoryMonitor.packets,
-      nameEn: 'packets transmitted',
-      testId: 'counters-table-packets-transmitted-item',
+      name: localization.inventoryMonitor.diskWrite,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription2,
+      measurement: '',
+      units: localization.inventoryMonitor.kBps,
+      nameEn: 'writeBytes',
+      testId: 'counters-table-vm-disk-writeBytes-item',
     },
     {
       id: 2,
-      name: localization.inventoryMonitor.bytesReceived,
-      description: localization.inventoryMonitor.amountReceivedBytes,
-      measurement: localization.inventoryMonitor.measuresInKb,
-      units: localization.common.kb,
-      nameEn: 'bytes received',
-      testId: 'counters-table-bytes-received-item',
+      name: localization.inventoryMonitor.readOperations,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription3,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'readCount',
+      testId: 'counters-table-vm-disk-readCount-item',
     },
     {
       id: 3,
-      name: localization.inventoryMonitor.bytesTransmitted,
-      description: localization.inventoryMonitor.amountTransmittedBytes,
-      measurement: localization.inventoryMonitor.measuresInKb,
-      units: localization.common.kb,
-      nameEn: 'bytes transmitted',
-      testId: 'counters-table-bytes-transmitted-item',
+      name: localization.inventoryMonitor.writeOperations,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription4,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'writeCount',
+      testId: 'counters-table-vm-disk-writeCount-item',
     },
     {
       id: 4,
-      name: localization.inventoryMonitor.receivedPacketsErrors,
-      description: localization.inventoryMonitor.amountReceivedPacketsError,
-      measurement: localization.inventoryMonitor.measuresInPackets,
-      units: localization.inventoryMonitor.packets,
-      nameEn: 'errors received',
-      testId: 'counters-table-errors-received-item',
+      name: localization.inventoryMonitor.maxDiskLatency,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription5,
+      measurement: '',
+      units: localization.common.ms,
+      nameEn: 'maxTotalLatency',
+      testId: 'counters-table-vm-disk-maxTotalLatency-item',
     },
     {
       id: 5,
-      name: localization.inventoryMonitor.transmittedPacketsErrors,
-      description: localization.inventoryMonitor.amountTransmittedPacketsError,
-      measurement: localization.inventoryMonitor.measuresInPackets,
-      units: localization.inventoryMonitor.packets,
-      nameEn: 'errors transmitted',
-      testId: 'counters-table-errors-transmitted-item',
+      name: localization.inventoryMonitor.readIOPS,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription6,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'numberReadAveraged',
+      testId: 'counters-table-vm-disk-numberReadAveraged-item',
     },
     {
       id: 6,
-      name: localization.inventoryMonitor.receivedDroppedPackets,
-      description: localization.inventoryMonitor.amountReceivedDroppedPackets,
-      measurement: localization.inventoryMonitor.measuresInPackets,
-      units: localization.inventoryMonitor.packets,
-      nameEn: 'drop received',
-      testId: 'counters-table-drop-received-item',
+      name: localization.inventoryMonitor.writeIOPS,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription7,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'numberWriteAveraged',
+      testId: 'counters-table-vm-disk-numberWriteAveraged-item',
     },
     {
       id: 7,
-      name: localization.inventoryMonitor.transmittedDroppedPackets,
+      name: localization.inventoryMonitor.queueDepth,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription8,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'queueDepth',
+      testId: 'counters-table-vm-disk-queueDepth-item',
+    },
+    {
+      id: 8,
+      name: localization.inventoryMonitor.pendingReads,
+      description: localization.inventoryMonitor.chartOptionsVmDiskDescription9,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'readOio',
+      testId: 'counters-table-vm-disk-readOio-item',
+    },
+    {
+      id: 9,
+      name: localization.inventoryMonitor.pendingWrites,
+      description:
+        localization.inventoryMonitor.chartOptionsVmDiskDescription10,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'writeOio',
+      testId: 'counters-table-vm-disk-writeOio-item',
+    },
+    {
+      id: 10,
+      name: localization.inventoryMonitor.readLatency2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmDiskDescription11,
+      measurement: '',
+      units: localization.common.ms,
+      nameEn: 'readLoadMetric',
+      testId: 'counters-table-vm-disk-readLoadMetric-item',
+    },
+    {
+      id: 11,
+      name: localization.inventoryMonitor.writeLatency2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmDiskDescription12,
+      measurement: '',
+      units: localization.common.ms,
+      nameEn: 'writeLoadMetric',
+      testId: 'counters-table-vm-disk-writeLoadMetric-item',
+    },
+    {
+      id: 12,
+      name: localization.inventoryMonitor.smallSeeks,
+      description:
+        localization.inventoryMonitor.chartOptionsVmDiskDescription13,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'smallSeeks',
+      testId: 'counters-table-vm-disk-smallSeeks-item',
+    },
+    {
+      id: 13,
+      name: localization.inventoryMonitor.mediumSeeks,
+      description:
+        localization.inventoryMonitor.chartOptionsVmDiskDescription14,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'mediumSeeks',
+      testId: 'counters-table-vm-disk-mediumSeeks-item',
+    },
+    {
+      id: 14,
+      name: localization.inventoryMonitor.largeSeeks,
       description:
-        localization.inventoryMonitor.amountTransmittedDroppedPackets,
-      measurement: localization.inventoryMonitor.measuresInPackets,
-      units: localization.inventoryMonitor.packets,
-      nameEn: 'drop transmitted',
-      testId: 'counters-table-drop-transmitted-item',
+        localization.inventoryMonitor.chartOptionsVmDiskDescription15,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'largeSeeks',
+      testId: 'counters-table-vm-disk-largeSeeks-item',
     },
+    // New Update End
   ]
-  const cpu: UI_I_AdvancedCounterItem[] = [
+  const network: UI_I_AdvancedCounterItem[] = [
+    // {
+    //   id: 0,
+    //   name: localization.inventoryMonitor.packetsReceived,
+    //   description: localization.inventoryMonitor.amountReceivedPackets,
+    //   measurement: localization.inventoryMonitor.measuresInPackets,
+    //   units: localization.inventoryMonitor.packets,
+    //   nameEn: 'packets received',
+    //   testId: 'counters-table-packets-received-item',
+    // },
+    // {
+    //   id: 1,
+    //   name: localization.inventoryMonitor.packetsTransmitted,
+    //   description: localization.inventoryMonitor.amountTransmittedPackets,
+    //   measurement: localization.inventoryMonitor.measuresInPackets,
+    //   units: localization.inventoryMonitor.packets,
+    //   nameEn: 'packets transmitted',
+    //   testId: 'counters-table-packets-transmitted-item',
+    // },
+    // {
+    //   id: 2,
+    //   name: localization.inventoryMonitor.bytesReceived,
+    //   description: localization.inventoryMonitor.amountReceivedBytes,
+    //   measurement: localization.inventoryMonitor.measuresInKb,
+    //   units: localization.common.kb,
+    //   nameEn: 'bytes received',
+    //   testId: 'counters-table-bytes-received-item',
+    // },
+    // {
+    //   id: 3,
+    //   name: localization.inventoryMonitor.bytesTransmitted,
+    //   description: localization.inventoryMonitor.amountTransmittedBytes,
+    //   measurement: localization.inventoryMonitor.measuresInKb,
+    //   units: localization.common.kb,
+    //   nameEn: 'bytes transmitted',
+    //   testId: 'counters-table-bytes-transmitted-item',
+    // },
+    // {
+    //   id: 4,
+    //   name: localization.inventoryMonitor.receivedPacketsErrors,
+    //   description: localization.inventoryMonitor.amountReceivedPacketsError,
+    //   measurement: localization.inventoryMonitor.measuresInPackets,
+    //   units: localization.inventoryMonitor.packets,
+    //   nameEn: 'errors received',
+    //   testId: 'counters-table-errors-received-item',
+    // },
+    // {
+    //   id: 5,
+    //   name: localization.inventoryMonitor.transmittedPacketsErrors,
+    //   description: localization.inventoryMonitor.amountTransmittedPacketsError,
+    //   measurement: localization.inventoryMonitor.measuresInPackets,
+    //   units: localization.inventoryMonitor.packets,
+    //   nameEn: 'errors transmitted',
+    //   testId: 'counters-table-errors-transmitted-item',
+    // },
+    // {
+    //   id: 6,
+    //   name: localization.inventoryMonitor.receivedDroppedPackets,
+    //   description: localization.inventoryMonitor.amountReceivedDroppedPackets,
+    //   measurement: localization.inventoryMonitor.measuresInPackets,
+    //   units: localization.inventoryMonitor.packets,
+    //   nameEn: 'drop received',
+    //   testId: 'counters-table-drop-received-item',
+    // },
+    // {
+    //   id: 7,
+    //   name: localization.inventoryMonitor.transmittedDroppedPackets,
+    //   description:
+    //     localization.inventoryMonitor.amountTransmittedDroppedPackets,
+    //   measurement: localization.inventoryMonitor.measuresInPackets,
+    //   units: localization.inventoryMonitor.packets,
+    //   nameEn: 'drop transmitted',
+    //   testId: 'counters-table-drop-transmitted-item',
+    // },
+
+    // New Update Start
     {
       id: 0,
-      name: localization.inventoryMonitor.usedMhz,
-      description: localization.inventoryMonitor.amountUsedMHz,
-      measurement: localization.inventoryMonitor.usageInMHz,
-      units: localization.common.mhz,
-      nameEn: 'used mhz',
-      testId: 'counters-table-used-mhz-item',
+      name: localization.inventoryMonitor.networkTraffic,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription1,
+      measurement: '',
+      units: localization.inventoryMonitor.kBps,
+      nameEn: 'usage',
+      testId: 'counters-table-vm-usage-item',
     },
     {
       id: 1,
-      name: localization.inventoryMonitor.provisionedMhz,
-      description: localization.inventoryMonitor.amountProvisionedMHz,
-      measurement: localization.inventoryMonitor.usageInMHz,
-      units: localization.common.mhz,
-      nameEn: 'provisioned mhz',
-      testId: 'counters-table-provisioned-mhz-item',
+      name: localization.inventoryMonitor.bytesTransmitted2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription2,
+      measurement: '',
+      units: localization.inventoryMonitor.kBps,
+      nameEn: 'bytesTransmitted',
+      testId: 'counters-table-vm-bytesTransmitted-item',
     },
     {
       id: 2,
-      name: localization.inventoryMonitor.currentVCpus,
-      description: localization.inventoryMonitor.currentNumberVirtualCPUs,
-      measurement: localization.inventoryMonitor.usageInNum,
-      units: localization.common.num,
-      nameEn: 'current vcpus',
-      testId: 'counters-table-current-vcpus-item',
+      name: localization.inventoryMonitor.bytesReceived2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription3,
+      measurement: '',
+      units: localization.inventoryMonitor.kBps,
+      nameEn: 'bytesReceived',
+      testId: 'counters-table-vm-bytesReceived-item',
     },
     {
       id: 3,
-      name: localization.inventoryMonitor.corePerSocket,
-      description: localization.inventoryMonitor.numberCoresPerSocket,
-      measurement: localization.inventoryMonitor.countCoresPerSocket,
+      name: localization.inventoryMonitor.transmitErrors,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription4,
+      measurement: '',
       units: localization.common.num,
-      nameEn: 'core per socket',
-      testId: 'counters-table-core-per-socket-item',
+      nameEn: 'errorsTransmitted',
+      testId: 'counters-table-vm-errorsTransmitted-item',
     },
     {
       id: 4,
-      name: localization.inventoryMonitor.limitMhz,
-      description: localization.inventoryMonitor.limitMHz,
-      measurement: localization.inventoryMonitor.usageInMHz,
-      units: localization.common.mhz,
-      nameEn: 'limit mhz',
-      testId: 'counters-table-limit-mhz-item',
+      name: localization.inventoryMonitor.receiveErrors,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription5,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'errorsReceived',
+      testId: 'counters-table-vm-errorsReceived-item',
     },
     {
       id: 5,
-      name: localization.common.usageCap,
-      description: localization.inventoryMonitor.cPUUsagePercentage,
-      measurement: localization.inventoryMonitor.usagePerc,
-      units: '%',
-      nameEn: 'usage',
-      testId: 'counters-table-usage-perc-item',
+      name: localization.inventoryMonitor.packetsTransmitted2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription6,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'totalPacketsTransmitted',
+      testId: 'counters-table-vm-totalPacketsTransmitted-item',
+    },
+    {
+      id: 6,
+      name: localization.inventoryMonitor.packetsReceived2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription7,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'totalPacketsReceived',
+      testId: 'counters-table-vm-totalPacketsReceived-item',
     },
+    {
+      id: 7,
+      name: localization.inventoryMonitor.transmitDrops,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription8,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'dropTransmitted',
+      testId: 'counters-table-vm-dropTransmitted-item',
+    },
+    {
+      id: 8,
+      name: localization.inventoryMonitor.receiveDrops,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription9,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'dropReceived',
+      testId: 'counters-table-vm-dropReceived-item',
+    },
+    {
+      id: 9,
+      name: localization.inventoryMonitor.broadcastTransmitted,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription10,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'broadcastTx',
+      testId: 'counters-table-vm-broadcastTx-item',
+    },
+    {
+      id: 10,
+      name: localization.inventoryMonitor.broadcastReceived,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription11,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'broadcastRx',
+      testId: 'counters-table-vm-broadcastRx-item',
+    },
+    {
+      id: 11,
+      name: localization.inventoryMonitor.multicastTransmitted,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription12,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'multicastTx',
+      testId: 'counters-table-vm-multicastTx-item',
+    },
+    {
+      id: 12,
+      name: localization.inventoryMonitor.multicastReceived,
+      description:
+        localization.inventoryMonitor.chartOptionsVmNetworkDescription13,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'multicastRx',
+      testId: 'counters-table-vm-multicastRx-item',
+    },
+    // New Update End
   ]
-  const memory: UI_I_AdvancedCounterItem[] = [
+  const cpu: UI_I_AdvancedCounterItem[] = [
+    // {
+    //   id: 0,
+    //   name: localization.inventoryMonitor.usedMhz,
+    //   description: localization.inventoryMonitor.amountUsedMHz,
+    //   measurement: localization.inventoryMonitor.usageInMHz,
+    //   units: localization.common.mhz,
+    //   nameEn: 'used mhz',
+    //   testId: 'counters-table-used-mhz-item',
+    // },
+    // {
+    //   id: 1,
+    //   name: localization.inventoryMonitor.provisionedMhz,
+    //   description: localization.inventoryMonitor.amountProvisionedMHz,
+    //   measurement: localization.inventoryMonitor.usageInMHz,
+    //   units: localization.common.mhz,
+    //   nameEn: 'provisioned mhz',
+    //   testId: 'counters-table-provisioned-mhz-item',
+    // },
+    // {
+    //   id: 2,
+    //   name: localization.inventoryMonitor.currentVCpus,
+    //   description: localization.inventoryMonitor.currentNumberVirtualCPUs,
+    //   measurement: localization.inventoryMonitor.usageInNum,
+    //   units: localization.common.num,
+    //   nameEn: 'current vcpus',
+    //   testId: 'counters-table-current-vcpus-item',
+    // },
+    // {
+    //   id: 3,
+    //   name: localization.inventoryMonitor.corePerSocket,
+    //   description: localization.inventoryMonitor.numberCoresPerSocket,
+    //   measurement: localization.inventoryMonitor.countCoresPerSocket,
+    //   units: localization.common.num,
+    //   nameEn: 'core per socket',
+    //   testId: 'counters-table-core-per-socket-item',
+    // },
+    // {
+    //   id: 4,
+    //   name: localization.inventoryMonitor.limitMhz,
+    //   description: localization.inventoryMonitor.limitMHz,
+    //   measurement: localization.inventoryMonitor.usageInMHz,
+    //   units: localization.common.mhz,
+    //   nameEn: 'limit mhz',
+    //   testId: 'counters-table-limit-mhz-item',
+    // },
+    // {
+    //   id: 5,
+    //   name: localization.common.usageCap,
+    //   description: localization.inventoryMonitor.cPUUsagePercentage,
+    //   measurement: localization.inventoryMonitor.usagePerc,
+    //   units: '%',
+    //   nameEn: 'usage',
+    //   testId: 'counters-table-usage-perc-item',
+    // },
+    // New Update Start
     {
       id: 0,
-      name: localization.inventoryMonitor.memorySizeMb,
-      description: localization.inventoryMonitor.sizeAvailableMemoryInMB,
-      measurement: localization.inventoryMonitor.usageInMb,
-      units: localization.common.mb,
-      nameEn: 'memory size mb',
-      testId: 'counters-table-memory-size-mb-item',
+      name: localization.inventoryMonitor.cpuUsage,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription1,
+      measurement: '',
+      units: '%',
+      nameEn: 'usage',
+      testId: 'counters-table-vm-cpu-usage-item',
     },
     {
       id: 1,
-      name: localization.inventoryMonitor.memoryUsedMb,
-      description: localization.inventoryMonitor.usedMemoryInMB,
-      measurement: localization.inventoryMonitor.usageInMb,
-      units: localization.common.mb,
-      nameEn: 'memory used mb',
-      testId: 'counters-table-memory-used-mb-item',
+      name: localization.inventoryMonitor.cpuUsed,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription2,
+      measurement: '',
+      units: localization.common.mhz,
+      nameEn: 'usedMhz',
+      testId: 'counters-table-vm-cpu-usedMhz-item',
     },
     {
       id: 2,
-      name: localization.inventoryMonitor.sharedPages,
-      description: localization.inventoryMonitor.sharedPagesDesc,
-      measurement: localization.common.num,
+      name: localization.inventoryMonitor.vCpus,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription3,
+      measurement: '',
       units: localization.common.num,
-      nameEn: 'shared pages',
-      testId: 'counters-table-memory-shared-pages-item',
+      nameEn: 'currentVcpus',
+      testId: 'counters-table-vm-cpu-currentVcpus-item',
     },
     {
       id: 3,
-      name: localization.common.text,
-      description: localization.inventoryMonitor.textDesc,
-      measurement: localization.common.num,
+      name: localization.inventoryMonitor.coresPerSocket,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription4,
+      measurement: '',
       units: localization.common.num,
-      nameEn: 'text',
-      testId: 'counters-table-memory-text-item',
+      nameEn: 'corePerSocket',
+      testId: 'counters-table-vm-cpu-corePerSocket-item',
     },
     {
       id: 4,
-      name: localization.inventoryMonitor.library,
-      description: localization.inventoryMonitor.libraryDesc,
-      measurement: localization.common.kb,
-      units: localization.common.kb,
-      nameEn: 'library',
-      testId: 'counters-table-memory-library-item',
+      name: localization.inventoryMonitor.totalCpuTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription5,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'totalCpuTime',
+      testId: 'counters-table-vm-cpu-totalCpuTime-item',
     },
     {
       id: 5,
-      name: localization.inventoryMonitor.dataStack,
-      description: localization.inventoryMonitor.dataStackDesc,
-      measurement: localization.common.num,
-      units: localization.common.num,
-      nameEn: 'data stack',
-      testId: 'counters-table-memory-data-stack-item',
+      name: localization.inventoryMonitor.provisionedMhz,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription6,
+      measurement: '',
+      units: localization.common.mhz,
+      nameEn: 'provisionedMhz',
+      testId: 'counters-table-vm-cpu-provisionedMhz-item',
     },
     {
       id: 6,
-      name: localization.inventoryMonitor.modifiedPages,
-      description: localization.inventoryMonitor.dirtyPagesDesc,
-      measurement: localization.common.num,
+      name: localization.inventoryMonitor.cpuLimit,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription7,
+      measurement: '',
+      units: localization.common.mhz,
+      nameEn: 'limitMhz',
+      testId: 'counters-table-vm-cpu-limitMhz-item',
+    },
+    {
+      id: 7,
+      name: localization.inventoryMonitor.userTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription8,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'userTime',
+      testId: 'counters-table-vm-cpu-userTime-item',
+    },
+    {
+      id: 8,
+      name: localization.inventoryMonitor.systemTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription9,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'systemTime',
+      testId: 'counters-table-vm-cpu-systemTime-item',
+    },
+    {
+      id: 9,
+      name: localization.inventoryMonitor.childrenUserTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription10,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'childrenUserTime',
+      testId: 'counters-table-vm-cpu-childrenUserTime-item',
+    },
+    {
+      id: 10,
+      name: localization.inventoryMonitor.childrenSystemTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription11,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'childrenSystemTime',
+      testId: 'counters-table-vm-cpu-childrenSystemTime-item',
+    },
+    {
+      id: 11,
+      name: localization.inventoryMonitor.coStopTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription12,
+      measurement: '',
       units: localization.common.num,
-      nameEn: 'dirty pages',
-      testId: 'counters-table-memory-dirty-pages-item',
+      nameEn: 'costop',
+      testId: 'counters-table-vm-cpu-costop-item',
+    },
+    {
+      id: 12,
+      name: localization.inventoryMonitor.throttledTime,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription13,
+      measurement: '',
+      units: localization.inventoryMonitor.mhz,
+      nameEn: 'maxlimited',
+      testId: 'counters-table-vm-cpu-maxlimited-item',
+    },
+    {
+      id: 13,
+      name: localization.inventoryMonitor.cpuLatency,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription14,
+      measurement: '',
+      units: localization.common.ms,
+      nameEn: 'cpuLatency',
+      testId: 'counters-table-vm-cpu-cpuLatency-item',
+    },
+    {
+      id: 14,
+      name: localization.inventoryMonitor.swapWait,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription15,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'swapwait',
+      testId: 'counters-table-vm-cpu-swapwait-item',
+    },
+    {
+      id: 15,
+      name: localization.inventoryMonitor.hypervisorOverlap,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription16,
+      measurement: '',
+      units: localization.inventoryMonitor.ticks,
+      nameEn: 'overlap',
+      testId: 'counters-table-vm-cpu-overlap-item',
     },
+    {
+      id: 16,
+      name: localization.inventoryMonitor.cpuDemand,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription17,
+      measurement: '',
+      units: localization.common.mhz,
+      nameEn: 'demand',
+      testId: 'counters-table-vm-cpu-demand-item',
+    },
+    {
+      id: 17,
+      name: localization.inventoryMonitor.cpuEntitlement,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription18,
+      measurement: '',
+      units: localization.common.mhz,
+      nameEn: 'cpuEntitlement',
+      testId: 'counters-table-vm-cpu-cpuEntitlement-item',
+    },
+    {
+      id: 18,
+      name: localization.inventoryMonitor.numaNode,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription19,
+      measurement: '',
+      units: '-',
+      nameEn: 'numaNode',
+      testId: 'counters-table-vm-cpu-numaNode-item',
+    },
+    {
+      id: 19,
+      name: localization.inventoryMonitor.affinityViolations,
+      description: localization.inventoryMonitor.chartOptionsVmCpuDescription20,
+      measurement: '',
+      units: localization.common.num,
+      nameEn: 'cpuAffinityViolations',
+      testId: 'counters-table-vm-cpu-cpuAffinityViolations-item',
+    },
+    // New Update End
+  ]
+  const memory: UI_I_AdvancedCounterItem[] = [
+    // {
+    //   id: 0,
+    //   name: localization.inventoryMonitor.memorySizeMb,
+    //   description: localization.inventoryMonitor.sizeAvailableMemoryInMB,
+    //   measurement: localization.inventoryMonitor.usageInMb,
+    //   units: localization.common.mb,
+    //   nameEn: 'memory size mb',
+    //   testId: 'counters-table-memory-size-mb-item',
+    // },
+    // {
+    //   id: 1,
+    //   name: localization.inventoryMonitor.memoryUsedMb,
+    //   description: localization.inventoryMonitor.usedMemoryInMB,
+    //   measurement: localization.inventoryMonitor.usageInMb,
+    //   units: localization.common.mb,
+    //   nameEn: 'memory used mb',
+    //   testId: 'counters-table-memory-used-mb-item',
+    // },
+    // {
+    //   id: 2,
+    //   name: localization.inventoryMonitor.sharedPages,
+    //   description: localization.inventoryMonitor.sharedPagesDesc,
+    //   measurement: localization.common.num,
+    //   units: localization.common.num,
+    //   nameEn: 'shared pages',
+    //   testId: 'counters-table-memory-shared-pages-item',
+    // },
+    // {
+    //   id: 3,
+    //   name: localization.common.text,
+    //   description: localization.inventoryMonitor.textDesc,
+    //   measurement: localization.common.num,
+    //   units: localization.common.num,
+    //   nameEn: 'text',
+    //   testId: 'counters-table-memory-text-item',
+    // },
+    // {
+    //   id: 4,
+    //   name: localization.inventoryMonitor.library,
+    //   description: localization.inventoryMonitor.libraryDesc,
+    //   measurement: localization.common.kb,
+    //   units: localization.common.kb,
+    //   nameEn: 'library',
+    //   testId: 'counters-table-memory-library-item',
+    // },
+    // {
+    //   id: 5,
+    //   name: localization.inventoryMonitor.dataStack,
+    //   description: localization.inventoryMonitor.dataStackDesc,
+    //   measurement: localization.common.num,
+    //   units: localization.common.num,
+    //   nameEn: 'data stack',
+    //   testId: 'counters-table-memory-data-stack-item',
+    // },
+    // {
+    //   id: 6,
+    //   name: localization.inventoryMonitor.modifiedPages,
+    //   description: localization.inventoryMonitor.dirtyPagesDesc,
+    //   measurement: localization.common.num,
+    //   units: localization.common.num,
+    //   nameEn: 'dirty pages',
+    //   testId: 'counters-table-memory-dirty-pages-item',
+    // },
+
     // {
     //   id: 0,
     //   name: localization.inventoryMonitor.memoryLimitMb2,
@@ -1269,6 +2362,279 @@ const vmItemsFunc = (
     //   nameEn: 'memory resident set size mb',
     //   testId: 'counters-table-memory-resident-set-size-mb-item',
     // },
+
+    // New Update Start
+    {
+      id: 0,
+      name: localization.inventoryMonitor.virtualMemory,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription1,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memory size mb',
+      testId: 'counters-table-vm-memory-memory-size-mb-item',
+    },
+    {
+      id: 1,
+      name: localization.inventoryMonitor.physicalMemoryRss,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription2,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memory used mb',
+      testId: 'counters-table-vm-memory-memory-used-mb-item',
+    },
+    {
+      id: 2,
+      name: localization.inventoryMonitor.sharedPages2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription3,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'sharedPages',
+      testId: 'counters-table-vm-memory-sharedPages-item',
+    },
+    {
+      id: 3,
+      name: localization.inventoryMonitor.codeSegment,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription4,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'text',
+      testId: 'counters-table-vm-memory-text-item',
+    },
+    {
+      id: 4,
+      name: localization.inventoryMonitor.sharedLibraries,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription5,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'library',
+      testId: 'counters-table-vm-memory-library-item',
+    },
+    {
+      id: 5,
+      name: localization.inventoryMonitor.dataStack2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription6,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'dataStack',
+      testId: 'counters-table-vm-memory-dataStack-item',
+    },
+    {
+      id: 6,
+      name: localization.inventoryMonitor.dirtyPages2,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription7,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'dirtyPages',
+      testId: 'counters-table-vm-memory-dirtyPages-item',
+    },
+    {
+      id: 7,
+      name: localization.inventoryMonitor.balloonCurrent,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription8,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'balloonCurrent',
+      testId: 'counters-table-vm-memory-balloonCurrent-item',
+    },
+    {
+      id: 8,
+      name: localization.inventoryMonitor.balloonMax,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription9,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'balloonMaximum',
+      testId: 'counters-table-vm-memory-balloonMaximum-item',
+    },
+    {
+      id: 9,
+      name: localization.inventoryMonitor.balloonRss,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription10,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'balloonRss',
+      testId: 'counters-table-vm-memory-balloonRss-item',
+    },
+    {
+      id: 10,
+      name: localization.inventoryMonitor.vmSwap,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription11,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'vmSwap',
+      testId: 'counters-table-vm-memory-vmSwap-item',
+    },
+    {
+      id: 11,
+      name: localization.inventoryMonitor.peakVirtualMemory,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription12,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'vmPeak',
+      testId: 'counters-table-vm-memory-vmPeak-item',
+    },
+    {
+      id: 12,
+      name: localization.inventoryMonitor.peakPhysicalMemory,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription13,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'vmHwm',
+      testId: 'counters-table-vm-memory-vmHwm-item',
+    },
+    {
+      id: 13,
+      name: localization.inventoryMonitor.memoryConsumed,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription14,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memConsumed',
+      testId: 'counters-table-vm-memory-memConsumed-item',
+    },
+    {
+      id: 14,
+      name: localization.inventoryMonitor.memoryOverhead,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription15,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memOverhead',
+      testId: 'counters-table-vm-memory-memOverhead-item',
+    },
+    {
+      id: 15,
+      name: localization.inventoryMonitor.memoryGranted,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription16,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memGranted',
+      testId: 'counters-table-vm-memory-memGranted-item',
+    },
+    {
+      id: 16,
+      name: localization.inventoryMonitor.activeMemory,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription17,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memActive',
+      testId: 'counters-table-vm-memory-memActive-item',
+    },
+    {
+      id: 17,
+      name: localization.inventoryMonitor.activeWriteMemory,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription18,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memActivewrite',
+      testId: 'counters-table-vm-memory-memActivewrite-item',
+    },
+    {
+      id: 18,
+      name: localization.inventoryMonitor.compressedMemory,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription19,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memCompressed',
+      testId: 'counters-table-vm-memory-memCompressed-item',
+    },
+    {
+      id: 19,
+      name: localization.inventoryMonitor.compressionRate,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription20,
+      measurement: '',
+      units: '%',
+      nameEn: 'memCompressionRate',
+      testId: 'counters-table-vm-memory-memCompressionRate-item',
+    },
+    {
+      id: 20,
+      name: localization.inventoryMonitor.memorySwapped,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription21,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memSwapped',
+      testId: 'counters-table-vm-memory-memSwapped-item',
+    },
+    {
+      id: 21,
+      name: localization.inventoryMonitor.swapInRate,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription22,
+      measurement: '',
+      units: localization.inventoryMonitor.kbs,
+      nameEn: 'memSwapInRate',
+      testId: 'counters-table-vm-memory-memSwapInRate-item',
+    },
+    {
+      id: 22,
+      name: localization.inventoryMonitor.swapOutRate,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription23,
+      measurement: '',
+      units: localization.inventoryMonitor.kbs,
+      nameEn: 'memSwapOutRate',
+      testId: 'counters-table-vm-memory-memSwapOutRate-item',
+    },
+    {
+      id: 23,
+      name: localization.inventoryMonitor.memoryLatency,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription24,
+      measurement: '',
+      units: localization.common.faults,
+      nameEn: 'memLatency',
+      testId: 'counters-table-vm-memory-memLatency-item',
+    },
+    {
+      id: 24,
+      name: localization.inventoryMonitor.memoryEntitlement,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription25,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memEntitlement',
+      testId: 'counters-table-vm-memory-memEntitlement-item',
+    },
+    {
+      id: 25,
+      name: localization.inventoryMonitor.numaLocalRatio,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription26,
+      measurement: '',
+      units: '%',
+      nameEn: 'memNumaLocalRatio',
+      testId: 'counters-table-vm-memory-memNumaLocalRatio-item',
+    },
+    {
+      id: 26,
+      name: localization.inventoryMonitor.numaLocalRatio,
+      description:
+        localization.inventoryMonitor.chartOptionsVmMemoryDescription27,
+      measurement: '',
+      units: localization.common.kb,
+      nameEn: 'memLlSwapUsed',
+      testId: 'counters-table-vm-memory-memLlSwapUsed-item',
+    },
+    // New Update End
   ]
   const datastore: UI_I_AdvancedCounterItem[] = [
     {
@@ -1316,22 +2682,52 @@ export const countersItemsFunc = (
   type: UI_T_AdvancedType,
   chart: UI_T_ChartHost | UI_T_ChartVm,
   localization: UI_I_Localization,
-  _totalCores: number
+  project: UI_T_Project,
+  powerData: UI_I_AdvancedCounterItem[],
+  temperatureData: UI_I_AdvancedCounterItem[]
 ): UI_I_AdvancedCounterItem[] => {
   let result: UI_I_AdvancedCounterItem[] = []
 
   switch (type) {
     case 'zone':
-      result = hostItemsFunc(chart, localization, type)
+      result = hostItemsFunc(
+        chart,
+        localization,
+        type,
+        project,
+        powerData,
+        temperatureData
+      )
       break
     case 'datacenter':
-      result = hostItemsFunc(chart, localization, type)
+      result = hostItemsFunc(
+        chart,
+        localization,
+        type,
+        project,
+        powerData,
+        temperatureData
+      )
       break
     case 'cluster':
-      result = hostItemsFunc(chart, localization, type)
+      result = hostItemsFunc(
+        chart,
+        localization,
+        type,
+        project,
+        powerData,
+        temperatureData
+      )
       break
     case 'host':
-      result = hostItemsFunc(chart, localization, type)
+      result = hostItemsFunc(
+        chart,
+        localization,
+        type,
+        project,
+        powerData,
+        temperatureData
+      )
       break
     case 'vm':
       result = vmItemsFunc(chart, localization)
@@ -1342,42 +2738,54 @@ export const countersItemsFunc = (
 }
 
 export const getDefaultMetricName = (type: string, view: string): string => {
-  const someNames = ['memory', 'disk', 'network']
+  const someNames = [
+    'memory',
+    'disk',
+    'network',
+    'nfs',
+    'services',
+    'power',
+    'temperature',
+  ]
 
   if (type === 'datacenter') return 'cpu'
   else if (view === 'cpuUsageInPercent') return 'cpu'
+  else if (view === 'hyperConvergedInfrastructure') return 'hci'
   else if (someNames.includes(view)) return view
 
   return ''
 }
 
-export const getDefaultCounters = (
-  type: string,
-  view: string
-): UI_I_AdvancedCounterItem[] => {
-  switch (type) {
-    case 'datacenter':
-      return [hostItemsFunc('cpu', {})[0]]
-    case 'host':
-      switch (view) {
-        case 'cpuUsageInPercent':
-          return hostItemsFunc('cpu', {}).splice(0, 2)
-        case 'disk':
-          return hostItemsFunc('disk', {}).filter((_, key) =>
-            [0, 14].includes(key)
-          )
-        case 'memory':
-          return hostItemsFunc('memory', {})
-        case 'network':
-          return hostItemsFunc('network', {}).splice(1, 3)
-      }
-      break
-    case 'vm':
-      switch (view) {
-        case 'cpuUsageInPercent':
-          return []
-      }
-  }
-
-  return []
-}
+// export const getDefaultCounters = (
+//   type: string,
+//   view: string,
+//   project?: UI_T_Project
+// ): UI_I_AdvancedCounterItem[] => {
+//   switch (type) {
+//     case 'datacenter':
+//       return [hostItemsFunc('cpu', {})[0]]
+//     case 'host':
+//       switch (view) {
+//         case 'cpuUsageInPercent':
+//           return hostItemsFunc('cpu', {}).splice(0, 2)
+//         case 'disk':
+//           return hostItemsFunc('disk', {}).filter((_, key) =>
+//             [0, 14].includes(key)
+//           )
+//         case 'memory':
+//           return hostItemsFunc('memory', {})
+//         case 'network':
+//           return hostItemsFunc('network', {}).splice(1, 3)
+//         case 'services':
+//           return hostItemsFunc('services', {}, '', project)
+//       }
+//       break
+//     case 'vm':
+//       switch (view) {
+//         case 'cpuUsageInPercent':
+//           return []
+//       }
+//   }
+//
+//   return []
+// }