mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-26 22:19:43 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4403 commits 31 branches 117 tags 70 MiB
Commit graph

1317 commits

Author SHA1 Message Date
Louis Lam 6356b1e50a
Merge pull request #2961 from chakflying/feat/flush-wal 
Chore: Flush WAL on shutdown
 2023-04-11 18:53:58 +08:00
Josua Frank 11f4cb8725
Merge branch 'louislam:master' into ntfy-bearer-authorization 2023-04-10 16:06:53 +02:00
Louis Lam 4c1ac5e870
Merge pull request #2863 from mtelgkamp/ntfy-notification-improvements 
Improve ntfy notifications
 2023-04-09 16:08:12 +08:00
Louis Lam 9e320dc5fb Expose timezone and local datetime to notification providers 2023-04-09 16:01:27 +08:00
Louis Lam 2f3f929fbd
Merge pull request #2831 from mtelgkamp/mattermost-notification-improvements 
Improve mattermost notifications
 2023-04-09 15:42:28 +08:00
Josua Frank 1f7f1f70bf
Merge branch 'louislam:master' into ntfy-bearer-authorization 2023-04-06 10:55:28 +02:00
Louis Lam 21ad715e6a
Merge pull request #3021 from louislam/1.22.X 
1.22.x -> master
 2023-04-04 14:58:34 +08:00
Josua Frank 23af66f618
Merge branch 'louislam:master' into ntfy-bearer-authorization 2023-04-03 21:17:53 +02:00
Louis Lam 45ef7b2f69 Fix Effective Date Range cannot be removed 2023-04-03 21:01:58 +08:00
Josua Frank 6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization 2023-04-03 08:33:05 +02:00
Louis Lam 1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page 
Feat: Support auto theme in status pages
 2023-04-03 02:38:30 +08:00
Louis Lam 32f84b5e4e
Merge pull request #2491 from RubenNL/fix-metrics-push 
Fixed the metrics for the push type.
 2023-04-02 02:05:03 +08:00
Louis Lam dbfaddafca Validate cron before submit 2023-04-01 16:30:55 +08:00
Louis Lam 511038b45a Remove unused code 2023-04-01 04:22:10 +08:00
Louis Lam 17ae47d091 Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead. 2023-04-01 00:58:23 +08:00
Louis Lam de0d1edfd4
Merge pull request #2988 from chakflying/fix/socks-rejectUnauthorized 
Fix: Pass rejectUnauthorized to Socks Proxy
 2023-04-01 00:48:28 +08:00
Louis Lam 524cf7c607 WIP 2023-03-31 21:34:05 +08:00
Louis Lam 227cec86a8 WIP 2023-03-31 20:25:37 +08:00
Louis Lam 02291730fe WIP 2023-03-31 04:04:17 +08:00
Nelson Chan 8ee4b844fd Fix: Pass rejectUnauthorized to Socks Proxy 2023-03-28 11:40:19 +08:00
Josua Frank fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization 2023-03-26 19:09:48 +02:00
Louis Lam fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision 
Fix: Apply toPrecision as last step
 2023-03-26 15:46:00 +08:00
Louis Lam 41bda4e1d7
Merge pull request #2975 from chakflying/fix/badge-no-label 
Fix: Allow status badge with empty label
 2023-03-26 15:42:12 +08:00
Louis Lam 4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider 
Add Twilio Sms Notification Provider
 2023-03-26 15:38:53 +08:00
Louis Lam 302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts 
Feat: Add opsgenie notification provider
 2023-03-26 15:36:50 +08:00
Louis Lam 3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif 
Fix: Check for TLS expiry notified days smaller than target
 2023-03-26 15:34:26 +08:00
Faruk Genç b64c835cee Add Twilio Sms Notification Provider 2023-03-25 19:56:01 +03:00
Nelson Chan 4f05912276 Fix: Allow status badge with empty label 2023-03-25 02:44:15 +08:00
Nelson Chan bf525371d9 Fix: Apply toPrecision as last step 2023-03-24 22:42:50 +08:00
Louis Lam 89bfc3bf33
Merge pull request #2908 from chakflying/chore/encrypted-private-key 
Chore: Add support for encrypted SSL-key
 2023-03-24 21:36:22 +08:00
