mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-30 07:59:52 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
3164 commits 31 branches 117 tags 71 MiB
Commit graph

306 commits

Author SHA1 Message Date
Moritz R 361e44ad6a
Merge branch 'louislam:master' into master 2022-04-13 15:58:17 +02:00
Louis Lam 4053b9db1f Merge remote-tracking branch 'origin/master' 2022-04-12 17:46:24 +08:00
Louis Lam 772d009f43 Merge branch 'master' into fluencydoc_master 
# Conflicts:
#	extra/update-version.js
#	server/client.js
#	server/server.js
 2022-04-12 17:44:04 +08:00
Louis Lam 6179f6c982 Merge branch 'master' into issue/1138 
# Conflicts:
#	server/server.js
 2022-04-12 17:15:33 +08:00
Louis Lam 94770cf865 Resolve log message null reference 2022-04-12 16:57:22 +08:00
Louis Lam 279e2eb3f6 Merge branch 'master' into logging 
# Conflicts:
#	server/database.js
#	server/jobs.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/socket-handlers/status-page-socket-handler.js
#	server/util-server.js
 2022-04-12 16:32:14 +08:00
Louis Lam 0afa0be5c2 Merge branch 'master' into status-page-domain 
# Conflicts:
#	server/database.js
 2022-04-09 16:07:09 +08:00
Louis Lam 5027fcd320 Export server using an object class 2022-04-07 23:02:57 +08:00
Louis Lam d5e68f8453 Export monitor list 2022-04-07 22:53:32 +08:00
Louis Lam 082c2dd32d Remove restartMonitors() and move proxy socket events to a socket handler file 2022-04-07 14:45:37 +08:00
Louis Lam c4e74c9943 Render <StatusPage> if domain matched 2022-04-06 22:43:22 +08:00
Louis Lam 70311f7a5a Add an option to enable/disable the domain name expiry notification #1364 2022-04-05 21:27:50 +08:00
Louis Lam 48d679234a Stop bree and cloudflared while the server shutting down 2022-04-05 19:41:29 +08:00
Moritz R af44b0beab
Merge branch 'master' into master 2022-04-03 17:19:29 +02:00
Louis Lam 04e3394d02 Merge branch 'master' into feature/request-with-http-proxy 
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	src/languages/en.js
#	src/mixins/socket.js
 2022-04-01 14:57:35 +08:00
Louis Lam b72a2d350f Set cloudflared token from env var or arg 2022-03-30 20:08:26 +08:00
Louis Lam 82ea896bbc Improve the workflow of cloudflared 2022-03-30 11:59:49 +08:00
Louis Lam a6b52b7ba6 Merge branch 'master' into cloudflared 2022-03-29 17:42:55 +08:00
Louis Lam b8dea3a823 Merge remote-tracking branch 'origin/master' 2022-03-29 17:39:12 +08:00
Louis Lam 0da6e6b1fb Some improvements 2022-03-29 17:38:48 +08:00
Louis Lam 44fb2a88f2 Add cloudflared socket handler 2022-03-29 14:48:02 +08:00
OidaTiftla d8013f31e8 Update version after merging new master branch 2022-03-27 21:24:41 +02:00
OidaTiftla 91366ff565
Merge branch 'master' into introduce-resend-interval 2022-03-27 21:19:57 +02:00
Louis Lam be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete 
Fix: Remove prometheus metrics on delete [Test needed]
 2022-03-27 11:05:50 +08:00
Louis Lam 3adda48f3a Load the status page list earlier 2022-03-21 15:28:59 +08:00
Louis Lam 719a136d1e [Status Page] Improved entry page 2022-03-17 22:44:47 +08:00
Louis Lam 50d6e888c2 [new status page] wip 2022-03-10 21:34:30 +08:00
Uğur Erkan 78d76512ba Add http and https proxy feature 
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.

Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
 2022-03-06 19:34:49 +03:00
OidaTiftla b69a8b8493
Fix formatting 
Co-authored-by: Adam Stachowicz <[email protected]>
 2022-01-23 17:35:53 +01:00
