bfg-common 1.6.86 → 1.6.87

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

@@ -153,18 +153,18 @@ watch(
           })
         }
       }
-      if (newValue[4].includes(3)) {
-        items.push({
-          id: 'totalMHz',
-          target_object: 'totalMHz',
-        })
-      }
-      if (newValue[4].includes(4)) {
-        items.push({
-          id: 'averageMHz',
-          target_object: 'averageMHz',
-        })
-      }
+      // if (newValue[4].includes(3)) {
+      //   items.push({
+      //     id: 'totalMHz',
+      //     target_object: 'totalMHz',
+      //   })
+      // }
+      // if (newValue[4].includes(4)) {
+      //   items.push({
+      //     id: 'averageMHz',
+      //     target_object: 'averageMHz',
+      //   })
+      // }
     } else if (
       newValue[0] === 'host' &&
       ['disk', 'network'].includes(newValue[1])

package/components/common/monitor/advanced/tools/chartOptionsModal/lib/config/index.ts

@@ -1,4 +1,6 @@
 export const allowedHostCpuFieldNotObject = [
+  'totalMHz',
+  'averageMHz',
   'cpu ready',
   'cpu demand',
   'cpu contention avg10',

package/components/common/monitor/advanced/tools/chartOptionsModal/lib/utils/checkSubmit.ts

@@ -37,9 +37,10 @@ export const checkIsDisabledSubmit = (
         }
       }
     }
-  } else if (type === 'vm') {
-    if (selectedMetric === 'network' && !localSelectedObjects) result = true
   }
+  // else if (type === 'vm') {
+  // if (selectedMetric === 'network' && !localSelectedObjects) result = true
+  // }
 
   return result
 }

package/components/common/monitor/lib/utils/local_be.json

@@ -698,5 +698,17 @@
   "capacityMHz": "Агульная магутнасць працэсара",
   "consumedMHz": "Спажываная магутнасць працэсара",
   "usagePercent": "Выкарыстанне працэсара",
-  "totalCores": "Усяго ядзер працэсара"
+  "totalCores": "Усяго ядзер працэсара",
+  "cpuUsgFor": "Выкарыстанне CPU для {}",
+  "memRSSFor": "Памяць RSS для {}",
+  "diskReadRateFor": "Хуткасць чытання з дыска для {}",
+  "diskWriteRateFor": "Хуткасць запісу на дыск для {}",
+  "hci_osd_utilization": "Выкарыстанне OSD",
+  "hci_osd_network": "Сетка OSD",
+  "hci_osd_cpu": "CPU OSD",
+  "hci_osd_iops": "IOPS OSD",
+  "osdUtilization": "Выкарыстанне OSD {}",
+  "totalIOPSfor": "Агульная колькасць IOPS для {}",
+  "cpuUsgOfProc": "Выкарыстанне CPU працэса {}",
+  "dataThroughputFor": "Прапускная здольнасць даных ({}) для {}"
 }

package/components/common/monitor/lib/utils/local_en.json

@@ -698,5 +698,17 @@
   "capacityMHz": "Total CPU capacity",
   "consumedMHz": "Consumed CPU capacity",
   "usagePercent": "CPU usage",
-  "totalCores": "Total CPU cores"
+  "totalCores": "Total CPU cores",
+  "cpuUsgFor": "CPU usage for {}",
+  "memRSSFor": "Memory RSS for {}",
+  "diskReadRateFor": "Disk read rate for {}",
+  "diskWriteRateFor": "Disk write rate for {}",
+  "hci_osd_utilization": "OSD Utilization",
+  "hci_osd_network": "OSD Network",
+  "hci_osd_cpu": "OSD CPU",
+  "hci_osd_iops": "OSD IOPS",
+  "osdUtilization": "OSD {} utilization",
+  "totalIOPSfor": "Total IOPS for {}",
+  "cpuUsgOfProc": "CPU usage of process {}",
+  "dataThroughputFor": "Data throughput ({}) for {}"
 }

package/components/common/monitor/lib/utils/local_hy.json

