diff options
author | Vitalii Lysak <v.lysak@dunice.net> | 2022-09-22 11:59:04 +0300 |
---|---|---|
committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-09-22 11:59:04 +0300 |
commit | 30b2f231d4f3dfe0a065acbf359d385cd2cb4eef (patch) | |
tree | 4ffd7738ffb6942aa67c56748859f86b60b737b5 | |
parent | c2d624cace23e834238649ee1f96e71854d2bc63 (diff) | |
download | webui-vue-30b2f231d4f3dfe0a065acbf359d385cd2cb4eef.tar.xz |
SILABMC-316: upd charts by time zone
-rw-r--r-- | src/store/modules/HardwareStatus/FanStore.js | 8 | ||||
-rw-r--r-- | src/store/modules/HardwareStatus/MemoryStore.js | 8 | ||||
-rw-r--r-- | src/store/modules/HardwareStatus/MotherboardStore.js | 8 | ||||
-rw-r--r-- | src/store/modules/HardwareStatus/PowerSupplyStore.js | 7 | ||||
-rw-r--r-- | src/store/modules/HardwareStatus/ProcessorStore.js | 14 | ||||
-rw-r--r-- | src/utilities/_sila/convertTimeZone.js | 12 |
6 files changed, 40 insertions, 17 deletions
diff --git a/src/store/modules/HardwareStatus/FanStore.js b/src/store/modules/HardwareStatus/FanStore.js index 69e18532..767e6512 100644 --- a/src/store/modules/HardwareStatus/FanStore.js +++ b/src/store/modules/HardwareStatus/FanStore.js @@ -1,5 +1,7 @@ import api from '@/store/api'; import i18n from '@/i18n'; +import store from '@/store'; +import { getOffsetByTimeZone } from '@/utilities/_sila/convertTimeZone'; const FanStore = { namespaced: true, @@ -95,11 +97,11 @@ const FanStore = { }, async getFans({ commit }, { lastHour }) { let url = null; + let offset = getOffsetByTimeZone(store.getters['global/timeZone']); if (lastHour) { - url = - '/redfish/v1/TelemetryService/MetricReports/fans&period=last_hour'; + url = `/redfish/v1/TelemetryService/MetricReports/fans&period=last_hour&timezone=${offset}`; } else { - url = '/redfish/v1/TelemetryService/MetricReports/fans'; + url = `/redfish/v1/TelemetryService/MetricReports/fans&timezone=${offset}`; } return await api .get(url) diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js index 5a116f63..e21bb8a5 100644 --- a/src/store/modules/HardwareStatus/MemoryStore.js +++ b/src/store/modules/HardwareStatus/MemoryStore.js @@ -1,5 +1,7 @@ import api from '@/store/api'; import i18n from '@/i18n'; +import { getOffsetByTimeZone } from '@/utilities/_sila/convertTimeZone'; +import store from '@/store'; const MemoryStore = { namespaced: true, @@ -108,11 +110,11 @@ const MemoryStore = { }, async getMemoryDynamic({ commit }, { lastHour }) { let url = null; + let offset = getOffsetByTimeZone(store.getters['global/timeZone']); if (lastHour) { - url = - '/redfish/v1/TelemetryService/MetricReports/dimm_temp&period=last_hour'; + url = `/redfish/v1/TelemetryService/MetricReports/dimm_temp&period=last_hour&timezone=${offset}`; } else { - url = '/redfish/v1/TelemetryService/MetricReports/dimm_temp'; + url = `/redfish/v1/TelemetryService/MetricReports/dimm_temp&timezone=${offset}`; } return await api .get(url) diff --git a/src/store/modules/HardwareStatus/MotherboardStore.js b/src/store/modules/HardwareStatus/MotherboardStore.js index 0f54b529..b72d08af 100644 --- a/src/store/modules/HardwareStatus/MotherboardStore.js +++ b/src/store/modules/HardwareStatus/MotherboardStore.js @@ -1,5 +1,7 @@ import api from '@/store/api'; import i18n from '@/i18n'; +import { getOffsetByTimeZone } from '@/utilities/_sila/convertTimeZone'; +import store from '@/store'; const MotherboardStore = { namespaced: true, @@ -51,11 +53,11 @@ const MotherboardStore = { }, async getMotherboardDynamic({ commit }, { lastHour }) { let url = null; + let offset = getOffsetByTimeZone(store.getters['global/timeZone']); if (lastHour) { - url = - '/redfish/v1/TelemetryService/MetricReports/other_temp&period=last_hour'; + url = `/redfish/v1/TelemetryService/MetricReports/other_temp&period=last_hour&timezone=${offset}`; } else { - url = '/redfish/v1/TelemetryService/MetricReports/other_temp'; + url = `/redfish/v1/TelemetryService/MetricReports/other_temp&timezone=${offset}`; } return await api .get(url) diff --git a/src/store/modules/HardwareStatus/PowerSupplyStore.js b/src/store/modules/HardwareStatus/PowerSupplyStore.js index 7ff2909d..5dec47a6 100644 --- a/src/store/modules/HardwareStatus/PowerSupplyStore.js +++ b/src/store/modules/HardwareStatus/PowerSupplyStore.js @@ -1,5 +1,7 @@ import api from '@/store/api'; import i18n from '@/i18n'; +import { getOffsetByTimeZone } from '@/utilities/_sila/convertTimeZone'; +import store from '@/store'; const PowerSupplyStore = { namespaced: true, @@ -172,10 +174,11 @@ const PowerSupplyStore = { }, async getPsu({ commit }, { lastHour, metricsName }) { let url = null; + let offset = getOffsetByTimeZone(store.getters['global/timeZone']); if (lastHour) { - url = `/redfish/v1/TelemetryService/MetricReports/${metricsName}&period=last_hour`; + url = `/redfish/v1/TelemetryService/MetricReports/${metricsName}&period=last_hour&timezone=${offset}`; } else { - url = `/redfish/v1/TelemetryService/MetricReports/${metricsName}`; + url = `/redfish/v1/TelemetryService/MetricReports/${metricsName}&timezone=${offset}`; } return await api .get(url) diff --git a/src/store/modules/HardwareStatus/ProcessorStore.js b/src/store/modules/HardwareStatus/ProcessorStore.js index e270ed12..f43b7e37 100644 --- a/src/store/modules/HardwareStatus/ProcessorStore.js +++ b/src/store/modules/HardwareStatus/ProcessorStore.js @@ -1,5 +1,7 @@ import api from '@/store/api'; import i18n from '@/i18n'; +import { getOffsetByTimeZone } from '@/utilities/_sila/convertTimeZone'; +import store from '@/store'; const ProcessorStore = { namespaced: true, @@ -122,11 +124,11 @@ const ProcessorStore = { }, async getCpuPowerDynamic({ commit }, { lastHour }) { let url = null; + let offset = getOffsetByTimeZone(store.getters['global/timeZone']); if (lastHour) { - url = - '/redfish/v1/TelemetryService/MetricReports/power&period=last_hour'; + url = `/redfish/v1/TelemetryService/MetricReports/power&period=last_hour&timezone=${offset}`; } else { - url = '/redfish/v1/TelemetryService/MetricReports/power'; + url = `/redfish/v1/TelemetryService/MetricReports/power&timezone=${offset}`; } return await api .get(url) @@ -141,11 +143,11 @@ const ProcessorStore = { }, async getCpuTempDynamic({ commit }, { lastHour }) { let url = null; + let offset = getOffsetByTimeZone(store.getters['global/timeZone']); if (lastHour) { - url = - '/redfish/v1/TelemetryService/MetricReports/cpu_temp&period=last_hour'; + url = `/redfish/v1/TelemetryService/MetricReports/cpu_temp&period=last_hour&timezone=${offset}`; } else { - url = '/redfish/v1/TelemetryService/MetricReports/cpu_temp'; + url = `/redfish/v1/TelemetryService/MetricReports/cpu_temp&timezone=${offset}`; } return await api .get(url) diff --git a/src/utilities/_sila/convertTimeZone.js b/src/utilities/_sila/convertTimeZone.js index 67a1d106..95d895de 100644 --- a/src/utilities/_sila/convertTimeZone.js +++ b/src/utilities/_sila/convertTimeZone.js @@ -9,3 +9,15 @@ export function getDateByTimeZone(date, tzString) { }) ); } + +export function getOffsetByTimeZone(tzString) { + if (!tzString) { + return; + } + + const strOffset = tzString.split(' ')[0]; + return strOffset.substring( + strOffset.indexOf('C') + 1, + strOffset.indexOf(')') + ); +} |