0686757160
[Docker Monitor] Change `tcp://` to `http://`
2022-10-04 16:19:56 +08:00
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2022-08-11 21:08:06 +08:00
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2022-07-24 14:07:30 +08:00
e356d5f623
Fixing linting & adding documentation
2022-07-22 15:57:40 +00:00
0d098b0958
Docker Hosts are now a table & have their own dialog
2022-07-22 15:47:04 +00:00
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2022-07-18 23:46:55 +08:00
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
1f5466a3e8
Revert #1598
2022-06-23 15:54:33 +08:00
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2022-06-18 23:53:35 +01:00
945288f0c0
Added postgres monitor
2022-06-15 12:12:47 -05:00
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-06-15 17:50:35 +02:00
869a040011
Merge branch 'master' into introduce-resend-interval
2022-06-15 16:19:47 +02:00
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
660005b143
cleaned up code
2022-06-14 08:49:36 -05:00
98f3c126e5
passed lint
2022-06-14 07:58:35 -05:00
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2022-06-14 07:42:53 -05:00
c690d1c3a1
fix timeout bypass for upside down push monitor
2022-06-13 22:05:58 -07:00
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
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
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
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
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
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 <mnickson@sidingsmedia.com>
2022-06-11 17:23:12 +01:00
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
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
ea10d89f51
show correct down message for first tick
2022-05-28 19:57:45 -07:00
7f46223d68
Fix another log.debug call
2022-05-28 23:22:44 +08:00
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2022-05-28 23:19:58 +08:00
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
ab4edf2092
Fix log.debug calls
2022-05-26 21:45:56 -07:00
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
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
b7ba6330db
Feat: Add cert exp. settings
2022-05-19 16:49:34 +08:00
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2022-05-18 15:56:21 +02:00
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-18 15:55:36 +02:00
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
c346ea7864
updated name on export
2022-05-13 08:57:06 -05:00
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-12 19:54:02 -05:00
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
7da9f139c1
Bug fix
2022-05-09 21:10:12 +02:00
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-06 09:58:05 -07:00
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2022-05-06 14:41:34 +08:00
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-05 15:55:33 +02:00
Louis Lam
Moritz R
c0derMo
Matthew Nickson
Christopher Pickering
OidaTiftla
OidaTiftla
Aram Akhavan
Nelson Chan
Sascha Kruse
Sascha Kruse
Christopher Pickering
Karel Krýda