summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Lysak <v.lysak@dunice.net>2022-08-17 10:01:26 +0300
committerVitalii Lysak <v.lysak@dunice.net>2022-08-17 10:01:26 +0300
commit0237b9c60425bbcd2417bf31000cbd74d0112645 (patch)
tree8b859a1fc8eaac0585af541dbf16b2f1e98c7fda
parentabfcb75c06375d3159a718334bca563feafcc466 (diff)
downloadwebui-vue-0237b9c60425bbcd2417bf31000cbd74d0112645.tar.xz
SILABMC-256: add fields for power, temp
-rw-r--r--src/locales/en-US.json3
-rw-r--r--src/locales/ru-RU.json3
-rw-r--r--src/store/modules/HardwareStatus/PowerSupplyStore.js34
-rw-r--r--src/views/_sila/Power/Dynamic/PowerTemp.vue85
4 files changed, 101 insertions, 24 deletions
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index 87892373..7ccf4654 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -949,6 +949,9 @@
"warning": "Meaning of the warning",
"shutdown": "Shutdown"
},
+ "toast": {
+ "errorLimitUpdate": "Limit update error"
+ },
"table": {
"param": "Parameter",
"value": "Значение",
diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json
index ce293d8f..83cf8b2e 100644
--- a/src/locales/ru-RU.json
+++ b/src/locales/ru-RU.json
@@ -943,6 +943,9 @@
"OutputVolt": "Выходное напряжение",
"InputCurrent": "Входная сила тока",
"OutputCurrent": "Выходная сила тока",
+ "toast": {
+ "errorLimitUpdate": "Ошибка обновления предела"
+ },
"labels": {
"notNormal": "Не штатный режим",
"critical": "Критический режим",
diff --git a/src/store/modules/HardwareStatus/PowerSupplyStore.js b/src/store/modules/HardwareStatus/PowerSupplyStore.js
index 775e86e8..01f70156 100644
--- a/src/store/modules/HardwareStatus/PowerSupplyStore.js
+++ b/src/store/modules/HardwareStatus/PowerSupplyStore.js
@@ -1,4 +1,5 @@
import api from '@/store/api';
+import i18n from '@/i18n';
const PowerSupplyStore = {
namespaced: true,
@@ -12,6 +13,7 @@ const PowerSupplyStore = {
psuCurrent: [],
psuCurrentLastHour: [],
powerSupplies: [],
+ limitsTemp: [],
},
getters: {
powerSupplies: (state) => state.powerSupplies,
@@ -23,6 +25,7 @@ const PowerSupplyStore = {
psuVoltageLastHour: (state) => state.psuVoltageLastHour,
psuCurrent: (state) => state.psuCurrent,
psuCurrentLastHour: (state) => state.psuCurrentLastHour,
+ limitsTemp: (state) => state.limitsTemp,
},
mutations: {
setPowerSupply: (state, data) => {
@@ -84,8 +87,39 @@ const PowerSupplyStore = {
setpsu_currentLastHour: (state, data) => {
state.psuCurrentLastHour = data;
},
+ setLimitsTemp: (state, data) => {
+ state.limitsTemp = data;
+ },
},
actions: {
+ async patchLimitsTemp({ dispatch }, { warning, groups }) {
+ return Promise.all(
+ groups.map(
+ async (group) =>
+ await api.patch('/redfish/v1/Chassis/SILA_Baseboard/Thermal', {
+ Temperatures: [
+ {
+ MemberId: group,
+ UpperThresholdNonCritical: warning,
+ },
+ ],
+ })
+ )
+ )
+ .catch((error) => {
+ console.log(error);
+ throw new Error(i18n.t('pagePowerSup.toast.errorLimitUpdate'));
+ })
+ .finally(() => dispatch('getLimitsTemp'));
+ },
+ async getLimitsTemp({ commit }) {
+ return await api
+ .get('/redfish/v1/Chassis/SILA_Baseboard/Thermal')
+ .then(({ data: { Temperatures = [] } }) => {
+ commit('setLimitsTemp', Temperatures);
+ })
+ .catch((error) => console.log(error));
+ },
async getPsu({ commit }, { lastHour, metricsName }) {
let url = null;
if (lastHour) {
diff --git a/src/views/_sila/Power/Dynamic/PowerTemp.vue b/src/views/_sila/Power/Dynamic/PowerTemp.vue
index e0d4d154..1d18e8b1 100644
--- a/src/views/_sila/Power/Dynamic/PowerTemp.vue
+++ b/src/views/_sila/Power/Dynamic/PowerTemp.vue
@@ -8,43 +8,42 @@
<img src="@/assets/images/_sila/collapsed/temperature.svg" />
</template>
<page-section>
- <!-- <b-row class="align-items-end limit-container">
+ <b-row class="align-items-end limit-container">
<b-col xs="12" sm="6" xl="3" class="pt-4">
- <b-form-group :label="$t('pagePowerSup.labels.notNormal')">
+ <b-form-group :label="$t('pagePowerSup.labels.warning')">
<b-form-input
- v-model="notNormal"
+ v-model.number="warning"
type="number"
:min="0"
:max="100"
- ></b-form-input>
- </b-form-group>
- </b-col>
- <b-col xs="12" sm="6" xl="3" class="pt-4">
- <b-form-group :label="$t('pagePowerSup.labels.critical')">
- <b-form-input v-model="critical" type="number" :min="0" :max="100">
+ >
</b-form-input>
</b-form-group>
</b-col>
<b-col xs="12" sm="6" xl="3" class="pt-4">
- <b-form-group :label="$t('pagePowerSup.labels.warning')">
- <b-form-input v-model="warning" type="number" :min="0" :max="100">
+ <b-form-group :label="$t('pagePowerSup.labels.critical')">
+ <b-form-input
+ v-model.number="critical"
+ type="number"
+ :min="0"
+ :max="100"
+ >
</b-form-input>
</b-form-group>
</b-col>
<b-col xs="12" sm="6" xl="3" class="pt-4">
- <b-button variant="primary" style="height: 35px">
+ <b-button variant="primary" style="height: 35px" @click="saveLimit">
{{ $t('global.action.save') }}
</b-button>
</b-col>
- </b-row> -->
+ </b-row>
<chart
type="processors"
:time-scale="timeScale"
:data="allSensors"
:colors="colors"
- :warning="+warning"
- :not-normal="+notNormal"
- :critical="+critical"
+ :warning="warningLimit"
+ :critical="criticalLimit"
></chart>
<b-table
responsive="md"
@@ -90,13 +89,14 @@ import PageSection from '@/components/Global/PageSection';
import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin';
import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin';
import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin';
+import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin';
import Collapse from '@/components/_sila/Global/Collapse';
-import { getItems } from '@/utilities/_sila/metricProperties';
+import { getGroups, getItems } from '@/utilities/_sila/metricProperties';
export default {
components: { PageSection, Chart, Collapse },
- mixins: [DataFormatterMixin, TableFilterMixin, LoadingBarMixin],
+ mixins: [DataFormatterMixin, TableFilterMixin, LoadingBarMixin, BVToastMixin],
props: {
timeScale: {
type: String,
@@ -105,9 +105,8 @@ export default {
},
data() {
return {
- warning: 72,
- notNormal: 44,
- critical: 55,
+ warning: null,
+ critical: null,
isBusy: true,
fields: [
{
@@ -144,10 +143,35 @@ export default {
},
computed: {
+ groups() {
+ return getGroups(this.allSensors);
+ },
+
items() {
return getItems(this.allSensors);
},
+ limits() {
+ return this.$store.getters['powerSupply/limitsTemp'];
+ },
+
+ warningLimit() {
+ return this.limits.find((limit) => {
+ return (
+ limit?.UpperThresholdNonCritical &&
+ this.groups.includes(limit.MemberId)
+ );
+ })?.UpperThresholdNonCritical;
+ },
+
+ criticalLimit() {
+ return this.limits.find((limit) => {
+ return (
+ limit?.UpperThresholdCritical && this.groups.includes(limit.MemberId)
+ );
+ })?.UpperThresholdCritical;
+ },
+
allSensors() {
return this.timeScale === 'hour'
? this.$store.getters['powerSupply/psuTempLastHour']
@@ -171,6 +195,16 @@ export default {
this.loadData();
},
methods: {
+ saveLimit() {
+ this.startLoader();
+ this.$store
+ .dispatch('powerSupply/patchLimitsTemp', {
+ warning: this.warning,
+ groups: this.groups,
+ })
+ .catch(({ message }) => this.errorToast(message))
+ .finally(() => this.endLoader());
+ },
onOpened(state) {
if (state) {
this.loadData();
@@ -183,9 +217,12 @@ export default {
}
this.startLoader();
this.$store.dispatch('powerSupply/getPsu', payload).finally(() => {
- this.$root.$emit('psu-temp');
- this.isBusy = false;
- this.endLoader();
+ this.$store.dispatch('powerSupply/getLimitsTemp').finally(() => {
+ this.warning = this.warningLimit;
+ this.critical = this.criticalLimit;
+ this.endLoader();
+ this.isBusy = false;
+ });
});
},
},