@@ -698,5 +698,17 @@
   "capacityMHz": "Պրոցեսորի ընդհանուր հզորությունը",
   "consumedMHz": "Սպառված պրոցեսորի հզորությունը",
   "usagePercent": "Պրոցեսորի օգտագործումը",
-  "totalCores": "Պրոցեսորի միջուկների ընդհանուր քանակը"
+  "totalCores": "Պրոցեսորի միջուկների ընդհանուր քանակը",
+  "cpuUsgFor": "CPU-ի օգտագործումը {} -ի համար",
+  "memRSSFor": "RSS հիշողությունը {} -ի համար",
+  "diskReadRateFor": "Սկավառակից ընթերցման արագությունը {} -ի համար",
+  "diskWriteRateFor": "Սկավառակի վրա գրման արագությունը {} -ի համար",
+  "hci_osd_utilization": "OSD-ի օգտագործում",
+  "hci_osd_network": "OSD ցանց",
+  "hci_osd_cpu": "OSD CPU",
+  "hci_osd_iops": "OSD IOPS",
+  "osdUtilization": "OSD {} -ի օգտագործում",
+  "totalIOPSfor": "IOPS-ների ընդհանուր քանակը {} -ի համար",
+  "cpuUsgOfProc": "{} գործընթացի CPU-ի օգտագործումը",
+  "dataThroughputFor": "Տվյալների թողունակությունը ({}) {} -ի համար"
 }

package/components/common/monitor/lib/utils/local_kk.json

@@ -698,5 +698,17 @@
   "capacityMHz": "Процессордың жалпы қуаты",
   "consumedMHz": "Тұтынылған процессор қуаты",
   "usagePercent": "Процессорды пайдалану",
-  "totalCores": "Процессор ядроларының жалпы саны"
+  "totalCores": "Процессор ядроларының жалпы саны",
+  "cpuUsgFor": "{} үшін CPU пайдалану",
+  "memRSSFor": "{} үшін RSS жады",
+  "diskReadRateFor": "{} үшін дискіден оқу жылдамдығы",
+  "diskWriteRateFor": "{} үшін дискіге жазу жылдамдығы",
+  "hci_osd_utilization": "OSD пайдалану",
+  "hci_osd_network": "OSD желісі",
+  "hci_osd_cpu": "OSD CPU",
+  "hci_osd_iops": "OSD IOPS",
+  "osdUtilization": "OSD {} пайдалану",
+  "totalIOPSfor": "{} үшін жалпы IOPS",
+  "cpuUsgOfProc": "{} процесінің CPU пайдалануы",
+  "dataThroughputFor": "{} үшін деректер өткізу қабілеті ({})"
 }

package/components/common/monitor/lib/utils/local_ru.json

@@ -698,5 +698,17 @@
   "capacityMHz": "Общая мощность ЦПУ",
   "consumedMHz": "Используемая мощность ЦПУ",
   "usagePercent": "Загрузка ЦПУ",
-  "totalCores": "Общее количество ядер ЦПУ"
+  "totalCores": "Общее количество ядер ЦПУ",
+  "cpuUsgFor": "Использование CPU для {}",
+  "memRSSFor": "Использование памяти RSS для {}",
+  "diskReadRateFor": "Скорость чтения с диска для {}",
+  "diskWriteRateFor": "Скорость записи на диск для {}",
+  "hci_osd_utilization": "Использование OSD",
+  "hci_osd_network": "Сеть OSD",
+  "hci_osd_cpu": "ЦП OSD",
+  "hci_osd_iops": "Операции ввода-вывода OSD",
+  "osdUtilization": "Использование OSD {}",
+  "totalIOPSfor": "Общее количество операций ввода-вывода для {}",
+  "cpuUsgOfProc": "Использование CPU процессом {}",
+  "dataThroughputFor": "Пропускная способность данных ({}) для {}"
 }

package/components/common/monitor/lib/utils/local_zh.json

@@ -698,5 +698,17 @@
   "capacityMHz": "总 CPU 容量",
   "consumedMHz": "已消耗 CPU 容量",
   "usagePercent": "CPU 使用率",