Louis Lam f4ee5271af Improve error handling of mysqlQuery and return row count as result 2023-03-24 16:24:00 +08:00
Louis Lam 7330db3563 Improve error handling of mysqlQuery and return row count as result 2023-03-24 16:08:30 +08:00
Nelson Chan ca52047bf5 Feat: Flush WAL on shutdown 2023-03-22 14:46:58 +08:00
niclas.koegl d9558833fc
Fix linting 2023-03-21 19:45:44 +01:00
niclas.koegl d2527d7254
Merge branch 'master' into feature/opsgenie-alerts 2023-03-21 18:10:10 +01:00
niclas.koegl 6dfca0c163
Add Opsgenie notification provider 2023-03-21 18:07:19 +01:00
Josua Frank 35a56dd9e0 Added dropdown for authentication methods 2023-03-21 13:40:24 +01:00
Josua Frank 442f54de84
Merge branch 'louislam:master' into ntfy-bearer-authorization 2023-03-21 13:01:49 +01:00
tombii dbe73bd6ae
Update monitor.js (#2929) 
Language
 2023-03-15 15:00:28 +08:00
Louis Lam 491239415e Merge remote-tracking branch 'origin/master' into doubles-ss_master 
# Conflicts:
#	server/database.js
 2023-03-12 18:38:19 +08:00
Louis Lam 533bc1505b Prevent generating duplicated timeslots 2023-03-09 22:03:23 +08:00
Nelson Chan 391692a708 Chore: Add support for encrypted SSL-key 2023-03-09 00:00:07 +08:00
Louis Lam a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis 
Fix: Disconnect redis after ping
 2023-03-08 22:57:30 +08:00
Nelson Chan f32fcb204f Fix: Check for notified days smaller than target 2023-03-08 22:26:19 +08:00
Nelson Chan 230de63460 Fix: Disconnect redis after ping 2023-03-08 21:47:52 +08:00
Josua Frank e8814e8479 added option for ntfy access tokens 2023-03-08 13:28:02 +00:00
Louis Lam 2dedc1cfbd Fix #2776 2023-03-07 20:48:11 +08:00
Louis Lam ce8eebc838 Fix #2880 2023-03-05 15:59:43 +08:00
Louis Lam 7ec09d0118 Fix ipv6 issue for ping 2023-03-04 20:41:08 +08:00
Louis Lam 92c9b8bb63 Fix ipv6 issue for ping 2023-03-04 20:29:52 +08:00
Louis Lam 010c7d681f Fix ipv6 issue for ping 2023-03-04 19:12:11 +08:00
Louis Lam 8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id 
Add ability to use User ID for LunaSea notifications
 2023-03-04 17:35:15 +08:00
Nelson Chan bc87abf5c2 Fix: Clear uptime cache on push beat 2023-03-03 05:57:36 +08:00
Arniwatt Chonkiattipoom bb7de6aa88 chore: notification toggle missing when import from backup 2023-03-02 16:23:27 +07:00
Nelson Chan 150607cc93 Feat: Support auto theme in status pages 2023-03-02 07:26:26 +08:00
Michael Telgkamp cbbd3e20ad
Codestyle: Add trailing comma 2023-03-01 23:05:23 +01:00
Louis Lam 71c800b880 Merge remote-tracking branch 'origin/master' into notification-provider-pagertree 
# Conflicts:
#	src/lang/en.json
 2023-03-01 16:17:18 +08:00
Michael Telgkamp 7b4f90ce92
Improve ntfy notifications 
- use tags `red_circle` for down and `green_circle` for up
- increase priority for down alert by 1 if not already max
- add monitor name and status to title
- use heartbeat msg as Message
- add monitor url as action
 2023-03-01 08:37:06 +01:00
Bobby Ore b21c2adcc2 Rework lunasea notification to allow for device id and user id 2023-02-28 09:47:35 -06:00
Louis Lam 958354e4db Minor 2023-02-28 16:58:36 +08:00
Louis Lam 38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key 
Added #1685: Add API keys for API authentication
 2023-02-28 16:55:50 +08:00
Matthew Nickson 669f8700b2
Switched to nanoid for key generation 
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-26 19:36:50 +00:00
Matthew Nickson 06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key 2023-02-26 16:47:45 +00:00
Matthew Nickson 42a69c16ca
Switched to crypto.randomBytes fpr key generation 
Keys are now 32 bytes long encoded in a URL safe base64 string

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-26 16:47:34 +00:00
Louis Lam ea3b3abe36 Fine tune 2023-02-25 20:13:46 +08:00
Louis Lam 7f9332c753 Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor 
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	src/icon.js
#	src/languages/en.js
#	src/languages/es-ES.js
 2023-02-25 19:14:44 +08:00
Louis Lam d668812df1 Fix merge issue 2023-02-25 17:59:25 +08:00
Louis Lam f32d3af62c Merge remote-tracking branch 'origin/master' into doubles-ss_master 
# Conflicts:
#	server/database.js
 2023-02-25 17:57:25 +08:00
Louis Lam a7b49fcd98 Fix json body after xml body added 2023-02-25 17:28:32 +08:00
Louis Lam ef64077980 Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key 
# Conflicts:
#	src/lang/en.json
 2023-02-25 00:06:25 +08:00
Louis Lam e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification 
Adds name + status + message to Slack notification
 2023-02-24 23:54:31 +08:00
Louis Lam c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty 
Fix: getGameList returns nothing on first run
 2023-02-24 23:34:47 +08:00
Nelson Chan c65a920050 Chore: Fix code comment 2023-02-24 21:09:55 +08:00
Nelson Chan 7b8ed01f27 Fix: getGameList returns nothing on first run 2023-02-24 21:06:00 +08:00
Louis Lam cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors 
Add xml support to HTTP monitors
 2023-02-24 17:26:47 +08:00
Louis Lam 2fa233ae7f Fix prometheus null issues 2023-02-24 17:12:57 +08:00
Louis Lam e9475ed3c0 Merge remote-tracking branch 'origin/master' into telegram_test 
# Conflicts:
#	server/notification-providers/telegram.js
#	src/languages/en.js
 2023-02-24 17:08:48 +08:00
Louis Lam 10228874fa Merge manually 2023-02-24 16:54:58 +08:00
Michael Telgkamp 186ca30508
Improve mattermost notifications 2023-02-23 17:40:39 +01:00
Ruben van Dijk 896e33815d
Merge branch 'louislam:master' into fix-metrics-push 2023-02-23 14:11:39 +01:00
Louis Lam 7e3734af53 Better handling 2023-02-23 20:59:24 +08:00
Louis Lam 5789112f55 Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction 2023-02-23 20:47:28 +08:00
Louis Lam 4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance 
remember prometheus instance and expose it
 2023-02-23 20:43:05 +08:00
Austin Miller 5e1489a6ed PagerTree Notification - Send msg when heartbeatJSON null 2023-02-22 14:32:02 -07:00
Louis Lam 9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1 
sorted tags on dashboard
 2023-02-22 01:11:03 +08:00
Louis Lam 42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code 
Feat: Use error message to detect and set status code
 2023-02-22 01:01:53 +08:00
Peace 0be8b111e2
chore: better up message 
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-20 13:48:16 +01:00
Faruk Genç 72106ba4c4 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-18 22:38:40 +03:00
Peace cef0a0faf4
Merge branch 'master' into group-monitors 2023-02-16 21:38:53 +01:00
Matthew Nickson b8720b46c3
Switched to using Authorization header 
Prometheus doesn't support using custom headers for exporters, however
it does support using the Authorisation header with basic auth. As
such, we switched from using X-API-Key to Authorization with the basic
scheme and an empty username field.

Also added a rate limit for API endpoints of 60 requests in a minute

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 21:53:49 +00:00
Matthew Nickson 1d4af39820
Fixed JSDoc for one method 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 19:31:22 +00:00
Luke Hamburg dd1d71530f
sorted tags on dashboard 
see https://github.com/louislam/uptime-kuma/issues/2785
 2023-02-15 14:06:29 -05:00
Matthew Nickson 01c71a0242
Fixed logic errors, removed dev leftovers 
Fixed a logic error where a comma was used instead of an or, also
removed leftover console.logs from testing.

Date picker is now dissabled when don't expire is checked.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 11:15:15 +00:00
Matthew Nickson e7feca1cd6
Added API key authentication handler 
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.

In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 00:39:29 +00:00
Matthew Nickson cd796898d0
Added expiry check for frontend 
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 22:41:06 +00:00
Matthew Nickson d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key 2023-02-14 19:53:33 +00:00
Matthew Nickson ee2eb5109b
Added basic web interface for API keys 
Web interfaces for manging API keys have been added however translation
keys are still required.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-14 19:49:04 +00:00
Louis Lam d1175ff471 Fix #2777 2023-02-15 02:50:49 +08:00
Matthew Nickson cd18b96f69
Added check to ensure backup exists when restoring (#2779) 
A check to ensure that the backup database exists before deleting the
current database.

Fixes #2778

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-15 00:43:40 +08:00
Faruk Genç 19c8538149 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors 2023-02-11 23:56:38 +03:00