From 30b2f231d4f3dfe0a065acbf359d385cd2cb4eef Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Thu, 22 Sep 2022 11:59:04 +0300 Subject: SILABMC-316: upd charts by time zone --- src/store/modules/HardwareStatus/FanStore.js | 8 +++++--- src/store/modules/HardwareStatus/MemoryStore.js | 8 +++++--- src/store/modules/HardwareStatus/MotherboardStore.js | 8 +++++--- src/store/modules/HardwareStatus/PowerSupplyStore.js | 7 +++++-- src/store/modules/HardwareStatus/ProcessorStore.js | 14 ++++++++------ 5 files changed, 28 insertions(+), 17 deletions(-) (limited to 'src/store/modules/HardwareStatus') 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) -- cgit v1.2.3