mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-26 14:09:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'louislam:master' into master

Browse source
This commit is contained in:
Philipp Dormann 2021-07-12 12:01:00 +02:00 committed by GitHub
parent e4f38d833d c436ef4e05
commit 763d7f2683
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -42,7 +42,7 @@ npm run setup
# Option 1. Try it
npm run start-server
# (Recommanded)
# (Recommended)
# Option 2. Run in background using PM2
# Install PM2 if you don't have: npm install pm2 -g
pm2 start npm --name uptime-kuma -- run start-server

13
server/model/monitor.js
View file

@ -71,7 +71,9 @@ class Monitor extends BeanModel {
try {
if (this.type === "http" || this.type === "keyword") {
let startTime = dayjs().valueOf();
let res = await axios.get(this.url)
let res = await axios.get(this.url, {
headers: { 'User-Agent':'Uptime-Kuma' }
})
bean.msg = `${res.status} - ${res.statusText}`
bean.ping = dayjs().valueOf() - startTime;
@ -79,7 +81,14 @@ class Monitor extends BeanModel {
bean.status = 1;
} else {
if (res.data.includes(this.keyword)) {
let data = res.data;
// Convert to string for object/array
if (typeof data !== "string") {
data = JSON.stringify(data)
}
if (data.includes(this.keyword)) {
bean.msg += ", keyword is found"
bean.status = 1;
} else {

4
src/pages/Details.vue
View file

@ -137,7 +137,7 @@ export default {
},
ping() {
if (this.lastHeartBeat.ping) {
if (this.lastHeartBeat.ping || this.lastHeartBeat.ping === 0) {
return this.lastHeartBeat.ping;
} else {
return "N/A"
@ -145,7 +145,7 @@ export default {
},
avgPing() {
if (this.$root.avgPingList[this.monitor.id]) {
if (this.$root.avgPingList[this.monitor.id] || this.$root.avgPingList[this.monitor.id] === 0) {
return this.$root.avgPingList[this.monitor.id];
} else {
return "N/A"

2
src/pages/EditMonitor.vue
View file

@ -30,7 +30,7 @@
<div class="mb-3" v-if="monitor.type === 'keyword' ">
<label for="keyword" class="form-label">Keyword</label>
<input type="text" class="form-control" id="keyword" v-model="monitor.keyword" required>
<div class="form-text">Search keyword in plain html response and it is case-sensitive</div>
<div class="form-text">Search keyword in plain html or JSON response and it is case-sensitive</div>
</div>
<div class="mb-3" v-if="monitor.type === 'port' || monitor.type === 'ping' ">