-  "totalCores": "CPU 核心总数"
+  "totalCores": "CPU 核心总数",
+  "cpuUsgFor": "{} 的 CPU 使用率",
+  "memRSSFor": "{} 的内存 RSS",
+  "diskReadRateFor": "{} 的磁盘读取速率",
+  "diskWriteRateFor": "{} 的磁盘写入速率",
+  "hci_osd_utilization": "OSD 使用率",
+  "hci_osd_network": "OSD 网络",
+  "hci_osd_cpu": "OSD CPU",
+  "hci_osd_iops": "OSD IOPS",
+  "osdUtilization": "OSD {} 使用率",
+  "totalIOPSfor": "{} 的总 IOPS",
+  "cpuUsgOfProc": "进程 {} 的 CPU 使用率",
+  "dataThroughputFor": "{} 的数据吞吐量 ({})"
 }

package/components/common/monitor/utilization/lib/models/enums.ts

@@ -1,4 +1,4 @@
-export enum UI_E_UtilizationBlockCurrentKeys {
-  cpuUtilization = 'hostCpu',
-  hostMemoryUtilization = 'hostMem',
-}
+export enum UI_E_UtilizationBlockCurrentKeys {
+  cpuUtilization = 'hostCpu',
+  hostMemoryUtilization = 'hostMem',
+}

package/components/common/pages/backups/lib/models/interfaces.ts

@@ -31,6 +31,7 @@ export interface UI_I_BackupAction {
   id?: string
   name?: string
   backupId?: string
+  vmId?: string
   bucketId?: string
   storageId?: string
 }

package/components/common/pages/backups/modals/Modals.vue

