6bb79597e8
fix: resolve merge conflict
2 years ago
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
31cc328839
fix lint
2 years ago
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
2b9bf095a6
Add non-json support for http body
2 years ago
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
2 years ago
34ab6142db
fix: remove new space line
2 years ago
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
8ced61697a
Fix save docker host issue
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
e356d5f623
Fixing linting & adding documentation
2 years ago
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2 years ago
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
2073f0c284
Bind cacheable-lookup to custom http agent
2 years ago
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>
2 years ago
d29955f3ba
Merge pull request #1741 from Computroniks/feature/#1221-clickable-hostaname-on-status-page
...
Added #1221 clickable hostname in status page
2 years ago
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
1f5466a3e8
Revert #1598
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
945288f0c0
Added postgres monitor
2 years ago
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
660005b143
cleaned up code
2 years ago
98f3c126e5
passed lint
2 years ago
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2 years ago
c690d1c3a1
fix timeout bypass for upside down push monitor
2 years ago
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
2 years ago
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
2 years ago
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2 years ago
a28ef56553
Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
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>
2 years ago
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
2 years ago
2c0180f323
Fix: Fix error when status page desc. is null
2 years ago
091158cfe7
[Status Page] Preload data
2 years ago
a674caa520
[Status Page] Add og meta tags
2 years ago
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
c095767f4a
[Status Page] SSR
2 years ago
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
2 years ago
ea10d89f51
show correct down message for first tick
2 years ago
7f46223d68
Fix another log.debug call
2 years ago
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
2 years ago
e9e78c26e5
Merge branch 'master' into master
2 years ago
ab4edf2092
Fix log.debug calls
2 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2 years ago
32cfd411f8
Fixed style & code errors
2 years ago
a9f3142cee
Merge branch 'master' into master
2 years ago
b7ba6330db
Feat: Add cert exp. settings
2 years ago
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
2 years ago
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2 years ago
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2 years ago
ef73af391f
added option for ntlm authorization
3 years ago
c346ea7864
updated name on export
3 years ago
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
87f933df4f
added sqlserver monitor
3 years ago
398ecb7666
add radius check
3 years ago
59be9bb971
working
3 years ago
7da9f139c1
Bug fix
3 years ago
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
9a35386841
Merge branch 'master' into master
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
d0546afe71
fix esm require: no ugly warnings
3 years ago
b4ffcc5555
Added JSDoc
3 years ago
f78d01d770
Resolve lint errors
3 years ago
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
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
3 years ago
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
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
3 years ago
5fbfacf5ce
Fix ESlint warnings
3 years ago
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
7ed8ae9f7c
Fix trailing space warning
3 years ago
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
60f8ab7285
Use new logging mechanism
3 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
359a490ae3
Fix #1510
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
e6a8a84278
Include only nessacary data in webhook
3 years ago
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
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
3 years ago
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
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>
3 years ago
649f3106e1
Enforce semicolon, fix format globally
3 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
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
3 years ago
c9fa183712
Manage domain names
3 years ago
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
af44b0beab
Merge branch 'master' into master
3 years ago
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
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
3 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
e87cdf4d09
[Status Page] wip, upload logo and status page listing
3 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
18ec42b060
[Status Page] wip
3 years ago
50d6e888c2
[new status page] wip
3 years ago
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
3 years ago
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
3 years ago
595cd93220
Check invalid interval
3 years ago
244a7b3671
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
ee90d2713f
refs issue-1201 in upstream.
...
Add 100 characters from response body to bean.msg after keyword not match.
3 years ago
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
3 years ago
f390a8caf1
Fix missing DB patch and use DATETIME as column format
3 years ago
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
11e9eee09d
Change seconds to minutes
3 years ago
1ac904d6d6
Introduce resend interval if down
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
22256dfcd2
added timeout for removing the dead loop state
3 years ago
4818bb67d6
Added trailing comma, fixed spelling & translation
3 years ago
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
b0259b5592
Added docker container monitor
3 years ago
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
1e92487f30
Chore: Remove onDelete as unused
3 years ago
edd2534a1b
Fix: Clear metrics also on stop and edit
3 years ago
f6ef390c76
Fix: Remove Prom. metrics on delete monitor
3 years ago
d3c90df8a8
fixed edit monitor fields empty issues
3 years ago
a42932a43e
Simulate Chrome's request Accept header. Better handling of #1067
3 years ago
934d633d4d
Add description to monitor
...
* Add description to monitor model
* Add description field to database
* Add english and spanish translation for description
* Closes : #482
3 years ago
38f8a8ac2f
Merge branch 'louislam:master' into logging
3 years ago
dcc91d6c72
Fix #922
3 years ago
a13bdaac84
Merge branch 'master' into logging
3 years ago
minhhn3
Louis Lam
Justin Tisdale
Minh Hoàng
Moritz R
c0derMo
Matthew Nickson
Christopher Pickering
OidaTiftla
OidaTiftla
Aram Akhavan
Nelson Chan
Karel Krýda
Sascha Kruse
Sascha Kruse
Christopher Pickering
Karel Krýda
Greg Smith
Adam Stachowicz
Jimmy Huang
Uğur Erkan
Jimmy Huang
Tarun Singh
Juan Cruz Vincenti
Andreas Brett