04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 years ago
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
3 years ago
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
ea10d89f51
show correct down message for first tick
3 years ago
7f46223d68
Fix another log.debug call
3 years ago
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
e9e78c26e5
Merge branch 'master' into master
3 years ago
ab4edf2092
Fix log.debug calls
3 years ago
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
32cfd411f8
Fixed style & code errors
3 years ago
a9f3142cee
Merge branch 'master' into master
3 years ago
b7ba6330db
Feat: Add cert exp. settings
3 years ago
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
3 years ago
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
3 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
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
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
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
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
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
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
3d222ac5f5
fix btoa is not define
3 years ago
35da8c78f4
added connection timeout and refactored code
3 years ago
3f5133d1ba
Added authentication logic
3 years ago
e5913c5abc
separate log functions
3 years ago
bdcdf47e52
introduce consistent logging
3 years ago
41a6d1b701
Fix parseCertificateInfo possibly in dead loop
3 years ago
34d8984e3a
Merge branch 'master' into http-basicauth
3 years ago
c92153c97e
add more debug msg
3 years ago
2d802585ff
Update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
0dcb7aed21
Delinting
3 years ago
23736549f9
Implement HTTP basic auth feature
3 years ago
670754b697
added MQTT monitor type
3 years ago
d7f7dba13f
write some error logs to ./data/error.log
3 years ago
eb22ad5ffe
[certificate notification] error handling and better msg
3 years ago
f5f4835b74
[certificate notification] clear sent history if the cert is changed
3 years ago
44c1b336dc
send certificate notifications in 21, 14, 7 days
3 years ago
640b6e5b1c
prevent monitor dead for unexpected error
3 years ago
698a38e773
clear status page cache in a better place
3 years ago
68d44dd9b3
[steam] do not request if there is no steam api key
3 years ago
20d59e5a13
fix and move the steam api key to settings page
3 years ago
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
3 years ago
1d63dd9ddd
fix(monitor): safely get status of previous beat if first beat
3 years ago
7276f34d90
fix reset-password
3 years ago
cd211a6be7
[http options] fine tune
3 years ago
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
3b74b727f2
[Push Type] fix missing important flag and missing up notification
3 years ago
5445c2a2ff
fix(monitor): revert unintentional change to comment
3 years ago
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
82131f4dd2
merge conflict
3 years ago
5137c80c07
fix(monitor): handle empty headers
3 years ago
56ae6f6117
fix demoMode export
3 years ago
5c89562650
not allow lower than 20s for demo mode
3 years ago
d71d27220b
fix(edit-monitor): store headers as JSON
3 years ago
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
a15e9077fc
[status page] clear cache if it is an important beat
3 years ago
ec4b7e4064
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
e5f6d7f047
slack and rocket.chat use the primary base url
...
env var to show time logger
3 years ago
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
3 years ago
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
3e4154dfb5
Fix retry interval affected bug
3 years ago
b67b4d5afd
add steam gameserver for monitoring
3 years ago
fe0fc63843
[status page] send uptime
3 years ago
fd95d41d9f
[status page] many update and save group list
3 years ago
a6fdd272a6
[status page] minor
3 years ago
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
3 years ago
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
3 years ago
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
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
3 years ago
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
e205adfd7b
[status page] developing
3 years ago
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
8ee34c7904
also handle the first beat problem in uptime
3 years ago
4f07c2ea9a
uptime calculation fully sum in sql
3 years ago
6006038689
fix monitor.stop() in some cases
3 years ago
0ddbac5109
Revert "move userMonitorList out of server.js"
...
This reverts commit a7cf14c663
3 years ago
0f440596c8
Revert "cache last heartbeat list in memory"
...
This reverts commit 87678ea92d
3 years ago
87678ea92d
cache last heartbeat list in memory
3 years ago
a7cf14c663
move userMonitorList out of server.js
3 years ago
bf29f28726
send stats only if there is at least one client in the room
3 years ago
858affa808
Removed useless database query
3 years ago
303adbf9b1
Show latest dns result in Details.vue
3 years ago
46ac753c46
Merge branch 'master' into dns-monitor
3 years ago
d313a06d5c
Optimizations for output handling
3 years ago
44d9fa63f0
Adjusted the output for A and AAAA records
3 years ago
b2041cb36b
Fixed ESLint Errors
3 years ago
aa2233eb2d
log notification error
3 years ago
e5981b10ce
Replaced var with let and removed re-declaration
3 years ago
50f300dd28
heartbeat interval change to use setTimeout()
3 years ago
c79be19ec3
Added DNS Monitor Type
3 years ago
eed6d3e847
add more query log for dev env
3 years ago
af34e861c5
Merge pull request #200 from proffalken/feature/187_add_cert_checks_to_prometheus
...
Add certificate monitoring to the Prometheus handler
3 years ago
d39b43dacc
fix require problem
3 years ago
6a8ccf627a
add version to user agent
3 years ago
b14f63491d
timeout change to 80% of its interval
3 years ago
692a11e51e
pass tls info to prometheus.update
3 years ago
f099e4270d
change to Accept: */* to better support all websites
3 years ago
59ef1f13db
set longer timeout for axios request
3 years ago
3005585c0f
Merge branch 'master' into redirects&status
3 years ago
123fca43a1
FEAT: darkmode ( #155 )
...
* darkmode fixes
* fix: darkmode: empty beats in active/ hovered state
* fix: color for empty beats
* fix: navbar background color
* Update src/assets/vars.scss
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
* Update src/assets/app.scss
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
* wip, split dark theme style by .dark and store light theme to normal
* add back missing css
* working switch theme button and tuning dark theme
* finish dark theme
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Co-authored-by: LouisLam <louislam@users.noreply.github.com>
3 years ago
8f7885e58a
Feat: Implement MaxRedirects & StatusCodes
3 years ago
63f0a36811
implement upside down mode and ignore tls error
3 years ago
06377af7e5
turn off object-curly-newline, it makes const { a, b, c, d } = require(...) ugly
3 years ago
60aa67892d
store ignoreTls and upsideDown into db
3 years ago
081abcb6a1
add util.ts for sharing common functions between frontend and backend
3 years ago
4c8fdd07d9
Manual fixes
3 years ago
209fa83cff
Add Basic Auth for /metrics
3 years ago
934b797623
Merge branch 'master' into feature/add_prometheus_metrics
...
# Conflicts:
# server/model/monitor.js
3 years ago
caec933186
prevent unexpected error throw from checkCertificate interrupt the beat
3 years ago
db26b7d123
Fix: Fix no certificate caused by session reuse
3 years ago
7b8459c73a
Fix: use Optional chaining
3 years ago
d0c63ebe3e
Feat: Add database storage for TLS info
3 years ago
803f0d6219
Feat: Add Barebones certificate info display
3 years ago
d556509d07
戈mprove the readibility of important condition
3 years ago
1d4d7fa9c4
fix parenthesis mistake
3 years ago
3a8fbff514
Change casing in README, apply DRY to label values
3 years ago
3b45006567
Move common labels into dedicated const
3 years ago
720051a351
Typo in monitor status name
3 years ago
86e18ac11d
Merge branch 'master' into Spiritreader_master
...
# Conflicts:
# src/pages/EditMonitor.vue
3 years ago
3dcbae0889
Add labels to metrics for querying
3 years ago
96242dce0d
Expose check status and response time to Prometheus
3 years ago
03b3bb5b30
fix if notification throw exception, the heartbeat is not stored in to the db.
3 years ago
c4ca8e2acb
More info in server logs
3 years ago
054269ecf0
fix notification when changing from pending -> up
3 years ago
a8b102ad4a
add retries for pinging function
...
backend:
- new field for monitor: maxretries
- new pending status while service is retrying: 2
- pending status event is not marked important
- pending pings however register as downtime in the calculation
frontend:
- added pending status while service is retrying
- added color for new pending status
- added field to configure amount of retries
database:
- IMPORTANT: THIS REQUIRES MIGRATION!!!!
- added field: maxretries with default value 0
3 years ago
a9d19ae06a
support json for keyword type
3 years ago
f84f7aca75
Introduce custom user agent. Fixes #5
...
Quick and easy fix. Could be improved by adding a version number as well. Like `Uptime-Kuma/0.0.1`, for example.
3 years ago
d357dcb334
fix first beat's uptime is 0%
3 years ago
86492f6dad
remove some debug msg
3 years ago
ff4259380e
do not send notification if first beat is UP
3 years ago
0ad04d1468
implement webhook
3 years ago
d24a15410e
send notification for important heartbeat
3 years ago
3bdf174e90
add telegram notification
3 years ago
ea1556ef81
improve uptime calculation
3 years ago
55bd6b6d7a
implement timezone
3 years ago
1d64f643b1
implement keyword monitor
3 years ago
a6b5986dd6
add ping and fix uptime
3 years ago
9c653c3d05
implement tcping
3 years ago
84c21b71c0
implement uptime
3 years ago
82afddcfd6
add duration to heartbeat, add timezone array
3 years ago
46f07fc17e
many update again
3 years ago
9fa84a0a2b
many update
3 years ago
d02401b1c2
many update
3 years ago
0a4fb45a8c
init
3 years ago
Louis Lam
Karel Krýda
Aram Akhavan
Moritz R
c0derMo
Nelson Chan
Sascha Kruse
Sascha Kruse
Christopher Pickering
Christopher Pickering
Karel Krýda
OidaTiftla
OidaTiftla
Greg Smith
Matthew Nickson
Adam Stachowicz
Jimmy Huang
Uğur Erkan
Jimmy Huang
Tarun Singh
Juan Cruz Vincenti
Andreas Brett
Andreas Brett
Ivan Bratović
Bert Verhelst
Denis Freund
No0Vad
Ponkhy
Philipp Dormann
Nelson Chan
Sam
Matthew Macdonald-Wallace
TheGuyDanish