@@ -187,6 +187,7 @@ watch(
       case 'restoreBackup':
         isShowRestoreModal.value = true
         restoreForm.value.backup_storage = newValue.storageId || ''
+        restoreForm.value.vm = newValue.vmId || ''
         restoreForm.value.bucket = newValue.bucketId || ''
         restoreForm.value.backup = newValue.backupId || ''
         break

package/components/common/pages/backups/modals/lib/config/restore.ts

@@ -4,6 +4,7 @@ export const restoreDefaultFormFunc = (): UI_I_RestoreForm => {
   return {
     restore_code: 2,
     backup_storage: '',
+    vm: '',
     bucket: '',
     backup: '',
     copy_disks: [],

package/components/common/pages/backups/modals/lib/models/interfaces.ts

@@ -163,6 +163,7 @@ export interface UI_I_CreateBackupForm {
 export interface UI_I_RestoreForm {
   restore_code: 1 | 2 | 3 // 1 - disk only, 2 - existing, 3 - as New
   backup_storage: string
+  vm: string
   bucket: string
   backup: string
   copy_disks: UI_I_Pvm['disk_devices']

package/components/common/pages/backups/modals/restore/Restore.vue

@@ -258,7 +258,8 @@ const getPvm = async (): Promise<void> => {
   loadingCount.value++
   await $store.dispatch('backup/A_GET_PVM', {
     target: model.value.backup_storage,
-    bucketId: model.value.bucket, // TODO bucket поменять на vm так как это сейчас vm
+    vmId: model.value.vm,
+    bucketId: model.value.bucket,
     backupId: model.value.backup,
   })
 
@@ -273,7 +274,8 @@ const getBackupDisks = async (): Promise<void> => {
   loadingCount.value++
   await $store.dispatch('backup/A_GET_BACKUP_DISKS', {
     target: model.value.backup_storage,
-    bucketId: model.value.bucket, // TODO bucket поменять на vm так как это сейчас vm
+    vmId: model.value.vm,
+    bucketId: model.value.bucket,
     backupId: model.value.backup,
   })
 

package/components/common/wizards/network/add/Add.vue

@@ -146,7 +146,6 @@ const props = withDefaults(
     isNetworkingLoading: false,
     isGetExistingSwitchesLoading: false,
     isGetTcpStackLoading: false,
-    hostName: ''
   }
 )
 

package/package.json

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

package/components/common/configure/vmkernelAdapters/VmkernelAdapters.vue

@@ -1,254 +0,0 @@
-<template>
-  <div class="height-fix flex flex-col h-full">
-    <common-headline
-      :headline="localization.common.vMkernelAdapters"
-      class="virtual-switches__headline"
-    />
-    <div v-show="!props.isLoading" style="height: calc(100% - 78px)">
-      <div class="main-actions">
-        <button
-          id="add-virtual-switch-button"
-          v-permission="
-            'Networks.CreateSysx Networks.CreatePortGroup Networks.UpdateSwitch Networks.CreateSwitch'
-          "
-          data-id="add-virtual-switch-button"
-          type="button"
-          class="btn btn-sm"
-          @click="emits('show-add-networking-modal')"
-        >
-          {{ localization.common.addNetworkingWithDots }}
-        </button>
-        <button
-          id="refresh-virtual-switch-button"
-          data-id="refresh-virtual-switch-button"
-          type="button"
-          class="btn btn-sm"
-          @click="emits('global-refresh')"
-        >
-          {{ localization.common.refresh }}
-        </button>
-      </div>
-      <common-configure-vmkernel-adapters-table-view
-        :network-data="props.networkData"
-        :is-dark-mode="props.isDarkMode"
-        :is-remove-modal-loading="props.isRemoveModalLoading"
-        :is-edit-modal-loading="props.isEditModalLoading"
-        @send-edit-data="onSendEditData"
-        @remove="onRemove"
-      />
-      <common-wizards-network-add
-        v-if="props.isShowAddNetworkingModal"
-        :show="props.isShowAddNetworkingModal"
-        :adapters="props.adapters"
-        :standard-switches-initial="props.standardSwitches"
-        :free-adapters="props.freeAdapters"
-        :is-dark-mode="props.isDarkMode"
-        :tcp-stacks="props.tcpStacks"
-        :is-networking-loading="props.isNetworkingLoading"
-        :is-get-existing-switches-loading="props.isGetExistingSwitchesLoading"
-        :is-get-tcp-stack-loading="props.isGetTcpStackLoading"
-        :diagrams-data="props.diagramData"
-        :host-name="props.hostName"
-        project="sphere"
-        @check-network-label="onCheckNetworkLabel"
-        @get-existing-standard-switches="
-          emits('get-existing-standard-switches')
-        "
-        @get-tcp-stacks="emits('get-tcp-stacks')"
-        @get-free-adapters="onGetFreeAdapters"
-        @send-add-networking-data="onSendNetworkData"
-        @add-networking-data-validate="onValidateBeforeSending"
-        @hide="emits('hide-add-networking-modal')"
-      />
-    </div>
-    <atoms-loader
-      v-show="props.isLoading"
-      test-id="vmkernel-adapters-spinner"
-    />
-  </div>
-</template>
-
-<script setup lang="ts">
-import type { UI_T_Project } from '~/lib/models/types'
-import type {
-  UI_I_Localization,
-  UI_I_ArbitraryObject,
-  UI_I_ItemsWithTotalCounts,
-} from '~/lib/models/interfaces'
-import type {
-  UI_I_AddNetworkingSecondOrThirdSchemeDataSend,
-  UI_I_AddNetworkingZeroOrFirstSchemeDataSend,
-  UI_I_AddNetworkingFourthOrFifthSchemeDataSend,
-  UI_I_Switch,
-  UI_I_TCPStack,
-} from '~/components/common/wizards/network/add/lib/models/interfaces'
-import type {
-  UI_I_Network,
-  UI_I_Adapter,
-  UI_I_SwitchAdapterItem,
-  UI_I_EditFieldsData,
-  UI_I_DiagramData,
-  API_UI_I_SwitchItem,
-} from '~/components/common/diagramMain/lib/models/interfaces'
-
-const props = withDefaults(
-  defineProps<{
-    isLoading: boolean
-    isDarkMode: boolean
-    networkData: UI_I_Network[]
-    adapters: UI_I_ItemsWithTotalCounts<UI_I_SwitchAdapterItem>
-    diagramData: UI_I_DiagramData[]
-    standardSwitches: UI_I_Switch[]
-    tcpStacks: UI_I_TCPStack[]
-    freeAdapters: UI_I_Adapter[]
-    project?: UI_T_Project
-    isRemoveModalLoading: boolean
-    isNetworkingLoading: boolean
-    isGetExistingSwitchesLoading: boolean
-    isGetTcpStackLoading: boolean
-    isEditModalLoading: boolean
-    isShowAddNetworkingModal: boolean
-    hostName?: string
-  }>(),
-  {
-    hostName: '',
-    project: 'procurator',
-  }
-)
-
-const emits = defineEmits<{
-  (event: 'global-refresh'): void
-  (event: 'remove', id: string, type: string, hideModal: () => void): void
-  (event: 'show-add-networking-modal'): void
-  (event: 'hide-add-networking-modal'): void
-  (event: 'get-existing-standard-switches'): void
-  (
-    event: 'check-network-label',
-    label: string,
-    sendMessage: (message: string) => void
-  ): void
-  (event: 'get-free-adapters', showModal: () => void): void
-  (
-    event: 'send-network-data',
-    data:
-      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-      | API_UI_I_SwitchItem,
-    type: string,
-    hideModal: () => void
-  ): void
-  (
-    event: 'add-networking-data-validate',
-    data:
-      | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-      | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-      | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-      | API_UI_I_SwitchItem,
-    type: string,
-    setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
-  ): void
-  (event: 'get-tcp-stacks'): void
-  (
-    event: 'send-edit-data',
-    type: string,
-    editFieldsData: UI_I_EditFieldsData,
-    hideModal: () => void,
-    id: string
-  ): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const onRemove = (id: string, type: string, hideModal: () => void): void => {
-  emits('remove', id, type, hideModal)
-}
-
-const onCheckNetworkLabel = (
-  label: string,
-  sendMessage: (message: string) => void
-): void => {
-  emits('check-network-label', label, sendMessage)
-}
-
-const onGetFreeAdapters = (showModal: () => void): void => {
-  emits('get-free-adapters', showModal)
-}
-
-const onSendNetworkData = (
-  data:
-    | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-    | API_UI_I_SwitchItem,
-  type: string,
-  hideModal: () => void
-): void => {
-  emits('send-network-data', data, type, hideModal)
-}
-
-// TODO Удалить после изменения запросов и на прокураторе
-const onValidateBeforeSending = (
-  data:
-    | UI_I_AddNetworkingSecondOrThirdSchemeDataSend
-    | UI_I_AddNetworkingZeroOrFirstSchemeDataSend
-    | UI_I_AddNetworkingFourthOrFifthSchemeDataSend
-    | API_UI_I_SwitchItem,
-  type: string,
-  setValidation: (err_arg: UI_I_ArbitraryObject<string>) => void
-): void => {
-  emits('add-networking-data-validate', data, type, setValidation)
-}
-
-const onSendEditData = (
-  type: string,
-  editFieldsData: UI_I_EditFieldsData,
-  hideModal: () => void,
-  id = ''
-): void => {
-  emits('send-edit-data', type, editFieldsData, hideModal, id)
-}
-</script>
-
-<style scoped lang="scss">
-@import 'assets/scss/common/mixins.scss';
-
-.content-area {
-  &__loading {
-    height: 100%;
-    @include flex($align: center, $just: center);
-    :deep(.spinner) {
-      width: 45px;
-      height: 45px;
-      min-width: 45px;
-      min-height: 45px;
-    }
-  }
-}
-
-:deep(.datagrid-outer-wrapper) {
-  padding-top: 0;
-}
-
-.main-actions {
-  padding: 20px 0 5px;
-
-  #refresh-virtual-switch-button,
-  #add-virtual-switch-button {
-    outline: none;
-    border: none;
-    background: none;
-    letter-spacing: 2px;
-    margin: 0;
-
-    &:focus {
-      outline: none;
-    }
-
-    &:active {
-      outline: none;
-      box-shadow: none;
-    }
-  }
-}
-</style>