24cb212a37
Fix recurring
2022-10-15 20:15:50 +08:00
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-13 00:32:05 +08:00
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +08:00
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
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2022-10-04 16:19:56 +08:00
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 01:52:53 +01:00
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2022-09-28 00:20:17 +08:00
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2022-09-27 20:44:44 +08:00
6537f4fe74
content-type change
2022-09-26 17:09:10 -04:00
5809088f27
Don't override a user-defined content-type header
2022-09-26 15:52:43 -04:00
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2022-09-17 16:12:57 +08:00
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2022-08-20 10:24:18 -04:00
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-08-13 21:15:16 +02:00
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
31cc328839
fix lint
2022-08-11 21:08:13 -04:00
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2022-08-11 21:04:11 -04:00
2b9bf095a6
Add non-json support for http body
2022-08-11 20:57:03 -04: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
34ab6142db
fix: remove new space line
2022-08-08 19:38:43 +07: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
2232236a7a
[empty commit] pull request for add gRPC protocol
2022-08-03 13:39:31 +07:00
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07: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
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-14 08:32:51 +01: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
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:31:45 +02: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
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +08: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
9a35386841
Merge branch 'master' into master
2022-05-06 11:24:21 +02: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
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
d0546afe71
fix esm require: no ugly warnings
2022-05-01 10:22:16 +09:30
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
2022-04-30 13:40:34 +02:00
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
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
5fbfacf5ce
Fix ESlint warnings
2022-04-26 00:26:26 +02:00
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-22 19:10:13 +01:00
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
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 20:02:18 +01:00
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
7ed8ae9f7c
Fix trailing space warning
2022-04-21 18:23:32 +02:00
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:45:58 +02:00
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2022-04-21 13:01:22 +01:00
60f8ab7285
Use new logging mechanism
2022-04-21 12:09:59 +02:00
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
e6a8a84278
Include only nessacary data in webhook
2022-04-17 19:30:58 +08:00
47c72192e1
[eslint] Enable yoda and eqeqeq
2022-04-17 15:43:03 +08:00
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-16 21:11:45 +01:00
Louis Lam
Matthew Nickson
Justin Tisdale
minhhn3
Minh Hoàng
Moritz R
c0derMo
Christopher Pickering
OidaTiftla
OidaTiftla
Aram Akhavan
Karel Krýda
Nelson Chan
Sascha Kruse
Sascha Kruse
Christopher Pickering
Karel Krýda
Greg Smith
Adam Stachowicz