bfg-common 1.1.86 → 1.1.88

package/assets/localization/local_be.json

@@ -2066,5 +2066,7 @@
   "removeItem": "Выдаліць элемент",
   "downloadCertificate": "Спампаваць сертыфікат",
   "invalidCertificateDescription": "Увага! Па змаўчанні ўсталяваны самазавераны сертыфікат SSL. Каб працягваць працаваць з гэтым сертыфікатам SSL, вам неабходна дадаць яго ў каранёвае сховішча. Гэта можна зрабіць на ўсіх кліенцкіх прыладах або замяніць сертыфікатам SSL арганізацыі, або выкарыстоўваць свой уласны.",
-  "youAreHere": "Вы тут"
+  "youAreHere": "Вы тут",
+  "showAllDatastores": "Паказаць усе сховішчы дадзеных",
+  "showDatastoresConnectedAllHosts": "Паказаць сховішчы даных, падлучаныя да ўсіх хостаў"
 }

package/assets/localization/local_en.json

@@ -2069,5 +2069,7 @@
   "removeItem": "Remove Item",
   "downloadCertificate": "Download certificate",
   "invalidCertificateDescription": "Attention! A self-signed SSL certificate is installed by default. To continue working with this SSL certificate, you need to add it to the root store. This can be done on all client devices or replaced with the organization's SSL certificate, or use your own.",
-  "youAreHere": "You are here"
+  "youAreHere": "You are here",
+  "showAllDatastores": "Show all datastores",
+  "showDatastoresConnectedAllHosts": "Show datastores connected to all hosts"
 }

package/assets/localization/local_hy.json

@@ -2069,5 +2069,7 @@
   "removeItem": "Հեռացնել տարրը",
   "downloadCertificate": "Ներբեռնեք վկայականը",
   "invalidCertificateDescription": "Ուշադրություն. Լռելյայն տեղադրվում է ինքնաստորագրված SSL վկայագիր: Այս SSL վկայագրի հետ աշխատելը շարունակելու համար դուք պետք է այն ավելացնեք արմատային խանութում: Սա կարելի է անել բոլոր հաճախորդի սարքերում կամ փոխարինել կազմակերպության SSL վկայականով, կամ օգտագործել ձերը:",
-  "youAreHere": "Դու այստեղ ես"
+  "youAreHere": "Դու այստեղ ես",
+  "showAllDatastores": "Ցույց տալ բոլոր տվյալների պահեստները",
+  "showDatastoresConnectedAllHosts": "Ցուցադրել տվյալների պահեստները, որոնք միացված են բոլոր հոսթներին"
 }

package/assets/localization/local_kk.json

@@ -2069,5 +2069,7 @@
   "removeItem": "Элементті жою",
   "downloadCertificate": "Сертификат жүктеп алыңыз",
   "invalidCertificateDescription": "Назар аударыңыз! Өздігінен қол қойылған SSL сертификаты әдепкі бойынша орнатылады. Осы SSL сертификатымен жұмыс істеуді жалғастыру үшін оны түбірлік қоймаға қосу керек. Мұны барлық клиенттік құрылғыларда жасауға немесе ұйымның SSL сертификатымен ауыстыруға немесе өзіңізді пайдалануға болады.",
-  "youAreHere": "Сен мындасың"
+  "youAreHere": "Сен мындасың",
+  "showAllDatastores": "Барлық деректер қоймаларын көрсету",
+  "showDatastoresConnectedAllHosts": "Барлық хосттарға қосылған деректер қоймаларын көрсету"
 }

package/assets/localization/local_ru.json

@@ -2069,5 +2069,7 @@
   "removeItem": "Убрать предмет",
   "downloadCertificate": "Скачать сертификат",
   "invalidCertificateDescription": "Внимание! Установлен самоподписанный SSL-сертификат по умолчанию. Для продолжения работы с данным SSL-сертификатом необходимо его добавить в корневое хранилище. Это можно сделать на всех клиентских устройствах или заменить на SSL-сертификат организации, либо использовать собственный.",
-  "youAreHere": "Вы здесь"
+  "youAreHere": "Вы здесь",
+  "showAllDatastores": "Показать все хранилища данных",
+  "showDatastoresConnectedAllHosts": "Показать хранилища данных, подключенные ко всем хостам"
 }

package/assets/localization/local_zh.json

@@ -2069,5 +2069,7 @@
   "removeItem": "除去项目",
   "downloadCertificate": "下载证书",
   "invalidCertificateDescription": "注意力！默认情况下安装自签名 SSL 证书。要继续使用此 SSL 证书，您需要将其添加到根存储区。这可以在所有客户端设备上完成，或者替换为组织的 SSL 证书，或者使用您自己的证书。",
-  "youAreHere": "你在这里"
+  "youAreHere": "你在这里",
+  "showAllDatastores": "显示所有数据存储",
+  "showDatastoresConnectedAllHosts": "显示连接到所有主机的数据存储"
 }

package/components/common/monitor/advanced/Advanced.vue

@@ -12,6 +12,7 @@
       <div class="fill-parent flex-column">
         <div class="vertical-flex-container fill-parent">
           <common-monitor-advanced-tools
+            v-model:selected-timespan-type="localSelectedTimespanType"
             :type="props.type"
             :start-date="props.data?.pointStart || 0"
             :chart-title="props.data?.groupName || ''"
@@ -21,7 +22,6 @@
             :disabled-period="props.disabledPeriod"
             :disabled-view="props.disabledView"
             :selected-chart-type="props.selectedChartType"
-            :selected-timespan-type="props.selectedTimespanType"
             :units-count="props.unitsCount"
             :period-type="props.periodType"
             :selected-custom-time="props.selectedCustomTime"
