From 7cba13534cda94a1efdbad2ff8dbe68de1fbeaa3 Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Thu, 21 Jul 2022 20:56:53 +0300 Subject: add charts for fans and processors --- src/env/components/AppNavigation/sila.js | 16 ++++++++ src/env/router/sila.js | 18 +++++++++ src/locales/en-US.json | 5 ++- src/locales/ru-RU.json | 6 ++- src/store/modules/HardwareStatus/MemoryStore.js | 12 ++++++ src/store/modules/_sila/HardwareStatus/FanStore.js | 12 ++++++ src/views/_sila/Fans/Dynamic/FansDynamicPage.vue | 44 ++++++++++++++++++++++ src/views/_sila/Fans/Dynamic/index.js | 2 + .../_sila/Memory/Dynamic/MemoryDynamicPage.vue | 44 ++++++++++++++++++++++ src/views/_sila/Memory/Dynamic/index.js | 2 + .../Processors/Dynamic/ProcessorsDynamicPage.vue | 16 ++++++-- 11 files changed, 171 insertions(+), 6 deletions(-) create mode 100644 src/views/_sila/Fans/Dynamic/FansDynamicPage.vue create mode 100644 src/views/_sila/Fans/Dynamic/index.js create mode 100644 src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue create mode 100644 src/views/_sila/Memory/Dynamic/index.js (limited to 'src') diff --git a/src/env/components/AppNavigation/sila.js b/src/env/components/AppNavigation/sila.js index e3a8a380..4f47342e 100644 --- a/src/env/components/AppNavigation/sila.js +++ b/src/env/components/AppNavigation/sila.js @@ -69,6 +69,11 @@ const AppNavigationMixin = { label: this.$t('appNavigation.staticInfo'), route: '/fans/static', }, + { + id: 'fans/dynamic', + label: this.$t('appNavigation.dynamicInformation'), + route: '/fans/dynamic', + }, ], }, { @@ -117,6 +122,17 @@ const AppNavigationMixin = { }, ], }, + { + id: 'memory', + label: this.$t('appNavigation.memory'), + children: [ + { + id: 'memory/dynamic', + label: this.$t('appNavigation.dynamicInformation'), + route: '/memory/dynamic', + }, + ], + }, { id: 'processors', label: this.$t('appNavigation.processors'), diff --git a/src/env/router/sila.js b/src/env/router/sila.js index f297b369..4a5d5b71 100644 --- a/src/env/router/sila.js +++ b/src/env/router/sila.js @@ -31,6 +31,8 @@ import VirtualMedia from '@/views/_sila/Operations/VirtualMedia'; import Power from '@/views/_sila/ResourceManagement/Power'; import FansStatic from '@/views/_sila/Fans/Static'; import ProcessorsDynamic from '@/views/_sila/Processors/Dynamic'; +import MemoryDynamic from '@/views/_sila/Memory/Dynamic'; +import FansDynamic from '@/views/_sila/Fans/Dynamic'; import i18n from '@/i18n'; const routes = [ @@ -161,6 +163,14 @@ const routes = [ title: i18n.t('appPageTitle.fans'), }, }, + { + path: 'memory/dynamic', + name: 'memory-dynamic', + component: MemoryDynamic, + meta: { + title: i18n.t('appPageTitle.memory'), + }, + }, { path: 'processors/dynamic', name: 'processors-dynamic', @@ -169,6 +179,14 @@ const routes = [ title: i18n.t('appPageTitle.processors'), }, }, + { + path: 'fans/dynamic', + name: 'fans-dynamic', + component: FansDynamic, + meta: { + title: i18n.t('appPageTitle.fans'), + }, + }, { path: '/security-and-access/sessions', name: 'sessions', diff --git a/src/locales/en-US.json b/src/locales/en-US.json index ecdf71ad..1ec41e9e 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -131,7 +131,9 @@ "keyClear": "@:appPageTitle.keyClear", "staticInfo": "Static Information", "fans": "@:appPageTitle.fans", - "processors": "@:appPageTitle.processors" + "processors": "@:appPageTitle.processors", + "memory": "@:appPageTitle.memory", + "fans": "@:appPageTitle.fans" }, "appPageTitle": { "changePassword": "Change password", @@ -143,6 +145,7 @@ "factoryReset": "Factory reset", "fans": "Fans", "processors": "Processors", + "memory": "Memory modules", "firmware": "Firmware", "inventory": "Inventory and LEDs", "kvm": "KVM", diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 5c237cdf..9bc62183 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -108,6 +108,8 @@ "settings": "Настройки", "operations": "Управление", "processors": "Процессоры", + "memory": "Модули памяти", + "fans": "Ветиляторы", "dateTime": "@:appPageTitle.dateTime", "dumps": "@:appPageTitle.dumps", "eventLogs": "@:appPageTitle.eventLogs", @@ -136,7 +138,8 @@ "keyClear": "@:appPageTitle.keyClear", "staticInfo": "Статическая информация", "fans": "@:appPageTitle.fans", - "processors": "@:appPageTitle.processors" + "processors": "@:appPageTitle.processors", + "memory": "@:appPageTitle.memory" }, "appPageTitle": { "changePassword": "Изменить пароль", @@ -148,6 +151,7 @@ "factoryReset": "Сброс до заводских настроек", "fans": "Вентиляторы", "processors": "Процессоры", + "memory": "Модули памяти", "firmware": "Встроенное ПО", "inventory": "Перечень оборудования и LED", "kvm": "KVM", diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js index fd8f0a91..9d79ad10 100644 --- a/src/store/modules/HardwareStatus/MemoryStore.js +++ b/src/store/modules/HardwareStatus/MemoryStore.js @@ -52,8 +52,20 @@ const MemoryStore = { }; }); }, + + setMemoryDynamic: (state, data) => { + state.dimms = data; + }, }, actions: { + async getMemoryDynamic({ commit }) { + return await api + .get('/redfish/v1/TelemetryService/MetricReports/hour_data&dimm_temp') + .then(({ data: { MetricValues = [] } }) => + commit('setMemoryDynamic', MetricValues) + ) + .catch((error) => console.log(error)); + }, async getDimms({ commit }) { return await api .get('/redfish/v1/Systems/system/Memory') diff --git a/src/store/modules/_sila/HardwareStatus/FanStore.js b/src/store/modules/_sila/HardwareStatus/FanStore.js index 1399710b..a7647f3d 100644 --- a/src/store/modules/_sila/HardwareStatus/FanStore.js +++ b/src/store/modules/_sila/HardwareStatus/FanStore.js @@ -39,8 +39,20 @@ const FanStore = { }; }); }, + + setFansDynamic: (state, data) => { + state.fans = data; + }, }, actions: { + async getFansDynamic({ commit }) { + return await api + .get('/redfish/v1/TelemetryService/MetricReports/hour_data&fans') + .then(({ data: { MetricValues = [] } }) => + commit('setFansDynamic', MetricValues) + ) + .catch((error) => console.log(error)); + }, async getFanInfo({ commit }) { return await api .get('/redfish/v1/Chassis/chassis/Thermal') diff --git a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue new file mode 100644 index 00000000..543eea33 --- /dev/null +++ b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/views/_sila/Fans/Dynamic/index.js b/src/views/_sila/Fans/Dynamic/index.js new file mode 100644 index 00000000..a3dadd5a --- /dev/null +++ b/src/views/_sila/Fans/Dynamic/index.js @@ -0,0 +1,2 @@ +import FansDynamicPage from './FansDynamicPage.vue'; +export default FansDynamicPage; diff --git a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue new file mode 100644 index 00000000..59f7cbc5 --- /dev/null +++ b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue @@ -0,0 +1,44 @@ + + + diff --git a/src/views/_sila/Memory/Dynamic/index.js b/src/views/_sila/Memory/Dynamic/index.js new file mode 100644 index 00000000..b840772c --- /dev/null +++ b/src/views/_sila/Memory/Dynamic/index.js @@ -0,0 +1,2 @@ +import MemoryDynamicPage from './MemoryDynamicPage.vue'; +export default MemoryDynamicPage; diff --git a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue index 29ec1997..8525b174 100644 --- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue +++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue @@ -1,4 +1,4 @@ -