OidaTiftla 1ac904d6d6 Introduce resend interval if down 2022-01-23 15:22:57 +01:00
c0derMo 29df70949d Add ability to connect to daemon via http / tcp for windows compatibility 2022-01-22 01:57:37 +00:00
Louis d1a99b0a22 Check Node.js version, better error message 2022-01-15 01:25:28 +08:00
c0derMo c5cc42272f Fixing the editing of docker container & adding english translation 2022-01-13 18:28:45 +00:00
Louis Lam 6272514820 [MQTT] Use existing fields instead of creating new ones (Server) 2022-01-13 11:53:08 +08:00
Louis Lam 32ec4beda0 Merge branch 'master' into mqtt 2022-01-13 11:24:45 +08:00
Louis Lam 076d6bdbb6 Merge branch 'master' into mqtt 
# Conflicts:
#	package-lock.json
#	server/database.js
 2022-01-13 11:09:16 +08:00
Louis ed64853125 Keep FBSD, BSD for ping only 2022-01-12 01:44:01 +08:00
Denis 0f822d3b2a FBSD does not exists anymore 2022-01-11 13:42:51 +01:00
Denis 6bda5c6329 update comment 2022-01-11 13:39:45 +01:00
Louis f9751d0c01 Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236 2022-01-11 19:15:28 +08:00
Marc Harnos 0bbe157099
change parsing priority for all passed arguments 
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
 2022-01-08 18:32:42 +01:00
Marc Harnos 0053a29d10
add validation to port value parsing 
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
 2022-01-08 18:27:39 +01:00
Marc Harnos 2c8d5d28e9
simplify host fallback logic 
move decision logic for freeBSD HOST environment var into temp var
 2022-01-08 18:25:12 +01:00
Nelson Chan 1bbd744d02 Chore: Improve syntax 2022-01-07 14:29:42 +08:00
Nelson Chan 2e0e35a1ee Fix: Fix typo 2022-01-07 12:34:01 +08:00
Nelson Chan 1e92487f30 Chore: Remove onDelete as unused 2022-01-07 12:28:08 +08:00
Nelson Chan edd2534a1b Fix: Clear metrics also on stop and edit 2022-01-07 12:26:26 +08:00
Nelson Chan f6ef390c76 Fix: Remove Prom. metrics on delete monitor 2022-01-07 12:04:57 +08:00
Tarun Singh d3c90df8a8 fixed edit monitor fields empty issues 2021-12-18 16:35:18 -05:00
Andreas Brett a13bdaac84
Merge branch 'master' into logging 2021-11-29 20:32:42 +01:00
Fluency e3745da986
Merge branch 'master' into master 2021-11-23 10:26:45 -08:00
Louis Lam 92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth 
Implement explicit HTTP "basic" authentication support
 2021-11-23 22:48:54 +08:00
Louis Lam c811c1ccde
Merge pull request #753 from chakflying/settings-redesign 
UI: Redesign/organize settings page
 2021-11-23 12:46:59 +08:00
Andreas Brett ed96757b24
Merge branch 'louislam:master' into logging 2021-11-19 08:56:25 +01:00
Louis Lam 5d3bf68123 add remove-2fa command 2021-11-18 18:22:03 +08:00
Nelson Chan 7f4d5a0f76 Test: fix tests 
Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Attempt to fix tests

Test: Investigate error message

Test: Attempt to fix tests

Chore: Cleanup code

Test: Attempt to fix tests

Test: Attempt to fix tests
 2021-11-17 10:45:24 +08:00
Nelson Chan 07742799ed Test: Fix tests 
Test: Add clear stats test

Test: Attempt to fix tests

Test: Add test for disable auth

Update README
 2021-11-17 10:45:19 +08:00
Andreas Brett e5913c5abc separate log functions 2021-11-15 17:52:28 +01:00
Andreas Brett bdcdf47e52 introduce consistent logging 2021-11-11 12:31:28 +01:00
Calum Bird f55350bebc Generated documentation :) 2021-11-09 21:24:31 -08:00
Ivan Bratović 179ca232bc Minor refactor - change variable names and add commas to object definitions 2021-11-04 10:14:17 +01:00
Ivan Bratović 23736549f9 Implement HTTP basic auth feature 2021-11-04 09:50:10 +01:00
Louis Lam c094dc0c5b speed up redirect by using 302 redirect instead of vue redirect 2021-11-02 21:48:46 +08:00
Louis ba93129b18 Merge branch '1.9.X' 
# Conflicts:
#	server/server.js
 2021-10-30 10:05:08 +08:00
