Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2022-07-24 14:07:30 +08:00
c0derMo
e356d5f623
Fixing linting & adding documentation
2022-07-22 15:57:40 +00:00
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2022-07-22 15:47:04 +00:00
Louis Lam
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2022-07-18 23:46:55 +08:00
Louis Lam
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
Louis Lam
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
Louis Lam
1f5466a3e8
Revert #1598
2022-06-23 15:54:33 +08:00
Matthew Nickson
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2022-06-18 23:53:35 +01:00
Christopher Pickering
945288f0c0
Added postgres monitor
2022-06-15 12:12:47 -05:00
Moritz R
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
Christopher Pickering
660005b143
cleaned up code
2022-06-14 08:49:36 -05:00
Christopher Pickering
98f3c126e5
passed lint
2022-06-14 07:58:35 -05:00
sur.la.route
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2022-06-14 07:42:53 -05:00
Aram Akhavan
c690d1c3a1
fix timeout bypass for upside down push monitor
2022-06-13 22:05:58 -07:00
Louis Lam
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2022-06-14 10:36:29 +08:00
Louis Lam
6424fe77ab
Change successful log from info
to debug
in order to avoid large log and less disk usage
2022-06-13 21:15:47 +08:00
Louis Lam
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2022-06-13 20:56:14 +08:00
Louis Lam
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:53:19 +08:00
Louis Lam
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2022-06-13 18:50:43 +08:00
Matthew Nickson
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <[email protected] >
2022-06-11 17:23:12 +01:00
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2022-06-11 20:59:58 +08:00
Louis Lam
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2022-06-09 19:33:10 +08:00
Aram Akhavan
ea10d89f51
show correct down message for first tick
2022-05-28 19:57:45 -07:00
Louis Lam
7f46223d68
Fix another log.debug call
2022-05-28 23:22:44 +08:00
Louis Lam
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
Moritz R
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
Aram Akhavan
ab4edf2092
Fix log.debug calls
2022-05-26 21:45:56 -07:00
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
c0derMo
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
Moritz R
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
Christopher Pickering
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
Christopher Pickering
c346ea7864
updated name on export
2022-05-13 08:57:06 -05:00
sur.la.route
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <[email protected] >
2022-05-12 19:54:02 -05:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
Karel Krýda
7da9f139c1
Bug fix
2022-05-09 21:10:12 +02:00
Aram Akhavan
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <[email protected] >
2022-05-06 09:58:05 -07:00
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2022-05-06 14:41:34 +08:00
Greg Smith
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
Greg Smith
d0546afe71
fix esm require: no ugly warnings
2022-05-01 10:22:16 +09:30
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
Aram Akhavan
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
2022-04-26 00:26:26 +02:00
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
Matthew Nickson
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <[email protected] >
2022-04-22 19:10:13 +01:00
Matthew Nickson
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <[email protected] >
Signed-off-by: Matthew Nickson <[email protected] >
2022-04-22 18:42:47 +01:00
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <[email protected] >
2022-04-21 20:02:18 +01:00