Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2 years ago
Louis Lam
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
2 years ago
Christopher Pickering
ef73af391f
added option for ntlm authorization
3 years ago
Christopher Pickering
c346ea7864
updated name on export
3 years ago
sur.la.route
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Christopher Pickering
87f933df4f
added sqlserver monitor
3 years ago
Sascha Kruse
398ecb7666
add radius check
3 years ago
Louis Lam
59be9bb971
working
3 years ago
Karel Krýda
7da9f139c1
Bug fix
3 years ago
Aram Akhavan
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Karel Krýda
9a35386841
Merge branch 'master' into master
3 years ago
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
OidaTiftla
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
Greg Smith
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
Greg Smith
d0546afe71
fix esm require: no ugly warnings
3 years ago
Karel Krýda
b4ffcc5555
Added JSDoc
3 years ago
Karel Krýda
f78d01d770
Resolve lint errors
3 years ago
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
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
3 years ago
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
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
3 years ago
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
3 years ago
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Matthew Nickson
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
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
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
OidaTiftla
7ed8ae9f7c
Fix trailing space warning
3 years ago
OidaTiftla
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
OidaTiftla
60f8ab7285
Use new logging mechanism
3 years ago
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam
359a490ae3
Fix #1510
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
e6a8a84278
Include only nessacary data in webhook
3 years ago
Louis Lam
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
Matthew Nickson
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
Louis Lam
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
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
3 years ago
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
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>
3 years ago
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
3 years ago
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
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
3 years ago
Louis Lam
c9fa183712
Manage domain names
3 years ago
Louis Lam
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
Moritz R
af44b0beab
Merge branch 'master' into master
3 years ago
Moritz R
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jimmy Huang
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
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
3 years ago
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
Louis Lam
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
Louis Lam
e87cdf4d09
[Status Page] wip, upload logo and status page listing
3 years ago
Louis Lam
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
Louis Lam
18ec42b060
[Status Page] wip
3 years ago
Louis Lam
50d6e888c2
[new status page] wip
3 years ago
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
3 years ago
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
3 years ago
Louis Lam
595cd93220
Check invalid interval
3 years ago
Jimmy Huang
244a7b3671
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Karel Krýda
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
Jimmy Huang
ee90d2713f
refs issue-1201 in upstream.
...
Add 100 characters from response body to bean.msg after keyword not match.
3 years ago
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
3 years ago
OidaTiftla
f390a8caf1
Fix missing DB patch and use DATETIME as column format
3 years ago
Karel Krýda
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
OidaTiftla
11e9eee09d
Change seconds to minutes
3 years ago
OidaTiftla
1ac904d6d6
Introduce resend interval if down
3 years ago
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
c0derMo
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
Tarun Singh
22256dfcd2
added timeout for removing the dead loop state
3 years ago
c0derMo
4818bb67d6
Added trailing comma, fixed spelling & translation
3 years ago
c0derMo
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
c0derMo
b0259b5592
Added docker container monitor
3 years ago
Louis Lam
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
Louis Lam
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Nelson Chan
1e92487f30
Chore: Remove onDelete as unused
3 years ago
Nelson Chan
edd2534a1b
Fix: Clear metrics also on stop and edit
3 years ago
Nelson Chan
f6ef390c76
Fix: Remove Prom. metrics on delete monitor
3 years ago
Tarun Singh
d3c90df8a8
fixed edit monitor fields empty issues
3 years ago
Louis Lam
a42932a43e
Simulate Chrome's request Accept header. Better handling of #1067
3 years ago
Andreas Brett
38f8a8ac2f
Merge branch 'louislam:master' into logging
3 years ago
Louis Lam
dcc91d6c72
Fix #922
3 years ago
Andreas Brett
a13bdaac84
Merge branch 'master' into logging
3 years ago
Louis Lam
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
Louis Lam
3d222ac5f5
fix btoa is not define
3 years ago
Tarun Singh
35da8c78f4
added connection timeout and refactored code
3 years ago
Tarun Singh
3f5133d1ba
Added authentication logic
3 years ago
Andreas Brett
e5913c5abc
separate log functions
3 years ago
Andreas Brett
bdcdf47e52
introduce consistent logging
3 years ago
Louis Lam
41a6d1b701
Fix parseCertificateInfo possibly in dead loop
3 years ago
Ivan Bratović
34d8984e3a
Merge branch 'master' into http-basicauth
3 years ago
Louis Lam
c92153c97e
add more debug msg
3 years ago
Tarun Singh
2d802585ff
Update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
Ivan Bratović
0dcb7aed21
Delinting
3 years ago
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
3 years ago
Tarun Singh
670754b697
added MQTT monitor type
3 years ago
Louis
d7f7dba13f
write some error logs to ./data/error.log
3 years ago
Louis Lam
eb22ad5ffe
[certificate notification] error handling and better msg
3 years ago
Louis Lam
f5f4835b74
[certificate notification] clear sent history if the cert is changed
3 years ago
Louis Lam
44c1b336dc
send certificate notifications in 21, 14, 7 days
3 years ago
Louis Lam
640b6e5b1c
prevent monitor dead for unexpected error
3 years ago
Louis Lam
698a38e773
clear status page cache in a better place
3 years ago
Louis Lam
68d44dd9b3
[steam] do not request if there is no steam api key
3 years ago
Louis Lam
20d59e5a13
fix and move the steam api key to settings page
3 years ago
Louis Lam
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
3 years ago
Bert Verhelst
1d63dd9ddd
fix(monitor): safely get status of previous beat if first beat
3 years ago
Louis Lam
7276f34d90
fix reset-password
3 years ago
Louis Lam
cd211a6be7
[http options] fine tune
3 years ago
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
Louis Lam
3b74b727f2
[Push Type] fix missing important flag and missing up notification
3 years ago
Bert Verhelst
5445c2a2ff
fix(monitor): revert unintentional change to comment
3 years ago
Bert Verhelst
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam
82131f4dd2
merge conflict
3 years ago
Bert Verhelst
5137c80c07
fix(monitor): handle empty headers
3 years ago
LouisLam
56ae6f6117
fix demoMode export
3 years ago
LouisLam
5c89562650
not allow lower than 20s for demo mode
3 years ago
Bert Verhelst
d71d27220b
fix(edit-monitor): store headers as JSON
3 years ago
Bert Verhelst
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam
a15e9077fc
[status page] clear cache if it is an important beat
3 years ago
Bert Verhelst
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
3 years ago
Bert Verhelst
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
3 years ago
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
LouisLam
3e4154dfb5
Fix retry interval affected bug
3 years ago
Denis Freund
b67b4d5afd
add steam gameserver for monitoring
3 years ago
LouisLam
0a5a6e6a4b
[status page] fix monitor order
3 years ago
LouisLam
fe0fc63843
[status page] send uptime
3 years ago
LouisLam
7ee98d989c
[status page] implement rest api for heartbeat
3 years ago
LouisLam
fd95d41d9f
[status page] many update and save group list
3 years ago
Louis
a6fdd272a6
[status page] minor
3 years ago
LouisLam
2955abb5d9
[status page] create incident
3 years ago
LouisLam
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
3 years ago
Louis Lam
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
3 years ago
No0Vad
1300448bed
Adjustments to the retry interval
...
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
3 years ago
LouisLam
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
3 years ago
Nelson Chan
6e3a904aaa
WIP: Add tags functionality
...
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
3 years ago
LouisLam
e205adfd7b
[status page] developing
3 years ago
No0Vad
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
3 years ago
LouisLam
8ee34c7904
also handle the first beat problem in uptime
3 years ago
LouisLam
4f07c2ea9a
uptime calculation fully sum in sql
3 years ago