60be875edd
Fix a merge issue
12 months ago
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
12 months ago
121d1a11af
Revert "Restart running monitors if no heartbeat ( #3952 )" ( #4088 )
...
This reverts commit c43223a16d
12 months ago
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
1 year ago
c43223a16d
Restart running monitors if no heartbeat ( #3952 )
1 year ago
8412e19fe6
Add a comment
1 year ago
bbaba29222
Set default ua for axios: `Uptime-Kuma/version` instead of `axios/version`
1 year ago
03e43ab364
Log color and simplify startup log for production ( #3889 )
1 year ago
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
1 year ago
a13fc7079e
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
1 year ago
cd79df07e1
Add an ability to enable/disable nscd ( #3652 )
1 year ago
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>
1 year ago
67b1974718
Allow specifying `DATA_DIR` without a tailing slash
1 year ago
a0203372ce
Built-in nscd into the docker image (a better dns caching service) ( #3472 )
1 year ago
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>
1 year ago
21d556528f
Fix #3420 timezone issue ( #3425 )
1 year ago
357466cc90
Minor
1 year ago
b038d09349
Minor
1 year ago
cdf6922bdd
Fix handling of IPv6 addresses in getClientIP
1 year ago
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
1 year ago
df8fcffb19
Drop unused code
1 year ago
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
02291730fe
WIP
2 years ago
89bfc3bf33
Merge pull request #2908 from chakflying/chore/encrypted-private-key
...
Chore: Add support for encrypted SSL-key
2 years ago
533bc1505b
Prevent generating duplicated timeslots
2 years ago
391692a708
Chore: Add support for encrypted SSL-key
2 years ago
2dedc1cfbd
Fix #2776
2 years ago
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2 years ago
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
3b87209e26
Add configurable dns cache
2 years ago
24cb212a37
Fix recurring
2 years ago
0b8d4cdaac
Generate Next Timeslot for recurring interval
2 years ago
39b6725163
Update maintenance tables
2 years ago
e07aa982c3
WIP
2 years ago
a36f24d827
Add configurable server timezone
2 years ago
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2 years ago
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
7017c2e625
Move maintenance code to `maintenance-socket-handler.js`
2 years ago
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2 years ago
2389b604fe
Use Settings.get
2 years ago
a3b1612938
getClientIP respect trustProxy setting
2 years ago
bea8679788
Merge branch 'master' into issue-1861
2 years ago
2073f0c284
Bind cacheable-lookup to custom http agent
2 years ago
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
f33b6de157
Support X-Forwarded-Host header
2 years ago
e5e8db6c38
Add cacheable-lookup
2 years ago
c095767f4a
[Status Page] SSR
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
200fdfb808
Merge code manually since some code moved to another file
3 years ago
Louis Lam
Frank Elsinga
Matthew Nickson
SGprooo
nthumann
Nelson Chan
Ben Scobie
Chongyi Zheng