eadf2c810a
Fix check version
2 years ago
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2 years ago
e886df4788
Fix typo
2 years ago
5196abfd36
Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
3e68cf2a1c
Specify `Accept-Encoding` for axios request ( Fix #2253 )
2 years ago
191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
...
Add socks5h support
2 years ago
cd270bd8b5
Add socks5h support
...
Add socks5h support as an extra option to not break previous socks5 implementation.
Allows to toggle between socks5 and socks5h explicit.
Fixes #2296
2 years ago
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
b053bc61ce
Fixed MySQL monitor to close connection
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
0e30843a75
fixed lint check missing semicolon
2 years ago
2103edb604
moved client close out of finally block and fixed linting errors
2 years ago
b059a36e66
added MongoDB ping monitor
2 years ago
258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2 years ago
4042c26390
Fix 'undefined' in link preview generation
2 years ago
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2 years ago
68862c0b3f
Fix Pushbullet do not handle general message correctly and fix name convention ( Close #1890 )
2 years ago
fd15e7c2dc
Merge remote-tracking branch 'origin/master' into ntfy-icon
...
# Conflicts:
# server/notification-providers/ntfy.js
# src/components/notifications/Ntfy.vue
# src/languages/en.js
2 years ago
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
...
Added support for SMSEagle device API notifications
2 years ago
b459408b10
fix: resolve conflict
2 years ago
134b3b8ac1
Fix 'dayjs' is never used warning
2 years ago
08763b700a
Added support for SMSEagle device API notifications
2 years ago
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
24cb212a37
Fix recurring
2 years ago
d8a676abb6
Implement recurring day of month and day of week
2 years ago
0b8d4cdaac
Generate Next Timeslot for recurring interval
2 years ago
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
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>
2 years ago
b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect
...
Fixed entry route not redirecting correctly.
2 years ago
edacff123b
Add UTC in the serverTimezone dropdown
2 years ago
2faf866e9e
Implement generateTimeslot() for recurring interval type
2 years ago
7b9766091e
Revert testing
2 years ago
39b6725163
Update maintenance tables
2 years ago
dfb75c8afb
Update status page's maintenance message
2 years ago
e07aa982c3
WIP
2 years ago
1e8a16504b
Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2 years ago
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2 years ago
c84de4d259
WIP: Add maintenance status
2 years ago
c1ccaa7a9f
WIP
2 years ago
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
71af23cf00
Fix #2207
2 years ago
a577fba848
Change DateTime Range using serverTimezone
2 years ago
a36f24d827
Add configurable server timezone
2 years ago
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2 years ago
ad1a7c255f
Drop exports.entryPage fully
2 years ago
6e07ed2081
Fix #2186
2 years ago
959ecc65ff
Merge remote-tracking branch 'origin/master'
2 years ago
c24b64921d
Fix #2183 ntfy issue
2 years ago
b879428a03
feat(notification): add additional Header to webhook
2 years ago
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
3c5de1c889
Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
528a615fb2
Add free.fr SMS notification provider ( #2159 )
2 years ago
b993859926
Drop Jest e2e testing ( #2174 )
2 years ago
f1a9046193
Prevent terminal window from showing when using ping on Windows ( #2152 )
2 years ago
c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor
...
Fix Docker container monitor not working in 1.18.1
2 years ago
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2 years ago
3e699f8ac3
Fix linting errors.
2 years ago
b0d6b5b13d
Fixed entry route not redirecting correctly when the status entry page changes slug.
2 years ago
3e85893bdd
Merge remote-tracking branch 'origin/master' into squadcast-notification-support
...
# Conflicts:
# src/languages/en.js
2 years ago
543a74ecab
Merge pull request #1923 from rolfbachmann/ntfy-auth-support
...
Add authentication support for ntfy
2 years ago
62ad2f9bb4
Merge pull request #2148 from Computroniks/bug/octopush-notifications-#2144
...
Fixed octopush legacy doesn't return error code
2 years ago
0f99d49a27
Merge remote-tracking branch 'origin/master' into ntfy-auth-support
2 years ago
d93f7b33be
Merge pull request #2153 from Computroniks/bug/#2009-teams-unnecessary-url-field
...
Fixed alert features unnecessary URL field #2009
2 years ago
a42f7416b5
Improve the URL field in Discord embeds
...
Instead of having two different ways of showing the URL field in Discord embeds, always show the raw address.
2 years ago
6a3eccf6a6
Fixed alert features unnecessary URL field #2009
...
The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
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>
2 years ago
97de3959cd
Updated octopush error handling to accept 000
...
The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
63e408f4f2
Fixed octopush legacy doesn't return error code
...
The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
2e54dee817
Fixed Octopush Notifier not working #2144
...
The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
e12642cf21
Fix double quotes in fallback for no icon url in ntfy notification provider settings
2 years ago
6f86236b63
Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today)
2 years ago
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2 years ago
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2 years ago
6537f4fe74
content-type change
2 years ago
5809088f27
Don't override a user-defined content-type header
2 years ago
bef9cb6a5f
Linting fixes
2 years ago
4157c7d546
Add support for Squadcast incoming webhook
2 years ago
0814d643c1
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
3f63cb246b
[WIP] Handle timezone offset for timeRange
2 years ago
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2 years ago
9d99c39f30
Update Maintenance UI for recurring
2 years ago
b03624b7e3
feat: Add ServerChan Notification support
2 years ago
120e578398
Move maintenance code to `maintenance-socket-handler.js`
2 years ago
7017c2e625
Move maintenance code to `maintenance-socket-handler.js`
2 years ago
2f67d26702
Merge manually, as this part had been moved
2 years ago
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
2 years ago
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager
...
feat: Add support notification via SMSManager
2 years ago
38c45a3fe3
Fix previously PR bug about Bark Notification ( #2084 )
...
Co-authored-by: zuosc <zorro.zsc@hotmail.com>
2 years ago
2d5096317f
Fix warning at goalert.js
2 years ago
1c3da995e3
Add support notification via SMSManager
2 years ago
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2 years ago
fa1fc0fb05
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2 years ago
a8ea76e8a1
Remove extra debug log
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
584d52517a
[Linter] fixing quotes with doublequote
2 years ago
82dd9a7c16
golaert req fix and axios update for formdata
2 years ago
d44663c57c
provider name fix
2 years ago
e557545c97
goalert needs post instead of get
2 years ago
40b9d9ed17
goalert provider missing semicolon fix for linter
2 years ago
65e6921a41
goalert notification provider added
2 years ago
3a90d246a4
fix: wrong type
2 years ago
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
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
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2 years ago
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2 years ago
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
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
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2 years ago
71d62ee151
removed ; after the PRAGMA command
2 years ago
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2 years ago
f016caa513
Avoid error "SQLITE_BUSY: database is locked"
...
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2 years ago
2389b604fe
Use Settings.get
2 years ago
a3b1612938
getClientIP respect trustProxy setting
2 years ago
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2 years ago
bea8679788
Merge branch 'master' into issue-1861
2 years ago
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2 years ago
8ced61697a
Fix save docker host issue
2 years ago
f3322398e5
Fix and improve test docker host
2 years ago
4575f31094
Add support for line notify providers ( #1781 )
...
* add line notify support
* add way to get line notify
* Fix duplicate key 'HTTP Basic Auth'
* Revert language files changes
* Revert language files changes
* Fix general message
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
fb3b407577
Added a settings page & localization
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
239611a016
Do not set sendUrl if sendUrl is undefined
2 years ago
c4a2ce4e78
Add authentication support for ntfy
2 years ago
a382f811f4
added comment to startE2eTests function
2 years ago
986c03aecd
test cypress run
2 years ago
af07c7f050
feat(notification): add Authorization Header option to backend
2 years ago
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2 years ago
17ed051401
Add CacheableDnsHttpAgent.install()
2 years ago
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
65d71e5db0
Fix mssqlQuery keep adding error listener, which causes memory leak.
...
Also it is not necessary since the error catched in the promise .catch(..).
2 years ago
2073f0c284
Bind cacheable-lookup to custom http agent
2 years ago
25d711e683
Fix jsdoc data type
2 years ago
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
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
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2 years ago
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
f33b6de157
Support X-Forwarded-Host header
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
c4125a8334
style: fix linter error
2 years ago
0a368ff553
feat: add x-real-ip as a secondary header for client ip
...
Now allows both x-forwarded-for as well as x-real-ip to be used for the client ip, preferring x-forwarded-for
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
e5e8db6c38
Add cacheable-lookup
2 years ago
dddd2c0042
Cache settings, reduce the database / disk usage
2 years ago
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
2 years ago
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2 years ago
f84ae82983
feat: added Home Assistant notification integration
2 years ago
6f01a448ad
feat: get client ip from x-forwarded-for header if available
...
Useful for use-cases where Uptime Kuma is running behind a reverse proxy
2 years ago
1f5466a3e8
Revert #1598
2 years ago
c36d9a4b8b
Fix port data type #1802
2 years ago
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2 years ago
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
edcdedcaae
Added check for blank password.
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
fdbdf83a0d
Fix data type of `notification.isDefault` and `notification.active` ( #1765 )
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
54b9698a05
Update
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
1c4ddaeddf
Update
2 years ago
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
404923b7c8
bugfix
2 years ago
a41023ca2a
Update
2 years ago
817c941489
Add Bark Notification Parameters
2 years ago
5f6347d277
pull request for adding alertnow notification
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
aa398948da
Merge branch 'louislam:master' into patch-1
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
Louis Lam
Joshua Brunner
Matthew Nickson
rmarops
Jan Hartje
Dafnik
minhhn3
Adam Stachowicz
Marcin Kiszka
Christian Meis
janhartje
Ben Scobie
CL0Pinette
Sympatron GmbH
George Tsomlektsis
Mikkel-T
Justin Tisdale
Patrick
MA Junyi
Super Manito
jakubenglicky
Muhammed Hussein karimi
Minh Hoàng
Joseph Benguira
rmt/src
0x01code
Moritz R
c0derMo
Rolf Bachmann
tamasmagyar
Chongyi Zheng
theS1LV3R
sur.la.route
OidaTiftla
OidaTiftla
Aram Akhavan
Daeho Ro
Wooferz