bfg-common 1.4.192 → 1.4.194

package/assets/localization/local_be.json

@@ -2058,7 +2058,7 @@
     "confirmRemoveVmFromInventory": "Remove the selected virtual machine from the inventory?",
     "integration": "Інтэграцыя",
     "zabbix": "Zabbix",
-    "loginZabbixAccount": "Увайдзіце на сервер Zabbix",
+    "loginZabbixAccount": "Увайдзіце на Сервер Zabbix",
     "newView": "Новы выгляд",
     "viewDesc": "Выберыце прагляд, які будзе выкарыстоўвацца кліентам {trademark}",
     "kindValidationDescription": "Няправільны тып запісу",
@@ -2534,7 +2534,22 @@
     "timeRangeShouldNotBeMoreThanMonth": "Указаны дыяпазон часу несапраўдны. Яно не павінна быць больш за 1 месяца.",
     "overview": "Агляд",
     "spaceUtilization": "Выкарыстанне прасторы",
-    "changeCustomInterval": "Зменіце карыстацкі інтэрвал"
+    "changeCustomInterval": "Зменіце карыстацкі інтэрвал",
+    "measuresInPackets": "меры ў пакетах",
+    "packets": "пакет",
+    "bytesReceived": "атрыманыя байты",
+    "amountReceivedBytes": "колькасць атрыманых байт",
+    "measuresInKb": "вымярэння ў кілабайтах",
+    "bytesTransmitted": "перадаваныя байты",
+    "amountTransmittedBytes": "колькасць перададзеных байт",
+    "receivedPacketsErrors": "памылкі ў атрыманых пакетах",
+    "amountReceivedPacketsError": "колькасць атрыманых пакетаў з памылкай",
+    "transmittedPacketsErrors": "памылкі ў перададзеных пакетах",
+    "amountTransmittedPacketsError": "колькасць перададзеных пакетаў з памылкай",
+    "receivedDroppedPackets": "прынятыя адкінутыя пакеты",
+    "amountReceivedDroppedPackets": "колькасць прынятых адкінутых пакетаў",
+    "transmittedDroppedPackets": "перададзеныя адкінутыя пакеты",
+    "amountTransmittedDroppedPackets": "колькасць перададзеных адкінутых пакетаў"
   },
   "inventoryTabs": {
     "summary": "Рэзюмэ",
@@ -2603,5 +2618,9 @@
     "tasks": "З задачамі",
     "frontReqs": "З рэгулярнымі запытамі",
     "related": "Роднасныя"
+  },
+  "zabbix": {
+    "zabbixVersions": "Zabbix версіі",
+    "zabbixVersionsDesc": "Калі ласка, абярыце версію сервера Zabbix, на якой вы хочаце ўвайсці: 5.0 або 6.0."
   }
 }

package/assets/localization/local_en.json

@@ -2061,7 +2061,7 @@
     "confirmRemoveVmFromInventory": "Remove the selected virtual machine from the inventory?",
     "integration": "Integration",
     "zabbix": "Zabbix",
-    "loginZabbixAccount": "Login to Zabbix server",
+    "loginZabbixAccount": "Login to Zabbix Server",
     "newView": "New view",
     "viewDesc": "Select view to be used by {trademark} Client",
     "kindValidationDescription": "Invalid record kind",
@@ -2538,7 +2538,22 @@
     "timeRangeShouldNotBeMoreThanMonth": "The specified time range is not valid. It should not be more than 1 month.",
     "overview": "Overview",
     "spaceUtilization": "Space Utilization",
-    "changeCustomInterval": "Change custom interval"
+    "changeCustomInterval": "Change custom interval",
+    "measuresInPackets": "measures in packets",
+    "packets": "packets",
+    "bytesReceived": "bytes received",
+    "amountReceivedBytes": "amount of received bytes",
+    "measuresInKb": "measures in KB",
+    "bytesTransmitted": "bytes transmitted",
+    "amountTransmittedBytes": "amount of transmitted bytes",
+    "receivedPacketsErrors": "received packets errors",
+    "amountReceivedPacketsError": "amount of received packets with error",
+    "transmittedPacketsErrors": "transmitted packets errors",
+    "amountTransmittedPacketsError": "amount of transmitted packets with error",
+    "receivedDroppedPackets": "received dropped packets",
+    "amountReceivedDroppedPackets": "amount of received dropped packets",
+    "transmittedDroppedPackets": "transmitted dropped packets",
+    "amountTransmittedDroppedPackets": "amount of transmitted dropped packets"
   },
   "inventoryTabs": {
     "summary": "Summary",
@@ -2607,5 +2622,9 @@
     "tasks": "With Tasks",
     "frontReqs": "With regular requests",
     "related": "Related"
+  },
+  "zabbix": {
+    "zabbixVersions": "Zabbix Versions",
+    "zabbixVersionsDesc": "Please choose the Zabbix server version you would like to log in to: 5.0 or 6.0."
   }
 }

