Sascha Kruse
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2022-05-18 15:56:21 +02:00
Sascha Kruse
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-18 15:55:36 +02:00
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02: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 <saibamenppl@gmail.com>
2022-05-12 19:54:02 -05:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
Sascha Kruse
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
Louis Lam
59be9bb971
working
2022-05-11 00:51:11 +08: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 <saibamenppl@gmail.com>
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
OidaTiftla
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-05-05 15:55:33 +02:00
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02: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 <mnickson@sidingsmedia.com>
2022-04-22 19:10:13 +01:00
Matthew Nickson
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 18:42:47 +01:00
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 20:02:18 +01:00
Matthew Nickson
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 18:30:04 +01:00
OidaTiftla
7ed8ae9f7c
Fix trailing space warning
2022-04-21 18:23:32 +02:00
OidaTiftla
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:45:58 +02:00
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2022-04-21 13:01:22 +01:00
OidaTiftla
60f8ab7285
Use new logging mechanism
2022-04-21 12:09:59 +02:00
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
Louis Lam
359a490ae3
Fix #1510
2022-04-18 15:21:58 +08:00
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
e6a8a84278
Include only nessacary data in webhook
2022-04-17 19:30:58 +08:00
Louis Lam
47c72192e1
[eslint] Enable yoda and eqeqeq
2022-04-17 15:43:03 +08:00
Louis Lam
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
Matthew Nickson
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 21:11:45 +01:00
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2022-04-17 01:39:49 +08:00
Louis Lam
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
2022-04-17 01:06:47 +08:00
Louis Lam
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
Matthew Nickson
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-13 21:02:19 +01:00
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
2022-04-14 01:20:54 +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
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02: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
c9fa183712
Manage domain names
2022-04-10 00:25:27 +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
Moritz R
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
Moritz R
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-03 17:15:21 +02:00
Jimmy Huang
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-04-01 15:26:50 +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
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
2022-03-27 21:19:57 +02: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
aef0a66205
[Status Page] Simplify show tags logic
2022-03-18 17:56:46 +08:00
Louis Lam
e87cdf4d09
[Status Page] wip, upload logo and status page listing
2022-03-17 16:42:26 +08:00
Louis Lam
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
2022-03-16 15:38:10 +08:00
Louis Lam
18ec42b060
[Status Page] wip
2022-03-16 14:14:47 +08:00
Louis Lam
50d6e888c2
[new status page] wip
2022-03-10 21:34:30 +08:00
Uğur Erkan
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
2022-03-06 19:34:51 +03: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 Lam
595cd93220
Check invalid interval
2022-02-24 15:11:17 +08:00
Jimmy Huang
244a7b3671
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-02-07 18:46:16 +08:00
Jimmy Huang
ee90d2713f
refs issue-1201 in upstream.
...
Add 100 characters from response body to bean.msg after keyword not match.
2022-01-25 17:39:19 +08:00
OidaTiftla
f390a8caf1
Fix missing DB patch and use DATETIME as column format
2022-01-24 21:59:25 +01:00
OidaTiftla
11e9eee09d
Change seconds to minutes
2022-01-23 17:48:09 +01:00
OidaTiftla
1ac904d6d6
Introduce resend interval if down
2022-01-23 15:22:57 +01:00
c0derMo
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
2022-01-22 01:57:37 +00:00
Tarun Singh
22256dfcd2
added timeout for removing the dead loop state
2022-01-20 13:04:59 -05:00
c0derMo
4818bb67d6
Added trailing comma, fixed spelling & translation
2022-01-14 09:09:37 +00:00
c0derMo
c5cc42272f
Fixing the editing of docker container & adding english translation
2022-01-13 18:28:45 +00:00
c0derMo
b0259b5592
Added docker container monitor
2022-01-13 16:17:07 +00:00
Louis Lam
227bbdea2f
[MQTT] Try to improve error handling
2022-01-13 12:42:34 +08:00
Louis Lam
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
2022-01-13 11:53:08 +08:00
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +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
Tarun Singh
d3c90df8a8
fixed edit monitor fields empty issues
2021-12-18 16:35:18 -05:00
Louis Lam
a42932a43e
Simulate Chrome's request Accept header. Better handling of #1067
2021-12-16 15:09:10 +08:00
Andreas Brett
38f8a8ac2f
Merge branch 'louislam:master' into logging
2021-12-10 17:21:55 +01:00
Louis Lam
dcc91d6c72
Fix #922
2021-12-08 14:59:59 +08:00
Andreas Brett
a13bdaac84
Merge branch 'master' into logging
2021-11-29 20:32:42 +01: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
3d222ac5f5
fix btoa is not define
2021-11-23 12:59:48 +08:00
Tarun Singh
35da8c78f4
added connection timeout and refactored code
2021-11-22 03:21:53 -05:00
Tarun Singh
3f5133d1ba
Added authentication logic
2021-11-16 20:44:10 -05:00
Andreas Brett
e5913c5abc
separate log functions
2021-11-15 17:52:28 +01:00
Andreas Brett
bdcdf47e52
introduce consistent logging
2021-11-11 12:31:28 +01:00
Louis Lam
41a6d1b701
Fix parseCertificateInfo possibly in dead loop
2021-11-08 15:39:17 +08:00
Ivan Bratović
34d8984e3a
Merge branch 'master' into http-basicauth
2021-11-07 17:15:36 +01:00
Louis Lam
c92153c97e
add more debug msg
2021-11-07 21:00:47 +08:00
Tarun Singh
2d802585ff
Update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-04 22:21:54 -04:00
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
Ivan Bratović
0dcb7aed21
Delinting
2021-11-04 09:50:10 +01:00
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
2021-11-04 09:50:10 +01:00
Tarun Singh
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
Louis
d7f7dba13f
write some error logs to ./data/error.log
2021-10-29 18:24:47 +08:00
