Commit graph

248 commits

Author SHA1 Message Date
Louis Lam 8d8c38b1a8 Allow unused vars in args and fix more eslint issues 2022-04-17 01:39:49 +08:00
Louis Lam 0a5db0cecb Fix #1478 2022-04-14 10:12:31 +08:00
Louis Lam 17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
introduce consistent logging
2022-04-13 23:47:08 +08:00
Louis Lam e9ce1433cd Change log_info to log.info by making it into an object 2022-04-13 23:33:37 +08: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
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
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
Louis d1a99b0a22 Check Node.js version, better error message 2022-01-15 01:25:28 +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
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