package/assets/localization/local_hy.json

@@ -2061,7 +2061,7 @@
     "confirmRemoveVmFromInventory": "Հեռացնե՞լ ընտրված վիրտուալ մեքենան գույքագրումից:",
     "integration": "Ինտեգրում",
     "zabbix": "Zabbix",
-    "loginZabbixAccount": "Մուտք գործեք Zabbix սերվեր",
+    "loginZabbixAccount": "Մուտք գործեք Zabbix Սերվեր",
     "newView": "Նոր տեսարան",
     "viewDesc": "Ընտրեք տեսքը, որը կօգտագործվի {trademark} Client-ի կողմից",
     "kindValidationDescription": "Գրառման անվավեր տեսակ",
@@ -2538,7 +2538,22 @@
     "timeRangeShouldNotBeMoreThanMonth": "Նշված ժամանակային միջակայքը վավեր չէ: Այն չպետք է լինի 1 ամսից ավելի։",
     "overview": "Ակնարկ",
     "spaceUtilization": "Օգտագործելով տարածություն",
-    "changeCustomInterval": "Փոխեք օգտագործողի միջակայքը"
+    "changeCustomInterval": "Փոխեք օգտագործողի միջակայքը",
+    "measuresInPackets": "միջոցառումներ փաթեթներում",
+    "packets": "փաթեթներ",
+    "bytesReceived": "ստացված բայթ",
+    "amountReceivedBytes": "ստացված բայթերի քանակը",
+    "measuresInKb": "չափումներ կիլոբայթով",
+    "bytesTransmitted": "փոխանցվող բայթ",
+    "amountTransmittedBytes": "փոխանցված բայթերի քանակը",
+    "receivedPacketsErrors": "ստացված փաթեթների սխալները",
+    "amountReceivedPacketsError": "ստացված փաթեթների քանակը սխալով",
+    "transmittedPacketsErrors": "սխալները փոխանցված փաթեթներում",
+    "amountTransmittedPacketsError": "սխալ փոխանցված փաթեթների քանակը",
+    "receivedDroppedPackets": "ընդունված մերժված փաթեթներ",
+    "amountReceivedDroppedPackets": "ընդունված մերժված փաթեթների քանակը",
+    "transmittedDroppedPackets": "փոխանցված դեն նետված փաթեթներ",
+    "amountTransmittedDroppedPackets": "փոխանցված մերժված փաթեթների քանակը"
   },
   "inventoryTabs": {
     "summary": "Ամփոփում",
@@ -2607,5 +2622,9 @@
     "tasks": "Առաջադրանքներով",
     "frontReqs": "Կանոնավոր խնդրանքներով",
     "related": "Առնչվող"
+  },
+  "zabbix": {
+    "zabbixVersions": "Zabbix տարբերակները",
+    "zabbixVersionsDesc": "Խնդրում ենք ընտրել Zabbix սերվերի տարբերակը, որում ցանկանում եք մուտք գործել՝ 5.0 կամ 6.0:"
   }
 }

package/assets/localization/local_kk.json

@@ -2060,7 +2060,7 @@
     "confirmRemoveVmFromInventory": "Таңдалған виртуалды машинаны түгендеуден жою керек пе?",
     "integration": "Интеграция",
     "zabbix": "Zabbix",
-    "loginZabbixAccount": "Zabbix серверіне кіріңіз",
+    "loginZabbixAccount": "Zabbix Серверіне кіріңіз",
     "newView": "Жаңа көрініс",
     "viewDesc": "{trademark} Client пайдаланатын көріністі таңдаңыз",
     "kindValidationDescription": "Жарамсыз жазба түрі",
