OidaTiftla
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
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2022-06-15 16:19:47 +02: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 <mnickson@sidingsmedia.com>
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
Karel Krýda
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-05-30 15:31:45 +02: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
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
Louis Lam
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2022-05-18 19:49:54 +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 <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
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
Karel Krýda
9a35386841
Merge branch 'master' into master
2022-05-06 11:24:21 +02: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
Karel Krýda
b4ffcc5555
Added JSDoc
2022-04-30 15:50:05 +02:00
Karel Krýda
f78d01d770
Resolve lint errors
2022-04-30 14:57:08 +02:00
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
2022-04-30 21:40:47 +09:30
Karel Krýda
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
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
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
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
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
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
Karel Krýda
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
2022-01-25 19:07:27 +01: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
Karel Krýda
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
2022-01-24 22:33:15 +01:00
OidaTiftla
f390a8caf1
Fix missing DB patch and use DATETIME as column format
2022-01-24 21:59:25 +01:00
Karel Krýda
5fda1f0f59
minor fixes (missing commas, spaces, translations)
2022-01-23 20:33:39 +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
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
2022-01-23 15:22:00 +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