Merge branch 'master' into tls-expiry

# Conflicts:
#	server/model/monitor.js
This commit is contained in:
LouisLam 2021-07-26 20:35:50 +08:00
commit 5b18a6a518
18 changed files with 134 additions and 30 deletions

View file

@ -294,6 +294,11 @@ export default {
text: "Down",
color: "danger"
};
} else if (lastHeartBeat.status === 2) {
result[monitorID] = {
text: "Pending",
color: "warning"
};
} else {
result[monitorID] = unknown;
}