@@ -2537,7 +2537,22 @@
     "timeRangeShouldNotBeMoreThanMonth": "Көрсетілген уақыт аралығы жарамсыз. 1 айдан аспауы керек.",
     "overview": "Шолу",
     "spaceUtilization": "Кеңістікті пайдалану",
-    "changeCustomInterval": "Пайдаланушы аралығын өзгертіңіз"
+    "changeCustomInterval": "Пайдаланушы аралығын өзгертіңіз",
+    "measuresInPackets": "пакеттердегі шаралар",
+    "packets": "пакеттер",
+    "bytesReceived": "байттар алынды",
+    "amountReceivedBytes": "алынған байт мөлшері",
+    "measuresInKb": "КБ-дағы шаралар",
+    "bytesTransmitted": "берілген байттар",
+    "amountTransmittedBytes": "берілетін байт мөлшері",
+    "receivedPacketsErrors": "алынған пакеттер қателері",
+    "amountReceivedPacketsError": "қатемен алынған пакеттер саны",
+    "transmittedPacketsErrors": "жіберілген пакеттер қателері",
+    "amountTransmittedPacketsError": "қате жіберілген пакеттердің саны",
+    "receivedDroppedPackets": "тасталған пакеттер алынды",
+    "amountReceivedDroppedPackets": "түскен пакеттердің саны",
+    "transmittedDroppedPackets": "жіберілген пакеттер",
+    "amountTransmittedDroppedPackets": "жіберілген пакеттердің саны"
   },
   "inventoryTabs": {
     "summary": "Түйіндеме",
@@ -2606,5 +2621,9 @@
     "tasks": "Тапсырмалармен",
     "frontReqs": "Тұрақты сұраныстармен",
     "related": "Қатысты"
+  },
+  "zabbix": {
+    "zabbixVersions": "Zabbix нұсқалары",
+    "zabbixVersionsDesc": "Жүйеге кіргіңіз келетін Zabbix сервер нұсқасын таңдаңыз: 5.0 немесе 6.0."
   }
 }

package/assets/localization/local_ru.json

@@ -2063,7 +2063,7 @@
     "confirmRemoveVmFromInventory": "Удалить выбранную виртуальную машину из инвентаря?",
     "integration": "Интеграция",
     "zabbix": "Zabbix",
-    "loginZabbixAccount": "Вход на сервер Zabbix",
+    "loginZabbixAccount": "Вход на Сервер Zabbix",
     "newView": "Новый вид",
     "viewDesc": "Выберите представление, которое будет использоваться клиентом {trademark}.",
     "kindValidationDescription": "Неверный тип записи",
@@ -2540,7 +2540,22 @@
     "timeRangeShouldNotBeMoreThanMonth": "Указанный диапазон времени недействителен. Он не должен быть больше 1 месяца.",
     "overview": "Обзор",
     "spaceUtilization": "Использование пространства",
-    "changeCustomInterval": "Измените пользовательский интервал"
+    "changeCustomInterval": "Измените пользовательский интервал",
+    "measuresInPackets": "меры в пакетах",
+    "packets": "пакеты",
+    "bytesReceived": "полученные байты",
+    "amountReceivedBytes": "количество полученных байт",
+    "measuresInKb": "измерения в килобайтах",
+    "bytesTransmitted": "передаваемые байты",
+    "amountTransmittedBytes": "количество переданных байт",
+    "receivedPacketsErrors": "ошибки в полученных пакетах",
+    "amountReceivedPacketsError": "количество полученных пакетов с ошибкой",
+    "transmittedPacketsErrors": "ошибки в переданных пакетах",
+    "amountTransmittedPacketsError": "количество переданных пакетов с ошибкой",
+    "receivedDroppedPackets": "принятые отброшенные пакеты",
+    "amountReceivedDroppedPackets": "количество принятых отброшенных пакетов",
+    "transmittedDroppedPackets": "переданные отброшенные пакеты",
+    "amountTransmittedDroppedPackets": "количество переданных отброшенных пакетов"
   },
   "inventoryTabs": {
     "summary": "Сводка",
@@ -2609,5 +2624,9 @@
     "tasks": "C Тасками",
     "frontReqs": "C регулярными запросамы",
     "related": "Связанный"
+  },
+  "zabbix": {
+    "zabbixVersions": "Версии Забфикса",
+    "zabbixVersionsDesc": "Пожалуйста, выберите версию сервера Zabbix, на которую вы хотите войти: 5.0 или 6.0."
   }
 }

