mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-23 23:04:04 +00:00
Merge 9977dd2246
into c01494ec33
This commit is contained in:
commit
adb300cff9
2 changed files with 48 additions and 0 deletions
|
@ -962,6 +962,8 @@
|
||||||
"cellsyntSplitLongMessages": "Split long messages into up to 6 parts. 153 x 6 = 918 characters.",
|
"cellsyntSplitLongMessages": "Split long messages into up to 6 parts. 153 x 6 = 918 characters.",
|
||||||
"max 15 digits": "max 15 digits",
|
"max 15 digits": "max 15 digits",
|
||||||
"max 11 alphanumeric characters": "max 11 alphanumeric characters",
|
"max 11 alphanumeric characters": "max 11 alphanumeric characters",
|
||||||
|
"offlineMonitor": "Offline Monitor",
|
||||||
|
"offlineMonitors": "Offline Monitors",
|
||||||
"Community String": "Community String",
|
"Community String": "Community String",
|
||||||
"snmpCommunityStringHelptext": "This string functions as a password to authenticate and control access to SNMP-enabled devices. Match it with your SNMP device's configuration.",
|
"snmpCommunityStringHelptext": "This string functions as a password to authenticate and control access to SNMP-enabled devices. Match it with your SNMP device's configuration.",
|
||||||
"OID (Object Identifier)": "OID (Object Identifier)",
|
"OID (Object Identifier)": "OID (Object Identifier)",
|
||||||
|
|
|
@ -322,6 +322,30 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div v-if="$root.downMonitors?.length > 0" class="mb-4">
|
||||||
|
<div class="mb-5">
|
||||||
|
<h2 class="group-title">
|
||||||
|
{{ $t($root.downMonitors.length === 1 ? "offlineMonitor" : "offlineMonitors") }}
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<div class="shadow-box monitor-list mt-4 position-relative">
|
||||||
|
<div v-for="monitor in $root.downMonitors" :key="monitor.id" class="item">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-9 col-md-8 small-padding">
|
||||||
|
<div class="info">
|
||||||
|
<Uptime :monitor="monitor" type="24" :pill="true" />
|
||||||
|
{{ monitor.name }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div :key="$root.userHeartbeatBar" class="col-3 col-md-4">
|
||||||
|
<HeartbeatBar size="mid" :monitor-id="monitor.id" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<div v-if="$root.publicGroupList.length === 0 && loadedData" class="text-center">
|
<div v-if="$root.publicGroupList.length === 0 && loadedData" class="text-center">
|
||||||
<!-- 👀 Nothing here, please add a group or a monitor. -->
|
<!-- 👀 Nothing here, please add a group or a monitor. -->
|
||||||
|
@ -383,6 +407,8 @@ import { getResBaseURL } from "../util-frontend";
|
||||||
import { STATUS_PAGE_ALL_DOWN, STATUS_PAGE_ALL_UP, STATUS_PAGE_MAINTENANCE, STATUS_PAGE_PARTIAL_DOWN, UP, MAINTENANCE } from "../util.ts";
|
import { STATUS_PAGE_ALL_DOWN, STATUS_PAGE_ALL_UP, STATUS_PAGE_MAINTENANCE, STATUS_PAGE_PARTIAL_DOWN, UP, MAINTENANCE } from "../util.ts";
|
||||||
import Tag from "../components/Tag.vue";
|
import Tag from "../components/Tag.vue";
|
||||||
import VueMultiselect from "vue-multiselect";
|
import VueMultiselect from "vue-multiselect";
|
||||||
|
import Uptime from "../components/Uptime.vue";
|
||||||
|
import HeartbeatBar from "../components/HeartbeatBar.vue";
|
||||||
|
|
||||||
const toast = useToast();
|
const toast = useToast();
|
||||||
dayjs.extend(duration);
|
dayjs.extend(duration);
|
||||||
|
@ -399,6 +425,8 @@ const favicon = new Favico({
|
||||||
export default {
|
export default {
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
|
HeartbeatBar,
|
||||||
|
Uptime,
|
||||||
PublicGroupList,
|
PublicGroupList,
|
||||||
ImageCropUpload,
|
ImageCropUpload,
|
||||||
Confirm,
|
Confirm,
|
||||||
|
@ -777,6 +805,8 @@ export default {
|
||||||
this.$root.heartbeatList = heartbeatList;
|
this.$root.heartbeatList = heartbeatList;
|
||||||
this.$root.uptimeList = uptimeList;
|
this.$root.uptimeList = uptimeList;
|
||||||
|
|
||||||
|
this.$root.downMonitors = this.downMonitors();
|
||||||
|
|
||||||
const heartbeatIds = Object.keys(heartbeatList);
|
const heartbeatIds = Object.keys(heartbeatList);
|
||||||
const downMonitors = heartbeatIds.reduce((downMonitorsAmount, currentId) => {
|
const downMonitors = heartbeatIds.reduce((downMonitorsAmount, currentId) => {
|
||||||
const monitorHeartbeats = heartbeatList[currentId];
|
const monitorHeartbeats = heartbeatList[currentId];
|
||||||
|
@ -798,6 +828,22 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
downMonitors() {
|
||||||
|
let result = [];
|
||||||
|
|
||||||
|
for (const id in this.$root.publicMonitorList) {
|
||||||
|
const monitor = this.$root.publicMonitorList[id];
|
||||||
|
const heartbeats = this.$root.heartbeatList[monitor.id];
|
||||||
|
const lastHeartbeat = heartbeats.at(-1);
|
||||||
|
if (!lastHeartbeat || lastHeartbeat.status !== 0) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
result.push(monitor);
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Setup timer to display countdown to refresh
|
* Setup timer to display countdown to refresh
|
||||||
* @returns {void}
|
* @returns {void}
|
||||||
|
|
Loading…
Reference in a new issue