@@ -32,6 +32,7 @@
             :custom-time-to="props.customTimeTo"
             :total-cores="totalCores"
             :host-id="props.hostId"
+            :selected-objects="props.selectedObjects"
             @update-tools="emits('update-tools', $event)"
             @exporting="onExporting"
             @open-advanced-page="onGetEmptyPage"
@@ -42,7 +43,6 @@
             @update-unit-count="emits('update-unit-count', $event)"
             @update-period-type="emits('update-period-type', $event)"
             @update-custom-time="emits('update-custom-time', $event)"
-            @select-chart-name="emits('select-chart-name', $event)"
             @delete-option="emits('delete-option')"
             @update-custom-date-from="emits('update-custom-date-from', $event)"
             @update-custom-date-to="emits('update-custom-date-to', $event)"
@@ -91,11 +91,12 @@ import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/t
 import { I_SeriesLine } from 'bfg-nuxt-3-graph/graph/models/interfaces'
 import { UI_I_MonitorGraphPayload } from '~/components/common/monitor/models/interfaces'
 import { UI_I_PerformanceItem } from '~/components/common/monitor/advanced/table/models/interfaces'
-import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
 import {
   T_ChartHost,
   T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
+import { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/models'
+import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
 import { getCountCores } from '~/components/common/monitor/advanced/tools/utils/countCores'
 
 const props = defineProps<{
@@ -120,6 +121,7 @@ const props = defineProps<{
   customTimeFrom: string
   customTimeTo: string
   hostId: string
+  selectedObjects: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -135,24 +137,35 @@ const emits = defineEmits<{
   (event: 'update-unit-count', value: number): void
   (event: 'update-period-type', value: string): void
   (event: 'update-custom-time', value: string): void
-  (event: 'select-chart-name', value: string): void
   (event: 'delete-option'): void
   (event: 'update-custom-date-from', value: string): void
   (event: 'update-custom-date-to', value: string): void
   (event: 'update-custom-time-from', value: string): void
   (event: 'update-custom-time-to', value: string): void
-  (event: 'submit-options', value: string): void
+  (event: 'submit-options', value: UI_I_OptionsForm): void
+  (event: 'update:selected-timespan-type', value: string): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
 
+const localSelectedTimespanType = computed<string>({
+  get() {
+    return props.selectedTimespanType
+  },
+  set(newValue) {
+    emits('update:selected-timespan-type', newValue)
+  },
+})
+
 const totalCores = ref<number>(0)
+let isFirstUpdate = true
 watch(
   () => props.data,
   (newValue) => {
-    if (!newValue) return
+    if (!newValue || !isFirstUpdate) return
 
     totalCores.value = getCountCores(newValue)
+    isFirstUpdate = false
   },
   { immediate: true }
 )

package/components/common/monitor/advanced/tools/Tools.vue

@@ -101,6 +101,7 @@
     :custom-time-to="props.customTimeTo"
     :total-cores="props.totalCores"
     :host-id="props.hostId"
+    :selected-objects="props.selectedObjects"
     @hide="isShowModal = false"
     @select-row="emits('select-row', $event)"
     @select-metric="emits('select-metric', $event)"
@@ -109,7 +110,6 @@
     @update-unit-count="emits('update-unit-count', $event)"
     @update-period-type="emits('update-period-type', $event)"
     @update-custom-time="emits('update-custom-time', $event)"
-    @select-chart-name="onSelectChartName"
     @delete-option="onDeleteOption"
     @save-option-name="onSaveOptionName"
     @update-custom-date-from="emits('update-custom-date-from', $event)"
@@ -126,11 +126,12 @@ import { UI_I_Localization } from '~/models/interfaces'
 import { UI_I_MonitorGraphPayload } from '~/components/common/monitor/models/interfaces'
 import { UI_I_DropMenu } from '~/components/common/monitor/advanced/tools/models/interfaces'
 import { UI_T_AdvancedType } from '~/components/common/monitor/advanced/models/types'
-import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
 import {
   T_ChartHost,
   T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
+import { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/models'
+import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
 import { getValidDateByOptionFunc } from '~/components/common/monitor/config/getValidDateByOption'
 import {
   periodFunc,
@@ -159,6 +160,7 @@ const props = defineProps<{
   customTimeTo: string
   totalCores: number
   hostId: string
+  selectedObjects: string
   disabledPeriod?: boolean
   disabledView?: boolean
 }>()
@@ -174,13 +176,13 @@ const emits = defineEmits<{
   (event: 'update-unit-count', value: number): void
   (event: 'update-period-type', value: string): void
   (event: 'update-custom-time', value: string): void
-  (event: 'select-chart-name', value: string): void
   (event: 'delete-option'): void
   (event: 'update-custom-date-from', value: string): void
   (event: 'update-custom-date-to', value: string): void
   (event: 'update-custom-time-from', value: string): void
   (event: 'update-custom-time-to', value: string): void
-  (event: 'submit-options', value: string): void
+  (event: 'submit-options', value: UI_I_OptionsForm): void
+  (event: 'update:selected-timespan-type', value: string): void
 }>()
 
 const routeType = '' + useRoute().params.type
@@ -212,36 +214,22 @@ watch(
   { immediate: true }
 )
 
-const onSelectChartName = (name: string): void => {
-  emits('select-chart-name', name)
-  optionsNames.value = getCurrentOptionsStorageFunc(routeType)
-}
-
 const onDeleteOption = (): void => {
   emits('delete-option')
   optionsNames.value = getCurrentOptionsStorageFunc(routeType)
 }
 
-const selectedPeriod = ref<string>('')
 const periodOptions = computed<UI_I_OptionItem[]>(() =>
   periodFunc(localization.value, props.selectedTimespanType)
 )
-watch(
-  () => periodOptions.value,
-  (newValue: UI_I_OptionItem[]) => {
-    if (newValue) selectedPeriod.value = newValue[0].value
+const selectedPeriod = computed<string>({
+  get() {
+    return props.selectedTimespanType || periodOptions.value[0].value
   },
-  { immediate: true }
-)
-watch(
-  () => props.selectedTimespanType,
-  (newValue) => {
-    if (!newValue) return
-
-    selectedPeriod.value = newValue
-    updateTools()
-  }
-)
+  set(newValue) {
+    emits('update:selected-timespan-type', newValue)
+  },
+})
 
 const isShowModal = ref<boolean>(false)
 watch(isShowModal, (newValue) => {
@@ -249,8 +237,6 @@ watch(isShowModal, (newValue) => {
     selectedView.value = viewOptions.value[0].value
 })
 
-const selectedObjects = ref<string>('')
-
 const updateTools = (): void => {
   const periodValue = selectedPeriod.value
   const viewValue = selectedView.value
@@ -295,6 +281,8 @@ const updateTools = (): void => {
     periodType: periodValue,
     view: viewValue,
   }
+  if (selectedValue.metric) tools.metricType = selectedValue.metric
+
   emits('update-timespan-type', selectedPeriod.value)
   emits('update-tools', tools)
 }
@@ -421,7 +409,6 @@ onMounted(() => {
           min-width: 16px;
           min-height: 16px;
           background-size: 100% auto;
-          display: block;
         }
       }
 

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

@@ -4,6 +4,7 @@
       width="1150px"
       :show="true"
       :title="localization.chartOptions"
+      :disabled-submit="isDisabledSubmit"
       @hide="onHide"
       @submit="onSubmit"
     >
@@ -45,6 +46,8 @@
               :custom-time-to="props.customTimeTo"
               :total-cores="props.totalCores"
               :host-id="props.hostId"
+              :selected-metrics-keys="selectedMetricsKeys"
+              :selected-objects="props.selectedObjects"
               @select-row="selectedRows = $event"
               @update-chart-type="selectedChartTypeLocal = $event"
               @update-custom-time="localCustomTime = $event"
@@ -55,6 +58,7 @@
               @update-custom-date-to="onUpdateCustomDateTo"
               @update-custom-time-from="onUpdateCustomTimeFrom"
               @update-custom-time-to="onUpdateCustomTimeTo"
+              @select-objects="localSelectedObjects = $event"
             />
           </div>
         </div>
@@ -72,9 +76,11 @@ import {
   T_ChartHost,
   T_ChartVm,
 } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/types'
+import { UI_I_OptionsForm } from '~/components/common/monitor/advanced/tools/chartOptionsModal/models/models'
 import { metricsFunc } from '~/components/common/monitor/advanced/tools/chartOptionsModal/metrics/config/optionsMetrics'
 import { getCurrentOptionsStorageFunc } from '~/components/common/monitor/advanced/tools/config/advancedToolbar'
 import { checkDateFunc } from '~/components/common/monitor/overview/filters/customIntervalModal/config/dateChecker'
+import { getValidDateByOptionFunc } from '~/components/common/monitor/config/getValidDateByOption'
 
 const props = defineProps<{
   type: UI_T_AdvancedType
@@ -93,6 +99,7 @@ const props = defineProps<{
   customTimeTo: string
   totalCores: number
   hostId: string
+  selectedObjects: string
 }>()
 
 const emits = defineEmits<{
@@ -104,14 +111,13 @@ const emits = defineEmits<{
   (event: 'update-unit-count', value: number): void
   (event: 'update-period-type', value: string): void
   (event: 'update-custom-time', value: string): void
-  (event: 'select-chart-name', value: string): void
   (event: 'delete-option'): void
   (event: 'save-option-name'): void
   (event: 'update-custom-date-from', value: string): void
   (event: 'update-custom-date-to', value: string): void
   (event: 'update-custom-time-from', value: string): void
   (event: 'update-custom-time-to', value: string): void
-  (event: 'submit-options', value: string): void
+  (event: 'submit-options', value: UI_I_OptionsForm): void
   (event: 'select-objects', value: string): void
 }>()
 
@@ -210,6 +216,9 @@ const onHide = (): void => {
 }
 
 const selectedRows = ref<UI_I_AdvancedCounterItem[]>([])
+const selectedMetricsKeys = computed<number[]>(() =>
+  selectedRows.value.map((item) => item.id)
+)
 const selectedChartTypeLocal = ref<string>('')
 
 const checkValidations = (): boolean => {
@@ -250,7 +259,15 @@ watch(
 
 const selectedLocalOptionName = ref<string>('')
 
-const selectedObjects = ref<string>('')
+const localSelectedObjects = ref<string>('')
+
+const currentFieldsByArray = (data: UI_I_AdvancedCounterItem[]): string => {
+  const result: string[] = []
+  data.forEach((item) => {
+    result.push(item.nameEn)
+  })
+  return result.join(',')
+}
 
 const onSubmit = (): void => {
   if (!checkValidations()) return
@@ -260,7 +277,6 @@ const onSubmit = (): void => {
 
   onSaveOptions(selectedLocalOptionName.value)
 
-  // emits('select-chart-name', selectedLocalOptionName.value) +
   // emits('select-metric', selectedMetric.value) +
   // emits('select-row', selectedRows.value) +
   // emits('update-timespan-type', timespanType.value) +
@@ -274,7 +290,43 @@ const onSubmit = (): void => {
   // emits('update-chart-type', selectedChartTypeLocal.value) +
   // emits('submit-options')
 
+  // const periodValue = getValidDateByOptionFunc(
+  //     periodValue,
+  //     selectedValue,
+  //     props.unitsCount,
+  //     props.selectedCustomTime
+  // )
+  //
+
+  const currentFields =
+    localSelectedObjects.value || currentFieldsByArray(selectedRows.value)
+
+  const validPeriod = getValidDateByOptionFunc(
+    timespanType.value,
+    null,
+    unitCount.value,
+    localCustomTime.value
+  ).map((item) => Math.round(item / 1000))
+
+  if (
+    timespanType.value === 'custom_interval' &&
+    localPeriodType.value === 'period'
+  ) {
+    const checkDateResult = checkDateFunc(
+      localization.value,
+      localCustomDateFrom.value,
+      localCustomDateTo.value,
+      localCustomTimeFrom.value,
+      localCustomTimeTo.value
+    )
+    if (Array.isArray(checkDateResult)) {
+      validPeriod[0] = Math.round(checkDateResult[0] / 1000)
+      validPeriod[1] = Math.round(checkDateResult[1] / 1000)
+    }
+  }
+
   const savedObject = {
+    fields: currentFields,
     optionName: selectedLocalOptionName.value,
     metric: selectedMetric.value,
     counters: selectedRows.value,
@@ -287,7 +339,8 @@ const onSubmit = (): void => {
     dateTo: localCustomDateTo.value,
     timeTo: localCustomTimeTo.value,
     chartType: selectedChartTypeLocal.value,
-    objects: selectedObjects.value,
+    objects: localSelectedObjects.value,
+    periodValue: validPeriod,
   }
 
   emits('submit-options', savedObject)
@@ -394,6 +447,13 @@ const onDeleteChartName = (name: string): void => {
   emits('delete-option')
 }
 
+const isDisabledSubmit = computed<boolean>(
+  () =>
+    props.type === 'host' &&
+    selectedMetric.value === 'cpu' &&
+    !localSelectedObjects.value
+)
+
 onMounted(() => {
   optionsNames.value = getCurrentOptionsStorageFunc(routeType)
 })

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/Counters.vue

@@ -5,6 +5,7 @@
       :type="props.type"
       :selected-keys="props.selectedKeys"
       @select-row="emits('select-row', $event)"
+      @total-items="totalMetricItems = $event"
     />
     <common-monitor-advanced-tools-chart-options-modal-counters-timespan
       :type="props.type"
@@ -21,6 +22,9 @@
       :custom-time-to="props.customTimeTo"
       :total-cores="props.totalCores"
       :host-id="props.hostId"
+      :selected-metrics-keys="props.selectedMetricsKeys"
+      :total-metric-items="totalMetricItems"
+      :selected-objects="props.selectedObjects"
       @update-chart-type="emits('update-chart-type', $event)"
       @update-custom-time="emits('update-custom-time', $event)"
       @update-timespan-type="emits('update-timespan-type', $event)"
@@ -59,6 +63,8 @@ const props = defineProps<{
   customTimeTo: string
   totalCores: number
   hostId: string
+  selectedMetricsKeys: number[]
+  selectedObjects: string
 }>()
 
 const emits = defineEmits<{
@@ -74,6 +80,8 @@ const emits = defineEmits<{
   (event: 'update-custom-time-to', value: string): void
   (event: 'select-objects', value: string): void
 }>()
+
+const totalMetricItems = ref<number>(0)
 </script>
 
 <style scoped lang="scss">

package/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/Table.vue

@@ -46,6 +46,7 @@ const props = defineProps<{
 
 const emits = defineEmits<{
   (event: 'select-row', value: UI_I_AdvancedCounterItem[]): void
+  (event: 'total-items', value: number): void
 }>()
 
 const localization = computed<UI_I_Localization>(() => useLocal())
@@ -57,6 +58,14 @@ const counters = computed<UI_I_AdvancedCounterItem[]>(() =>
 const totalItems = computed<number>(() => counters.value.length)
 const totalPages = computed<number>(() => 1)
 
+watch(
+  totalItems,
+  (newValue) => {
+    emits('total-items', newValue)
+  },
+  { immediate: true }
+)
+
 const selectedCounters = ref<number[]>([])
 watch(
   () => props.selectedKeys,

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

@@ -654,8 +654,9 @@ export const getDefaultCounters = (
         case 'cpuUsageInPercent':
           return hostItemsFunc('cpu', {}).splice(0, 2)
         case 'disk':
-          const allItems = hostItemsFunc('disk', {})
-          return allItems.filter((_, key) => [0, 14].includes(key))
+          return hostItemsFunc('disk', {}).filter((_, key) =>
+            [0, 14].includes(key)
+          )
         case 'memory':
           return hostItemsFunc('memory', {})
         case 'network':

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

@@ -26,6 +26,9 @@
       :chart="props.chart"
       :total-cores="props.totalCores"
       :host-id="props.hostId"
+      :selected-metrics-keys="props.selectedMetricsKeys"
+      :total-metric-items="props.totalMetricItems"
+      :selected-objects="props.selectedObjects"
       @select-objects="emits('select-objects', $event)"
     />
   </div>
@@ -53,6 +56,9 @@ const props = defineProps<{
   customTimeTo: string
   totalCores: number
   hostId: string
+  selectedMetricsKeys: number[]
+  totalMetricItems: number
+  selectedObjects: string
 }>()
 
 const emits = defineEmits<{

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

@@ -45,6 +45,9 @@ const props = defineProps<{
   chart: T_ChartHost | T_ChartVm
   totalCores: number
   hostId: string
+  selectedMetricsKeys: number[]
+  totalMetricItems: number
+  selectedObjects: string
 }>()
 
 const emits = defineEmits<{
@@ -68,38 +71,82 @@ const columnItems = computed<UI_I_ColumnKey[]>(() =>
 
 const bodyItems = ref<UI_I_BodyItem[][]>([])
 
-const items: UI_I_AdvancedTargetObject[] = []
+let items: UI_I_AdvancedTargetObject[] = []
 watch(
-  () => [props.type, props.chart, props.totalCores, props.hostId],
+  () => [
+    props.type,
+    props.chart,
+    props.totalCores,
+    props.hostId,
+    props.selectedMetricsKeys,
+  ],
   (newValue) => {
+    items = []
+    selectedRow.value = []
+
     if (newValue[0] === 'host' && newValue[1] === 'cpu') {
-      items.push({
-        id: 'total',
-        target_object: newValue[3],
-      })
-      for (let i = 0; i < newValue[2]; i++) {
+      if (newValue[4].includes(0)) {
         items.push({
-          id: 'core' + i,
-          target_object: '' + i,
+          id: 'total',
+          target_object: newValue[3],
         })
       }
+      if (newValue[4].includes(1)) {
+        for (let i = 0; i < newValue[2]; i++) {
+          items.push({
+            id: 'core' + i,
+            target_object: '' + i,
+          })
+        }
+      }
       bodyItems.value = table.bodyItems(items)
-    }
+    } else bodyItems.value = []
   },
   { immediate: true }
 )
 
-watch(selectedRow, (newValue) => {
-  const selectedItems: number[] = []
+watch(
+  selectedRow,
+  (newValue) => {
+    const selectedItems: string[] = []
+
+    newValue.forEach((key) => {
+      selectedItems.push(items[key].id)
+    })
 
-  newValue.forEach((key) => {
-    selectedItems.push(+items[key].id)
-  })
+    const selectedNames =
+      items.length === newValue.length &&
+      props.selectedMetricsKeys.length === props.totalMetricItems
+        ? '*'
+        : selectedItems.join(', ')
 
-  const selectedNames =
-    items.length === newValue.length ? '*' : selectedItems.join(', ')
-  emits('select-objects', selectedNames)
-})
+    emits('select-objects', selectedNames)
+  },
+  { deep: true }
+)
+
+watch(
+  () => [props.selectedObjects, bodyItems.value],
+  ([selected, all]) => {
+    if (!all.length) return
+
+    if (props.type === 'host' && props.chart === 'cpu') {
+      if (selected === '*') {
+        selectedRow.value = all.map((item) => item[0].id)
+      } else {
+        const selectedNames = selected.split(', ')
+        const selectedKeys: number[] = []
+        all.forEach((item) => {
+          if (selectedNames.includes('total')) selectedKeys.push(0)
+          if (selectedNames.includes(`core${item[0].text}`))
+            selectedKeys.push(item[0].id)
+        })
+        selectedRow.value = selectedKeys
+      }
+    }
+  },
+  { immediate: true }
+)
 </script>
 
 <style scoped lang="scss">

package/components/common/monitor/advanced/tools/chartOptionsModal/models/models.ts

@@ -0,0 +1,19 @@
+import { UI_I_AdvancedCounterItem } from '~/components/common/monitor/advanced/tools/chartOptionsModal/counters/table/models/interfaces'
+
+export interface UI_I_OptionsForm {
+  fields: string
+  optionName: string
+  metric: string
+  counters: UI_I_AdvancedCounterItem[]
+  timespanType: string
+  periodType: string
+  unitCount: number
+  localTimespanType: string
+  dateFrom: string
+  timeFrom: string
+  dateTo: string
+  timeTo: string
+  chartType: string
+  objects: string
+  periodValue: number[]
+}

package/components/common/monitor/models/interfaces.ts

@@ -16,4 +16,5 @@ export interface UI_I_MonitorGraphPayload {
   storageId?: string
   hostName?: string
   fields?: string
+  metricType?: string
 }

package/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/CdDvdDrive.vue

@@ -1,246 +1,246 @@
-<template>
-  <div class="hardware-cd-dvd-drive">
-    <atoms-stack-block
-      :has-children="true"
-      :is-roll-back="props.type === 'removed'"
-      :removable="isRemovable"
-      @remove="onRemoveCdDvdDrive"
-      @roll-back="onRollBackCdDvdDrive"
-    >
-      <template #stackBlockKey>
-        <div
-          class="vm-wizard-toggle-block-cd-dvd-drive vm-wizard-toggle-block-hard-disk"
-        >
-          <span>{{ label }}</span>
-        </div>
-      </template>
-      <template #stackBlockContent>
-        <div class="flex-align-center flex-space-between">
-          <template v-if="props.type === 'removed'">
-            <span>{{ localization.deviceWillRemoved }}</span>
-            <div @click.stop class="flex-align-center">
-              <input
-                :id="`cd-dvd-delete-files-from-datastore-${props.index}`"
-                v-model="deleteFilesFromDatastore"
-                :disabled="props.disabled"
-                type="checkbox"
-                class="pointer"
-                @click.stop
-              />
-              <label
-                :for="`cd-dvd-delete-files-from-datastore-${props.index}`"
-                :class="[
-                  'label-text-normal pointer',
-                  props.disabled && 'div-disabled',
-                ]"
-                >{{ localization.deleteFilesFromDatastore }}</label
-              >
-            </div>
-          </template>
-          <template v-else>
-            <div class="select">
-              <select
-                id="vm-wizard-cd-dvd-drive-field"
-                v-model="selectedCdDvdDrive"
-                class="vm-wizard-cd-dvd-drive-field"
-                @click.stop
-                @change="changeCdDvdDrive"
-              >
-                <option
-                  v-for="(item, key) in cdDvdDriveOptions"
-                  :key="key"
-                  :value="item.value"
-                >
-                  {{ item.text }}
-                </option>
-              </select>
-            </div>
-          </template>
-        </div>
-      </template>
-      <template #stackChildren>
-        <common-vm-actions-add-customize-hardware-virtual-hardware-cd-dvd-drive-media
-          v-if="selectedCdDvdDrive === 'datastoreIsoFile'"
-          v-model:cd-dvd-media="cdDvdMedia"
-          @browse="isShowFileModal = true"
-        />
-
-        <common-vm-actions-add-customize-hardware-virtual-hardware-bus
-          v-model:bus="bus"
-          :index="indexByHardDisks"
-          :validation-type="busValidationType"
-          :error-validation-fields="props.errorValidationFields"
-          :disabled="isRunning"
-          component-type="disk_devices"
-          @remove-error-by-title="emits('remove-error-by-title', $event)"
-        />
-      </template>
-    </atoms-stack-block>
-
-    <Teleport to="body">
-      <common-vm-actions-add-customize-hardware-virtual-hardware-browse-view
-        v-if="isShowFileModal"
-        :show="isShowFileModal"
-        :file-types="fileTypes"
-        :nodes="props.nodes"
-        :files="props.files"
-        @submit="onSelectFile"
-        @get-storage="emits('get-storage', $event)"
-        @get-folders-or-files="emits('get-folders-or-files', $event)"
-        @get-active-device-child="emits('get-active-device-child', $event)"
-        @show-datastore-child="emits('show-datastore-child', $event)"
-        @hide="isShowFileModal = false"
-      />
-    </Teleport>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { UI_I_FileTreeNode } from '~/components/models/interfaces'
-import { UI_I_TablePayload } from '~/models/store/interfaces'
-import { UI_T_CdDvdDrive } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/models/types'
-import { UI_I_SendDataNewCdDvdDrive } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
-import { UI_I_Localization, UI_I_HTMLSelectElement } from '~/models/interfaces'
-import { UI_I_ErrorValidationField } from '~/models/store/interfaces'
-import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
-import { UI_I_FolderOrFileTreePayload } from '~/models/store/storage/interfaces'
-import { UI_T_CdDvdType } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/types'
-import { cdDvdDriveOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/config/options'
-import { fileTypesFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/config/fileTypes'
-
-const props = defineProps<{
-  hardDisksCount: number
-  index: number
-  cdDvdDrive: UI_I_SendDataNewCdDvdDrive
-  nodes: UI_I_FileTreeNode[]
-  files: UI_I_FileTreeNode[]
-  errorValidationFields: UI_I_ErrorValidationField<string>[]
-  type: UI_T_CdDvdType
-  isEdit: boolean
-  state?: string | number
-}>()
-
-const emits = defineEmits<{
-  (event: 'send-data', value: UI_I_SendDataNewCdDvdDrive): void
-  (event: 'remove'): void
-  (event: 'roll-back'): void
-  (event: 'remove-error-by-title', value: string): void
-  (event: 'get-storage', value: UI_I_TablePayload): void
-  (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
-  (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
-  (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
-}>()
-
-const localization = computed<UI_I_Localization>(() => useLocal())
-
-const isRunning = computed<boolean>(() => {
-  return props.state === 2
-})
-
-const isRemovable = computed<boolean>(() => {
-  return (
-    !props.isEdit ||
-    !isRunning.value ||
-    (isRunning.value && bus.value === 'virtio')
-  )
-})
-
-const indexByHardDisks = computed<number>(
-  () => props.index + props.hardDisksCount
-)
-
-const label = computed<string>(() => {
-  if (props.type === 'edit' || props.type === 'removed')
-    return `${localization.value.cdDvdDrive} ${props.index + 1}`
-
-  return `${localization.value.newCdDvdDrive} *`
-})
-
-const busValidationType = computed<string>(
-  () => `disk_devices[${indexByHardDisks}].bus`
-)
-
-const selectedCdDvdDrive = ref<UI_T_CdDvdDrive>('clientDevice')
-const cdDvdDriveOptions = ref<UI_I_OptionItem[]>(
-  cdDvdDriveOptionsFunc(localization.value)
-)
-const changeCdDvdDrive = (event: UI_I_HTMLSelectElement): void => {
-  const isDatastoreIsoFile = event.target.value === 'datastoreIsoFile'
-  if (!isDatastoreIsoFile) return
-
-  isShowFileModal.value = true
-}
-const isShowFileModal = ref<boolean>(false)
-const onSelectFile = (file: UI_I_FileTreeNode): void => {
-  cdDvdMedia.value = file.path
-}
-const fileTypes = computed<UI_I_OptionItem[]>(() =>
-  fileTypesFunc(localization.value)
-)
-
-const onRemoveCdDvdDrive = (): void => {
-  emits('remove')
-}
-const onRollBackCdDvdDrive = (): void => {
-  emits('roll-back')
-}
-
-const cdDvdMedia = ref<string>('')
-const bus = ref<string>('ide')
-
-const deleteFilesFromDatastore = ref<boolean>(false)
-
-watch(
-  [cdDvdMedia, bus, deleteFilesFromDatastore, () => props.type],
-  () => {
-    emits('send-data', {
-      create: props.cdDvdDrive.create,
-      attach: props.cdDvdDrive.attach,
-      source: cdDvdMedia.value,
-      size: 0,
-      bus: bus.value,
-      device_type: 'cdrom',
-      provision_type: 'thick',
-      disk_mode: 'dependent',
-      sharing: false,
-      read_only: true,
-      shares: 0,
-      cache: 'none',
-      io: 'native',
-      limit_iops: 0,
-      discard: 'unmap',
-      target: props.cdDvdDrive.target,
-      boot_order: props.cdDvdDrive.boot_order,
-      detach: props.type === 'removed',
-      remove: props.type === 'removed' && deleteFilesFromDatastore.value, // Проверяем если удалили диск и указали Delete files from datastore
-    })
-  },
-  { immediate: true }
-)
-
-// Добавляем данные для редактирования
-watch(
-  () => props.cdDvdDrive,
-  (newValue) => {
-    if (newValue.source !== '') {
-      selectedCdDvdDrive.value = 'datastoreIsoFile'
-      cdDvdMedia.value = newValue.source
-    }
-    if (newValue.bus !== '') {
-      bus.value = newValue.bus
-    }
-  },
-  { immediate: true }
-)
-watch(
-  isRunning,
-  (newValue) => {
-    if (newValue && props.type === 'new') {
-      bus.value = 'virtio'
-    }
-  },
-  { immediate: true }
-)
-</script>
-
-<style lang="scss" scoped></style>
+<template>
+  <div class="hardware-cd-dvd-drive">
+    <atoms-stack-block
+      :has-children="true"
+      :is-roll-back="props.type === 'removed'"
+      :removable="isRemovable"
+      @remove="onRemoveCdDvdDrive"
+      @roll-back="onRollBackCdDvdDrive"
+    >
+      <template #stackBlockKey>
+        <div
+          class="vm-wizard-toggle-block-cd-dvd-drive vm-wizard-toggle-block-hard-disk"
+        >
+          <span>{{ label }}</span>
+        </div>
+      </template>
+      <template #stackBlockContent>
+        <div class="flex-align-center flex-space-between">
+          <template v-if="props.type === 'removed'">
+            <span>{{ localization.deviceWillRemoved }}</span>
+            <div @click.stop class="flex-align-center">
+              <input
+                :id="`cd-dvd-delete-files-from-datastore-${props.index}`"
+                v-model="deleteFilesFromDatastore"
+                :disabled="props.disabled"
+                type="checkbox"
+                class="pointer"
+                @click.stop
+              />
+              <label
+                :for="`cd-dvd-delete-files-from-datastore-${props.index}`"
+                :class="[
+                  'label-text-normal pointer',
+                  props.disabled && 'div-disabled',
+                ]"
+                >{{ localization.deleteFilesFromDatastore }}</label
+              >
+            </div>
+          </template>
+          <template v-else>
+            <div class="select">
+              <select
+                id="vm-wizard-cd-dvd-drive-field"
+                v-model="selectedCdDvdDrive"
+                class="vm-wizard-cd-dvd-drive-field input-text-color"
+                @click.stop
+                @change="changeCdDvdDrive"
+              >
+                <option
+                  v-for="(item, key) in cdDvdDriveOptions"
+                  :key="key"
+                  :value="item.value"
+                >
+                  {{ item.text }}
+                </option>
+              </select>
+            </div>
+          </template>
+        </div>
+      </template>
+      <template #stackChildren>
+        <common-vm-actions-add-customize-hardware-virtual-hardware-cd-dvd-drive-media
+          v-if="selectedCdDvdDrive === 'datastoreIsoFile'"
+          v-model:cd-dvd-media="cdDvdMedia"
+          @browse="isShowFileModal = true"
+        />
+
+        <common-vm-actions-add-customize-hardware-virtual-hardware-bus
+          v-model:bus="bus"
+          :index="indexByHardDisks"
+          :validation-type="busValidationType"
+          :error-validation-fields="props.errorValidationFields"
+          :disabled="isRunning"
+          component-type="disk_devices"
+          @remove-error-by-title="emits('remove-error-by-title', $event)"
+        />
+      </template>
+    </atoms-stack-block>
+
+    <Teleport to="body">
+      <common-vm-actions-add-customize-hardware-virtual-hardware-browse-view
+        v-if="isShowFileModal"
+        :show="isShowFileModal"
+        :file-types="fileTypes"
+        :nodes="props.nodes"
+        :files="props.files"
+        @submit="onSelectFile"
+        @get-storage="emits('get-storage', $event)"
+        @get-folders-or-files="emits('get-folders-or-files', $event)"
+        @get-active-device-child="emits('get-active-device-child', $event)"
+        @show-datastore-child="emits('show-datastore-child', $event)"
+        @hide="isShowFileModal = false"
+      />
+    </Teleport>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { UI_I_FileTreeNode } from '~/components/models/interfaces'
+import { UI_I_TablePayload } from '~/models/store/interfaces'
+import { UI_T_CdDvdDrive } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/models/types'
+import { UI_I_SendDataNewCdDvdDrive } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/interfaces'
+import { UI_I_Localization, UI_I_HTMLSelectElement } from '~/models/interfaces'
+import { UI_I_ErrorValidationField } from '~/models/store/interfaces'
+import { UI_I_OptionItem } from '~/components/atoms/models/interfaces'
+import { UI_I_FolderOrFileTreePayload } from '~/models/store/storage/interfaces'
+import { UI_T_CdDvdType } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/models/types'
+import { cdDvdDriveOptionsFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/config/options'
+import { fileTypesFunc } from '~/components/common/vm/actions/add/customizeHardware/virtualHardware/cdDvdDrive/config/fileTypes'
+
+const props = defineProps<{
+  hardDisksCount: number
+  index: number
+  cdDvdDrive: UI_I_SendDataNewCdDvdDrive
+  nodes: UI_I_FileTreeNode[]
+  files: UI_I_FileTreeNode[]
+  errorValidationFields: UI_I_ErrorValidationField<string>[]
+  type: UI_T_CdDvdType
+  isEdit: boolean
+  state?: string | number
+}>()
+
+const emits = defineEmits<{
+  (event: 'send-data', value: UI_I_SendDataNewCdDvdDrive): void
+  (event: 'remove'): void
+  (event: 'roll-back'): void
+  (event: 'remove-error-by-title', value: string): void
+  (event: 'get-storage', value: UI_I_TablePayload): void
+  (event: 'get-folders-or-files', value: UI_I_FolderOrFileTreePayload): void
+  (event: 'get-active-device-child', value: UI_I_FileTreeNode): void
+  (event: 'show-datastore-child', value: UI_I_FileTreeNode): void
+}>()
+
+const localization = computed<UI_I_Localization>(() => useLocal())
+
+const isRunning = computed<boolean>(() => {
+  return props.state === 2
+})
+
+const isRemovable = computed<boolean>(() => {
+  return (
+    !props.isEdit ||
+    !isRunning.value ||
+    (isRunning.value && bus.value === 'virtio')
+  )
+})
+
+const indexByHardDisks = computed<number>(
+  () => props.index + props.hardDisksCount
+)
+
+const label = computed<string>(() => {
+  if (props.type === 'edit' || props.type === 'removed')
+    return `${localization.value.cdDvdDrive} ${props.index + 1}`
+
+  return `${localization.value.newCdDvdDrive} *`
+})
+
+const busValidationType = computed<string>(
+  () => `disk_devices[${indexByHardDisks}].bus`
+)
+
+const selectedCdDvdDrive = ref<UI_T_CdDvdDrive>('clientDevice')
+const cdDvdDriveOptions = ref<UI_I_OptionItem[]>(
+  cdDvdDriveOptionsFunc(localization.value)
+)
+const changeCdDvdDrive = (event: UI_I_HTMLSelectElement): void => {
+  const isDatastoreIsoFile = event.target.value === 'datastoreIsoFile'
+  if (!isDatastoreIsoFile) return
+
+  isShowFileModal.value = true
+}
+const isShowFileModal = ref<boolean>(false)
+const onSelectFile = (file: UI_I_FileTreeNode): void => {
+  cdDvdMedia.value = file.path
+}
+const fileTypes = computed<UI_I_OptionItem[]>(() =>
+  fileTypesFunc(localization.value)
+)
+
+const onRemoveCdDvdDrive = (): void => {
+  emits('remove')
+}
+const onRollBackCdDvdDrive = (): void => {
+  emits('roll-back')
+}
+
+const cdDvdMedia = ref<string>('')
+const bus = ref<string>('ide')
+
+const deleteFilesFromDatastore = ref<boolean>(false)
+
+watch(
+  [cdDvdMedia, bus, deleteFilesFromDatastore, () => props.type],
+  () => {
+    emits('send-data', {
+      create: props.cdDvdDrive.create,
+      attach: props.cdDvdDrive.attach,
+      source: cdDvdMedia.value,
+      size: 0,
+      bus: bus.value,
+      device_type: 'cdrom',
+      provision_type: 'thick',
+      disk_mode: 'dependent',
+      sharing: false,
+      read_only: true,
+      shares: 0,
+      cache: 'none',
+      io: 'native',
+      limit_iops: 0,
+      discard: 'unmap',
+      target: props.cdDvdDrive.target,
+      boot_order: props.cdDvdDrive.boot_order,
+      detach: props.type === 'removed',
+      remove: props.type === 'removed' && deleteFilesFromDatastore.value, // Проверяем если удалили диск и указали Delete files from datastore
+    })
+  },
+  { immediate: true }
+)
+
+// Добавляем данные для редактирования
+watch(
+  () => props.cdDvdDrive,
+  (newValue) => {
+    if (newValue.source !== '') {
+      selectedCdDvdDrive.value = 'datastoreIsoFile'
+      cdDvdMedia.value = newValue.source
+    }
+    if (newValue.bus !== '') {
+      bus.value = newValue.bus
+    }
+  },
+  { immediate: true }
+)
+watch(
+  isRunning,
+  (newValue) => {
+    if (newValue && props.type === 'new') {
+      bus.value = 'virtio'
+    }
+  },
+  { immediate: true }
+)
+</script>
+
+<style lang="scss" scoped></style>

package/components/common/vm/actions/add/customizeHardware/virtualHardware/cpu/Cpu.vue

@@ -170,11 +170,11 @@ const isCpuDisabled = computed<boolean>(
 )
 watch(selectedCpu, (newValue) => {
   selectedCpu.value = Math.floor(+newValue)
-  if (!(selectedCpu.value % selectedCorePerSocket.value)) return
+  if (!(selectedCpu.value % selectedCorePerSocket.value) || props.isEdit) return
   selectedCorePerSocket.value = 1
 })
 const maxCpuOptions = computed<UI_I_OptionItem[]>(() =>
-  cpuOptionsFunc(localization.value, selectedCpu.value + 1, props.maxCpus)
+  cpuOptionsFunc(localization.value, selectedCpu.value, props.maxCpus)
 )
 watch(selectedCpu, (newValue) => {
   if (newValue >= props.maxCpus) {

package/components/common/vm/actions/add/customizeHardware/virtualHardware/newNetwork/NewNetwork.vue

@@ -202,6 +202,8 @@ const onSelectLocation = (network: UI_I_NetworkTableItem): void => {
 
 const adapterType = ref<string>('rtl8139')
 
+const target = ref<string>('')
+
 const macAddress = ref<string>('')
 const macAddressType = ref<string>('automatic')
 const newNetworkInvalid = ref<boolean>(false)
@@ -224,7 +226,7 @@ watch(
     emits('send-data', {
       network: option.text,
       net_bridge: option.value,
-      target: '',
+      target: target.value,
       model: adapterType.value,
       mac: macAddress.value,
       boot_order: props.network.boot_order,
@@ -247,6 +249,7 @@ watch(
 
     adapterType.value = newValue.model
     macAddress.value = newValue.mac
+    target.value = newValue.target
   },
   { immediate: true }
 )

package/package.json

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