package/assets/localization/local_zh.json

@@ -2536,7 +2536,22 @@
     "timeRangeShouldNotBeMoreThanMonth": "指定的时间范围无效。它不应超过 1 个月。",
     "overview": "概述",
     "spaceUtilization": "空间利用",
-    "changeCustomInterval": "更改自定义间隔"
+    "changeCustomInterval": "更改自定义间隔",
+    "measuresInPackets": "数据包中的措施",
+    "packets": "数据包",
+    "bytesReceived": "已接收字节数",
+    "amountReceivedBytes": "接收字节数",
+    "measuresInKb": "单位：KB",
+    "bytesTransmitted": "已传输的字节数",
+    "amountTransmittedBytes": "传输的字节数",
+    "receivedPacketsErrors": "接收数据包错误",
+    "amountReceivedPacketsError": "接收的错误数据包数量",
+    "transmittedPacketsErrors": "传输数据包错误",
+    "amountTransmittedPacketsError": "传输的错误数据包数量",
+    "receivedDroppedPackets": "接收到丢弃的数据包",
+    "amountReceivedDroppedPackets": "收到的丢弃数据包数量",
+    "transmittedDroppedPackets": "传输丢失的数据包",
+    "amountTransmittedDroppedPackets": "传输的丢包数量"
   },
   "inventoryTabs": {
     "summary": "概括",
@@ -2605,5 +2620,9 @@
     "tasks": "有任务",
     "frontReqs": "定期提出要求",
     "related": "有关的"
+  },
+  "zabbix": {
+    "zabbixVersions": "Zabbix 版本",
+    "zabbixVersionsDesc": "请选择您要登录的Zabbix服务器版本：5.0或6.0。"
   }
 }

package/assets/scss/common/icons/icons-2.scss

@@ -224,6 +224,7 @@
 .icon-vSphere-dsIsoImage,
 .icon-vSphere-dsFile,
 .vsphere-icon-dv-switch,
+.vx-icon-import,
 .host-ui-icon-shutdown,
 .host-ui-icon-standby,
 .host-ui-icon-poweron,

package/components/common/monitor/advanced/tools/chartOptionsModal/ChartOptionsModal.vue

@@ -272,9 +272,21 @@ const localSelectedObjects = ref<string>('')
 
 const currentFieldsByArray = (data: UI_I_AdvancedCounterItem[]): string => {
   const result: string[] = []
+
   data.forEach((item) => {
-    result.push(item.nameEn)
+    if (props.type === 'vm' && selectedMetric.value === 'network') {
+      const currentFields = []
+      const objectArray = localSelectedObjects.value.split(', ')
+      if (objectArray.length) {
+        objectArray.forEach((item2) => {
+          currentFields.push(`${item.nameEn} ${item2}`)
+        })
+      } else currentFields.push(item.nameEn)
+
+      result.push(currentFields.join(', '))
+    } else result.push(item.nameEn)
   })
+
   return result.join(',')
 }
 

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

