Merge remote-tracking branch 'upstream/master'

# Conflicts: # package.json
3 years ago · dae92d0ae4
parent e4f38d833d 1259ff5368
commit dae92d0ae4
9 changed files with 61 additions and 19 deletions
--- a/README.md
+++ b/README.md
@ -19,7 +19,11 @@ It is a self-hosted monitoring tool like "Uptime Robot".

 ### Docker
 ```bash
-docker run -d --restart=always -p 3001:3001 louislam/uptime-kuma
+# Create a volume
+docker volume create uptime-kuma
+
+# Start the container
+docker run -d --restart=always -p 3001:3001 -v uptime-kuma:/app/data --name uptime-kuma louislam/uptime-kuma
 ```

 Browse to http://localhost:3001 after started.
@ -27,7 +31,7 @@ Browse to http://localhost:3001 after started.
 Change Port and Volume

 ```bash
-docker run -d --restart=always -p <YOUR_PORT>:3001 -v <YOUR_DIR OR VOLUME>:/app/data louislam/uptime-kuma
+docker run -d --restart=always -p <YOUR_PORT>:3001 -v <YOUR_DIR OR VOLUME>:/app/data --name uptime-kuma louislam/uptime-kuma
 ```

 ### Without Docker
@ -42,11 +46,14 @@ 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

+# Listen to different port or hostname
+pm2 start npm --name uptime-kuma -- run start-server -- --port=80 --hostname=0.0.0.0
+
 ```

 Browse to http://localhost:3001 after started.
@ -55,6 +62,23 @@ Browse to http://localhost:3001 after started.

 [![Deploy to DO](https://www.deploytodo.com/do-btn-blue.svg)](https://cloud.digitalocean.com/apps/new?repo=https://github.com/louislam/uptime-kuma/tree/master&refcode=e2c7eb658434)

+Choose Cheapest Plan is enough. (US$ 5)
+
+# How to Update
+
+### Docker
+
+Re-pull the latest docker image and create another container with the same volume.
+
+### Without Docker
+
+```bash
+git fetch --all
+git checkout 1.0.1 --force
+npm install
+npm run build
+pm2 restart uptime-kuma
+```

 # More Screenshots

--- a/package-lock.json
+++ b/package-lock.json
@ -1,8 +1,7 @@
 {
  "name": "uptime-kuma",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
  "requires": true,
+  "lockfileVersion": 1,
  "dependencies": {
    "@babel/helper-validator-identifier": {
      "version": "7.14.5",
@ -243,6 +242,11 @@
        "readable-stream": "^2.0.6"
      }
    },
+    "args-parser": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/args-parser/-/args-parser-1.3.0.tgz",
+      "integrity": "sha512-If3Zi4BSjlQIJ9fgAhSiKi0oJtgMzSqh0H4wvl7XSeO16FKx7QqaHld8lZeEajPX7y1C5qKKeNgyrfyvmjmjUQ=="
+    },
    "arr-diff": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
--- a/package.json
+++ b/package.json
@ -1,17 +1,17 @@
 {
    "name": "uptime-kuma",
-    "version": "1.0.0",
    "scripts": {
        "dev": "vite --host",
        "start-server": "node server/server.js",
        "update": "",
        "build": "vite build",
        "vite-preview-dist": "vite preview --host",
-        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 . --push",
-        "setup": "git checkout 1.0.0 && npm install && npm run build"
+        "build-docker": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.0.1 . --push",
+        "setup": "git checkout 1.0.1 && npm install && npm run build"
    },
    "dependencies": {
        "@popperjs/core": "2.9.2",
+        "args-parser": "1.3.0",
        "axios": "0.21.1",
        "bootstrap": "5.0.2",
        "dayjs": "1.10.6",
--- a/server/model/monitor.js
+++ b/server/model/monitor.js
@ -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 {
--- a/server/server.js
+++ b/server/server.js
@ -12,6 +12,13 @@ const Monitor = require("./model/monitor");
 const fs = require("fs");
 const {getSettings} = require("./util-server");
 const {Notification} = require("./notification")
+const args = require('args-parser')(process.argv);
+
+console.log("args:")
+console.log(args)
+
+const hostname = args.host || "0.0.0.0"
+const port = args.port || 3001

 app.use(express.json())

@ -435,8 +442,8 @@ let needSetup = false;
        });
    });

-    server.listen(3001, () => {
-        console.log('Listening on 3001');
+    server.listen(port, hostname, () => {
+        console.log(`Listening on ${hostname}:${port}`);

        startMonitors();
    });
--- a/src/components/NotificationDialog.vue
+++ b/src/components/NotificationDialog.vue
@ -105,12 +105,12 @@

                            <div class="mb-3">
                                <label for="username" class="form-label">Username</label>
-                                <input type="text" class="form-control" id="username" required v-model="notification.smtpUsername" autocomplete="false">
+                                <input type="text" class="form-control" id="username" v-model="notification.smtpUsername" autocomplete="false">
                            </div>

                            <div class="mb-3">
                                <label for="password" class="form-label">Password</label>
-                                <input type="password" class="form-control" id="password" required v-model="notification.smtpPassword" autocomplete="false">
+                                <input type="password" class="form-control" id="password" v-model="notification.smtpPassword" autocomplete="false">
                            </div>

                            <div class="mb-3">
--- a/src/pages/Details.vue
+++ b/src/pages/Details.vue
@ -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"
--- a/src/pages/EditMonitor.vue
+++ b/src/pages/EditMonitor.vue
@ -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' ">
--- a/src/util-frontend.js
+++ b/src/util-frontend.js
@ -24,7 +24,6 @@ const aryIannaTimeZones = [
    'Asia/Yerevan',
    'Antarctica/Casey',
    'Antarctica/Davis',
-    'Antarctica/DumontDUrville', // https://bugs.chromium.org/p/chromium/issues/detail?id=928068
    'Antarctica/Mawson',
    'Antarctica/Palmer',
    'Antarctica/Rothera',
@ -195,7 +194,6 @@ const aryIannaTimeZones = [
    'Asia/Seoul',
    'Asia/Almaty',
    'Asia/Qyzylorda',
-    'Asia/Qostanay', // https://bugs.chromium.org/p/chromium/issues/detail?id=928068
    'Asia/Aqtobe',
    'Asia/Aqtau',
    'Asia/Atyrau',