From 8ab84623c8e55b0ee326ee8eceeee03dfa923168 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Thu, 9 Mar 2023 16:30:58 +0800 Subject: [PATCH 01/13] Updated 3rd Party Addons (markdown) --- 3rd-Party-Addons.md => 3rd-Party-Addons-Apps.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename 3rd-Party-Addons.md => 3rd-Party-Addons-Apps.md (56%) diff --git a/3rd-Party-Addons.md b/3rd-Party-Addons-Apps.md similarity index 56% rename from 3rd-Party-Addons.md rename to 3rd-Party-Addons-Apps.md index 7560297..c49a3ff 100644 --- a/3rd-Party-Addons.md +++ b/3rd-Party-Addons-Apps.md @@ -1,6 +1,7 @@ -A list of 3rd party addons, plugins or related side projects. +A list of 3rd party addons or applications, plugins or related side projects. Feel free to add your project here by making a pull request in this wiki repo: https://github.com/louislam/uptime-kuma-wiki - [Streamdeck Uptime Kuma](https://github.com/MarlBurroW/Streamdeck-Uptime-Kuma) - An Uptime Kuma plugin for Elgato Streamdeck - [xBarApp Uptime Kuma](https://github.com/mariogarridopt/xBar-Uptime-Kuma) - An Uptime Kuma plugin for xBarApp for Mac +- [Uptime Kuma Manager](https://apps.apple.com/us/app/uptime-kuma-manager/id6446004887) - An iOS app that allows you to connect to your Uptime Kuma servers and monitor the services directly from your phone. From c4aa1e286e849da2d4945da9f336133d7f37a4b4 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 20 Mar 2023 18:23:08 +0800 Subject: [PATCH 02/13] Update to 1.21.0 --- 🆙-How-to-Update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/🆙-How-to-Update.md b/🆙-How-to-Update.md index 0b1ddb1..8b07f36 100644 --- a/🆙-How-to-Update.md +++ b/🆙-How-to-Update.md @@ -34,7 +34,7 @@ cd # Update from git git fetch --all -git checkout 1.20.2 --force +git checkout 1.21.0 --force # Install dependencies and prebuilt npm install --production From 3476b19d527df1f53e0520f4c9d30609879c262e Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Thu, 23 Mar 2023 17:33:08 +0800 Subject: [PATCH 03/13] =?UTF-8?q?Updated=20=F0=9F=94=A7=20How=20to=20Insta?= =?UTF-8?q?ll=20(markdown)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 🔧-How-to-Install.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/🔧-How-to-Install.md b/🔧-How-to-Install.md index 63a443d..20ff716 100644 --- a/🔧-How-to-Install.md +++ b/🔧-How-to-Install.md @@ -49,6 +49,11 @@ docker run -d --restart=always -p :3001 -v :/app/ +### 🐳 Docker Compose Example + +https://github.com/louislam/uptime-kuma/blob/master/docker/docker-compose.yml + + ### 💪🏻 Without Docker (Recommended for x86/x64 only) It should supports Linux/Windows/MacOS. @@ -97,9 +102,17 @@ pm2 restart uptime-kuma pm2 startup ``` -### Docker Compose Example +### 🪟 Windows Portable -https://github.com/louislam/uptime-kuma/blob/master/docker/docker-compose.yml +![](https://user-images.githubusercontent.com/1336778/227160967-907ba113-c89d-4ec3-bb94-4c4ea6b7cb6f.png) + + +Requirement: +- Arch: x64 +- .NET 4.8 Runtime +- Internet for initialization (Download Node.js runtime and Uptime Kuma source code) + +Download: https://github.com/louislam/uptime-kuma/releases/download/1.21.0/uptime-kuma-win64-portable-1.0.0.zip ## (Optional) One more step for Reverse Proxy @@ -110,7 +123,6 @@ Unlikely other web apps, Uptime Kuma is based on WebSocket. You need two more he Please read wiki for more info: https://github.com/louislam/uptime-kuma/wiki/Reverse-Proxy - ## Videos - [Learn Uptime Kuma in 5 Minutes](https://www.youtube.com/watch?v=muZiPdH2JZ8) by DEVOPS UNLOCKED From dc7366f6eae29dbdfd43808780a763d560cb2e76 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Fri, 24 Mar 2023 21:37:39 +0800 Subject: [PATCH 04/13] Updated Environment Variables (markdown) --- Environment-Variables.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Environment-Variables.md b/Environment-Variables.md index 2e5b86a..4ea0ec9 100644 --- a/Environment-Variables.md +++ b/Environment-Variables.md @@ -19,6 +19,7 @@ node server/server.js --host=127.0.0.1 --port=8080 | `UPTIME_KUMA_PORT` or `PORT` | `--port=` | Port to listen to | `3001` | | `UPTIME_KUMA_SSL_KEY` or `SSL_KEY` | `--ssl-key=` | Path to SSL key | | | `UPTIME_KUMA_SSL_CERT` or `SSL_CERT` | `--ssl-cert=` | Path to SSL certificate | | +| `UPTIME_KUMA_SSL_KEY_PASSPHRASE` or `SSL_KEY_PASSPHRASE` | `--ssl-key-passphrase=` | (1.21.1) SSL Key Passphrase | | | `UPTIME_KUMA_CLOUDFLARED_TOKEN` | `--cloudflared-token=` | (1.14.0) Cloudflare Tunnel Token | | | `UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN` | `--disable-frame-sameorigin=` | By default, Uptime Kuma is not allowed in iframe if the domain name is not the same as the parent. It protects your Uptime Kuma to be a phishing website. If you don't need this protection, you can set it to `true` | `false` | | `NODE_EXTRA_CA_CERTS` | | Add your self-signed ca certs. (e.g. /cert/path/CAcert.pem) [Read more](https://github.com/louislam/uptime-kuma/issues/1380) | | From c53b6384a8d4e9ed2753c6b00270e925332ff218 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 27 Mar 2023 21:36:10 +0800 Subject: [PATCH 05/13] Update to 1.21.1 --- 🆙-How-to-Update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/🆙-How-to-Update.md b/🆙-How-to-Update.md index 8b07f36..b0ccd8c 100644 --- a/🆙-How-to-Update.md +++ b/🆙-How-to-Update.md @@ -34,7 +34,7 @@ cd # Update from git git fetch --all -git checkout 1.21.0 --force +git checkout 1.21.1 --force # Install dependencies and prebuilt npm install --production From c33644bb3a179091f781884798149f09df3b262b Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 27 Mar 2023 21:45:25 +0800 Subject: [PATCH 06/13] Updated _Sidebar (markdown) --- _Sidebar.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_Sidebar.md b/_Sidebar.md index bc22992..3bc8cf4 100644 --- a/_Sidebar.md +++ b/_Sidebar.md @@ -13,7 +13,7 @@ - [Badge](https://github.com/louislam/uptime-kuma/wiki/Badge) - [How to Monitor Docker Containers](https://github.com/louislam/uptime-kuma/wiki/How-to-Monitor-Docker-Containers) - [Maintenance](https://github.com/louislam/uptime-kuma/wiki/Maintenance) -- [3rd Party Addons](https://github.com/louislam/uptime-kuma/wiki/3rd-Party-Addons) +- [3rd Party Addons/Apps](https://github.com/louislam/uptime-kuma/wiki/3rd-Party-Addons-Apps) - [API Keys](https://github.com/louislam/uptime-kuma/wiki/API-Keys) ## Network From 1b7a7082d7e7b34370ba70e5f9fc3f8233dbb43a Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 1 Apr 2023 21:22:56 +0800 Subject: [PATCH 07/13] Updated 3rd Party Addons Apps (markdown) --- 3rd-Party-Addons-Apps.md | 1 + 1 file changed, 1 insertion(+) diff --git a/3rd-Party-Addons-Apps.md b/3rd-Party-Addons-Apps.md index c49a3ff..dc21d8c 100644 --- a/3rd-Party-Addons-Apps.md +++ b/3rd-Party-Addons-Apps.md @@ -5,3 +5,4 @@ Feel free to add your project here by making a pull request in this wiki repo: h - [Streamdeck Uptime Kuma](https://github.com/MarlBurroW/Streamdeck-Uptime-Kuma) - An Uptime Kuma plugin for Elgato Streamdeck - [xBarApp Uptime Kuma](https://github.com/mariogarridopt/xBar-Uptime-Kuma) - An Uptime Kuma plugin for xBarApp for Mac - [Uptime Kuma Manager](https://apps.apple.com/us/app/uptime-kuma-manager/id6446004887) - An iOS app that allows you to connect to your Uptime Kuma servers and monitor the services directly from your phone. +- [uptime-kuma-api (Python)](https://github.com/lucasheld/uptime-kuma-api) - A wrapper for the Uptime Kuma Socket.IO API From 08ad492e56eec40295b7c45792f04050d155fda5 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 4 Apr 2023 02:23:08 +0800 Subject: [PATCH 08/13] Update to 1.21.2 --- 🆙-How-to-Update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/🆙-How-to-Update.md b/🆙-How-to-Update.md index b0ccd8c..d110f22 100644 --- a/🆙-How-to-Update.md +++ b/🆙-How-to-Update.md @@ -34,7 +34,7 @@ cd # Update from git git fetch --all -git checkout 1.21.1 --force +git checkout 1.21.2 --force # Install dependencies and prebuilt npm install --production From f920d1d3d6a39f80916c34abe11be7e2c210787d Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Fri, 14 Apr 2023 17:15:14 +0800 Subject: [PATCH 09/13] Updated Home (markdown) --- Home.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/Home.md b/Home.md index c476384..9493708 100644 --- a/Home.md +++ b/Home.md @@ -1,7 +1,5 @@ Welcome to the Uptime Kuma wiki! -This wiki is also available on https://uptime.kuma.pet/docs/ - ## 🐻? Kuma (クマ/熊) means bear 🐻 in Japanese. From fa21c5ad0eb13bbf34982e51fa321a508fdbca72 Mon Sep 17 00:00:00 2001 From: Tyler Pace Date: Fri, 14 Apr 2023 18:28:36 -0700 Subject: [PATCH 10/13] Update caddy docker-compose example I just setup caddy as a reverse proxy for Kuma using lucaslorentz/caddy-docker-proxy and noticed a typo in your suggested config. Here's a working fix! --- Reverse-Proxy.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reverse-Proxy.md b/Reverse-Proxy.md index afa9ed3..7f6aa59 100644 --- a/Reverse-Proxy.md +++ b/Reverse-Proxy.md @@ -119,7 +119,7 @@ services: - /srv/uptime:/app/data labels: caddy: status.example.org - caddy.reverse_proxy: "* {{ '{{upstreams 3001}}'}}" + caddy.reverse_proxy: "* {{upstreams 3001}}" caddy: image: "lucaslorentz/caddy-docker-proxy:ci-alpine" ports: From a1bdb7802e4ed85abd8d2c46b019682c6b92a37a Mon Sep 17 00:00:00 2001 From: SiskoUrso <91812199+SiskoUrso@users.noreply.github.com> Date: Sun, 16 Apr 2023 22:03:19 -0500 Subject: [PATCH 11/13] adding metrics_path to snippet Adding a change to the prometheus config snippet, it should contain: metrics_path: '/metrics' Putting the target url with the "/metrics" in it will prevent prometheus from loading. --- Prometheus-Integration.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Prometheus-Integration.md b/Prometheus-Integration.md index 30d20ea..c5f2765 100644 --- a/Prometheus-Integration.md +++ b/Prometheus-Integration.md @@ -20,6 +20,7 @@ Put the following into your Prometheus config: - job_name: 'uptime' scrape_interval: 30s scheme: http + metrics_path: '/metrics' static_configs: - targets: ['uptime-kuma.url'] basic_auth: # Only needed if authentication is enabled (default) @@ -42,4 +43,4 @@ sum(monitor_response_time) by (monitor_name) sum(monitor_reponse_time{monitor_url="https://www.bbc.co.uk/"}) # Show the current status of Google.com monitor_status{monitor_name="Google"} -``` \ No newline at end of file +``` From 5e706d725c032f30abd543bd74bcaf54fa2cd9fa Mon Sep 17 00:00:00 2001 From: michaelyuhe <2312744987@qq.com> Date: Mon, 8 May 2023 08:33:31 +0800 Subject: [PATCH 12/13] docs: add install on Zeabur --- 🔧-How-to-Install.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/🔧-How-to-Install.md b/🔧-How-to-Install.md index 63a443d..8e29710 100644 --- a/🔧-How-to-Install.md +++ b/🔧-How-to-Install.md @@ -191,3 +191,8 @@ https://github.com/yzwijsen/deploy-uptime-kuma-azure Run uptime-kuma with S3 persistent sqlite database: https://github.com/fluential/litestream-uptime-kuma/ + +### Install on Zeabur + +Run with one click on [Zeabur](https://zeabur.com/). +https://docs.zeabur.com/marketplace/umami \ No newline at end of file From 333176603deef0f8e6524ebb38ed8689f7e3046a Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 9 May 2023 00:39:29 +0800 Subject: [PATCH 13/13] Update to 1.21.3 --- 🆙-How-to-Update.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/🆙-How-to-Update.md b/🆙-How-to-Update.md index d110f22..fb76b7a 100644 --- a/🆙-How-to-Update.md +++ b/🆙-How-to-Update.md @@ -34,7 +34,7 @@ cd # Update from git git fetch --all -git checkout 1.21.2 --force +git checkout 1.21.3 --force # Install dependencies and prebuilt npm install --production