@@ -12,8 +12,7 @@ import type { UI_I_Localization } from '~/lib/models/interfaces'
 
 const hostItemsFunc = (
   chart: UI_T_ChartHost,
-  localization: UI_I_Localization,
-  totalCores: number
+  localization: UI_I_Localization
 ): UI_I_AdvancedCounterItem[] => {
   const cpu: UI_I_AdvancedCounterItem[] = [
     {
@@ -401,7 +400,8 @@ const hostItemsFunc = (
     {
       id: 8,
       name: localization.inventoryMonitor.writeRate,
-      description: localization.inventoryMonitor.averageNumberKilobytesWrittenDisk,
+      description:
+        localization.inventoryMonitor.averageNumberKilobytesWrittenDisk,
       measurement: localization.common.write,
       units: localization.inventoryMonitor.kBps,
       nameEn: 'write rate',
@@ -428,7 +428,8 @@ const hostItemsFunc = (
     {
       id: 11,
       name: localization.inventoryMonitor.queueCommandLatency,
-      description: localization.inventoryMonitor.averageAmountTimeSpentVMKernelQueue,
+      description:
+        localization.inventoryMonitor.averageAmountTimeSpentVMKernelQueue,
       measurement: localization.inventoryMonitor.queueLatency,
       units: localization.common.ms,
       nameEn: 'queue command latency',
@@ -529,8 +530,8 @@ const vmItemsFunc = (
       id: 0,
       name: localization.inventoryMonitor.packetsReceived,
       description: localization.inventoryMonitor.amountReceivedPackets,
-      measurement: localization.inventoryMonitor.usageInKb,
-      units: localization.common.kb,
+      measurement: localization.inventoryMonitor.measuresInPackets,
+      units: localization.inventoryMonitor.packets,
       nameEn: 'packets received',
       testId: 'counters-table-packets-received-item',
     },
@@ -538,11 +539,66 @@ const vmItemsFunc = (
       id: 1,
       name: localization.inventoryMonitor.packetsTransmitted,
       description: localization.inventoryMonitor.amountTransmittedPackets,
-      measurement: localization.inventoryMonitor.usageInKb,
-      units: localization.common.kb,
+      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',
+    },
   ]
   const cpu: UI_I_AdvancedCounterItem[] = [
     {
@@ -696,7 +752,8 @@ const vmItemsFunc = (
     {
       id: 2,
       name: localization.inventoryMonitor.storageProvisionedSpaceMb,
-      description: localization.inventoryMonitor.amountProvisionedStorageSpaceInMB,
+      description:
+        localization.inventoryMonitor.amountProvisionedStorageSpaceInMB,
       measurement: localization.inventoryMonitor.usageInMb,
       units: localization.common.mb,
       nameEn: 'storage provisioned space mb',

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/timespan/object/Object.vue

@@ -63,9 +63,15 @@ const emits = defineEmits<{
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
-const tableType = computed<UI_T_DataGridType>(() =>
-  ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
-)
+const tableType = computed<UI_T_DataGridType>(() => {
+  let result = 'checkbox'
+
+  if (props.type === 'host') {
+    result = ['disk', 'network'].includes(props.chart) ? 'radio' : 'checkbox'
+  }
+
+  return result
+})
 
 const selectedRow = ref<number[] | number>([])
 const pagination = ref<UI_I_Pagination>({
@@ -163,6 +169,8 @@ watch(
       newItems = [...newItems, ...props.currentItems]
 
       items = newItems
+    } else if (newValue[0] === 'vm' && newValue[1] === 'network') {
+      items = [...props.currentItems]
     }
 
     bodyItems.value = table.bodyItems(items)
@@ -175,18 +183,36 @@ watch(
   (newValue) => {
     const selectedItems: string[] = []
 
-    if (['disk', 'network'].includes(props.chart)) {
+    if (props.type === 'host' && ['disk', 'network'].includes(props.chart)) {
       selectedItems.push(items[newValue]?.target_object)
+    } else if (props.type === 'vm' && ['network'].includes(props.chart)) {
+      newValue.forEach((key) => {
+        selectedItems.push(items[key].target_object)
+      })
     } else
       newValue.forEach((key) => {
         selectedItems.push(items[key].id)
       })
 
-    const selectedNames =
+    let selectedNames = ''
+
+    if (
       items.length === newValue.length &&
       props.selectedMetricsKeys.length === props.totalMetricItems
-        ? '*'
-        : selectedItems.join(', ')
+    ) {
+      selectedNames = '*'
+
+      if (props.type === 'vm') selectedNames = 'total'
+    } else selectedNames = selectedItems.join(', ')
+
+    if (props.type === 'vm' && ['network'].includes(props.chart)) {
+      if (
+        selectedItems.includes('total') ||
+        (!selectedItems.includes('total') &&
+          items.length === newValue.length + 1)
+      )
+        selectedNames = 'total'
+    }
 
     emits('select-objects', selectedNames)
   },

package/lib/models/interfaces.ts

@@ -35,6 +35,7 @@ export interface UI_I_Localization {
   scheduledTasks: UI_I_ArbitraryObject<string>
   license: UI_I_ArbitraryObject<string>
   events: UI_I_ArbitraryObject<string>
+  zabbix: UI_I_ArbitraryObject<string>
 }
 export interface UI_I_SendTaskParams {
   method: string

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.4.192",
+  "version": "1.4.194",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",