Louis Lam
530c8e5328
Drop cacheable-lookup ( #4178 )
...
* WIP
* WIP
2023-12-11 02:01:56 +08:00
Nelson Chan
46432618e1
Feat: Add json-query to MQTT monitor type ( #3857 )
...
* Feat: Add json-query MQTT monitor type
* Fix: Allow result to be null
* Fix: Remove unused parameter
* Chore: Update JSDoc
* Fix: Add default if checkType is not set
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-12-03 01:36:19 +08:00
Louis Lam
81c9900e23
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# docker/debian-base.dockerfile
2023-12-01 15:50:35 +08:00
Louis Lam
1708b67949
Change execSync/spawnSync to async ( #4123 )
...
* WIP
* Add missing await
* Update package-lock.json
2023-11-30 16:12:04 +08:00
Louis Lam
60be875edd
Fix a merge issue
2023-11-25 03:28:45 +08:00
Louis Lam
e9bf02fc2c
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2
...
# Conflicts:
# package-lock.json
# package.json
# server/model/monitor.js
# server/monitor-types/tailscale-ping.js
# server/socket-handlers/general-socket-handler.js
# server/uptime-kuma-server.js
2023-11-25 03:25:03 +08:00
Louis Lam
121d1a11af
Revert "Restart running monitors if no heartbeat ( #3952 )" ( #4088 )
...
This reverts commit c43223a16d
.
2023-11-24 02:23:38 +08:00
Louis Lam
ace1fe00c2
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/uptime-kuma-server.js
# server/util-server.js
2023-11-13 21:15:51 +08:00
Louis Lam
c43223a16d
Restart running monitors if no heartbeat ( #3952 )
2023-11-01 09:36:12 +08:00
Louis Lam
8412e19fe6
Add a comment
2023-10-19 09:41:30 +08:00
Louis Lam
bbaba29222
Set default ua for axios: Uptime-Kuma/version
instead of axios/version
2023-10-18 21:54:49 +08:00
Louis Lam
03e43ab364
Log color and simplify startup log for production ( #3889 )
2023-10-14 03:00:34 +08:00
Frank Elsinga
d6af9162c1
Chore: Extracted the dns monitor to its own monitor-type ( #3413 )
...
* extracted the dns monitor to its own monitor-type
* linting fixes
* another formatting fix
* Fix: Improve dnsMessage handling (#3614 )
* fixed docs
* fixed formatting changes
2023-09-09 18:14:55 +08:00
Louis Lam
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
2023-08-30 01:39:16 +08:00
Louis Lam
cd79df07e1
Add an ability to enable/disable nscd ( #3652 )
2023-08-28 16:15:48 +08:00
Matthew Nickson
8a92054c2b
Added JSDoc to ESLint ( #3529 )
...
* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-08-11 15:46:41 +08:00
Louis Lam
67b1974718
Allow specifying DATA_DIR
without a tailing slash
2023-08-03 20:54:11 +08:00
Louis Lam
a0203372ce
Built-in nscd into the docker image (a better dns caching service) ( #3472 )
2023-07-24 17:04:50 +08:00
SGprooo
1d9a28e9ab
feat: Tailscale ping monitor ( #3178 )
...
* Add boilerplate for tailscale ping
* tailscale initial commit draft
* Refactor TailscalePing & better error handling
Split check function into two methods and added async/await syntax for readability/modularity
Switched to promise-based error handling (takes into account different types of error such as "Execution error", "Error in output", "no matching peer", and "is local Tailscale IP") and throws them as JavaScript errors.
* Minor update
* minor update (again)
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* timeout revision
* JSDoc
* Removed long explainers
* eslint tailscale-ping.js --fix
* reran eslint
* Fix: Use hostname rather than url
* Fixed NaN on monitor interval
now interval value is correctly passed to runTailscalePing
* Add warning message
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-07-19 20:58:21 +08:00
Louis Lam
21d556528f
Fix #3420 timezone issue ( #3425 )
2023-07-15 23:23:27 +08:00
Louis Lam
357466cc90
Minor
2023-07-15 21:27:39 +08:00
Louis Lam
b038d09349
Minor
2023-07-15 21:26:41 +08:00
nthumann
cdf6922bdd
Fix handling of IPv6 addresses in getClientIP
2023-07-08 00:02:01 +02:00
Louis Lam
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
2023-07-05 11:35:36 +08:00
Louis Lam
df8fcffb19
Drop unused code
2023-07-03 14:50:30 +08:00
Louis Lam
4f6035899d
Real browser monitor type ( #3308 )
2023-06-27 15:54:33 +08:00
Louis Lam
02291730fe
WIP
2023-03-31 04:04:17 +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
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
2dedc1cfbd
Fix #2776
2023-03-07 20:48:11 +08:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
Louis Lam
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2023-01-06 23:04:02 +08:00
Matthew Nickson
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:19:05 +00:00
Louis Lam
3b87209e26
Add configurable dns cache
2022-12-12 17:19:22 +08:00
Louis Lam
24cb212a37
Fix recurring
2022-10-15 20:15:50 +08:00
Louis Lam
0b8d4cdaac
Generate Next Timeslot for recurring interval
2022-10-15 17:17:26 +08:00
Louis Lam
39b6725163
Update maintenance tables
2022-10-11 21:48:43 +08:00
Louis Lam
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
Louis Lam
a36f24d827
Add configurable server timezone
2022-10-09 20:59:58 +08:00
Louis Lam
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2022-10-09 19:26:00 +08:00
Ben Scobie
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-05 23:45:21 +08:00
Louis Lam
7017c2e625
Move maintenance code to maintenance-socket-handler.js
2022-09-17 16:54:21 +08:00
Louis Lam
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2022-08-01 15:42:58 +08:00
Louis Lam
2389b604fe
Use Settings.get
2022-07-31 23:41:29 +08:00
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2022-07-31 23:36:33 +08:00
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2022-07-31 20:06:45 +08:00
Louis Lam
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2022-07-12 22:59:23 -04:00
Chongyi Zheng
f33b6de157
Support X-Forwarded-Host header
2022-07-11 01:28:50 -04:00