Louis caa2a34177 fix 2fa not working #833 2021-10-30 02:35:05 +08:00
Louis d7f7dba13f write some error logs to ./data/error.log 2021-10-29 18:24:47 +08:00
Louis Lam a9e319517a add auto vacuum and shrink database button 2021-10-26 23:02:32 +08:00
Nelson Chan 2f7b60f5e5 Feat: Use separate storage for custom chart period 
Fix: Fix import error
 2021-10-24 01:44:55 +08:00
Nelson Chan b83c59e308 WIP: Add options for chart period 
Fix: Fix callback, add toast on error

Fix: Improve styling

Fix: Restore default chart behavior

Fix: Replace 1h with 3h

draft only
 2021-10-24 01:44:08 +08:00
Louis Lam d578300104
Merge pull request #743 from andreasbrett/patch-4 
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
 2021-10-23 17:00:46 +08:00
Louis Lam b77b33e790 add login rate limiter 2021-10-23 16:35:13 +08:00
Louis Lam 56094a43d7 add passwordStrength 2021-10-21 22:54:04 +08:00
Louis Lam cd04ac4557 "dist/index.html" is no longer needed for development environment 2021-10-20 01:32:19 +08:00
Louis Lam e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges 
Text update
 2021-10-19 16:34:00 +08:00
Louis Lam 6c1ee70e15 fix 2021-10-19 16:29:09 +08:00
Louis Lam 5c3892313e add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN 2021-10-19 14:41:05 +08:00
Louis Lam c57c94642c Merge remote-tracking branch 'origin/master' 2021-10-19 14:26:26 +08:00
Louis Lam 62f168a2a5 config response header 2021-10-19 14:26:10 +08:00
Andreas Brett acc2995d86 invalidate used token 2021-10-19 00:42:33 +02:00
NeuralMiner 9ddffc0f7f Updates 2021-10-18 14:35:47 -06:00
NeuralMiner 76e7c8b276 Rebase 2021-10-18 14:35:36 -06:00
NeuralMiner 572a5300aa Recommended updates. 2021-10-18 13:25:53 -06:00
NeuralMiner e1f1d4a959
Merge branch 'louislam:master' into textchanges 2021-10-18 12:57:28 -06:00
Louis Lam 23714ab688 genSecret don't need await 2021-10-18 17:37:11 +08:00
Louis Lam 6e18f39eb4 [steam] code cleanup 2021-10-18 17:15:28 +08:00
Louis Lam ae31eb6ba9 Merge branch 'master' into Revyn112_master 
# Conflicts:
#	server/model/monitor.js
#	src/languages/en.js
#	src/pages/EditMonitor.vue
 2021-10-18 15:50:35 +08:00
Louis Lam cb43ecb46e Merge branch 'master' into background-jobs 
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
 2021-10-16 15:06:59 +08:00
Louis Lam 6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2 
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
 2021-10-16 14:30:25 +08:00
NeuralMiner 8cb26d2b31 Text update 2021-10-15 19:12:09 -06:00
Louis Lam 7276f34d90 fix reset-password 2021-10-16 00:57:26 +08:00
Louis Lam 4e71ab7406 Merge branch 'master' into feature/add-support-for-method-body-and-headers 2021-10-15 16:07:05 +08:00
Louis Lam f75c9e4f0c add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD 2021-10-14 14:09:16 +08:00
giacomo892 3fe3450533
Prioritize port passed from args 
Co-authored-by: Adam Stachowicz <[email protected]>
 2021-10-13 08:29:55 +02:00
giacomo892 d733ec018e
Prioritize host arg 
Otherwise launching the program with the --host argument does nothing
 2021-10-12 19:37:58 +02:00
Andreas Brett 2538bd04ce notp verification defaults 2021-10-11 20:18:40 +02:00
Andreas Brett e223e826a3 linting 2021-10-11 01:02:54 +02:00
Andreas Brett b5b391c73b
avoid default values for token verification 
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640)
 2021-10-10 22:13:18 +02:00
Bert Verhelst dc08510e72 Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers 2021-10-10 18:40:53 +02:00
LouisLam 82131f4dd2 merge conflict 2021-10-10 13:09:30 +08:00
LouisLam 56ae6f6117 fix demoMode export 2021-10-10 02:36:20 +08:00