68ead3414d
WIP
2 years ago
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
2 years ago
d4752b65de
WIP
2 years ago
dc4d2a77bb
WIP
2 years ago
1bfb290718
feat: add message thread id for telegram nonfiction
2 years ago
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
2 years ago
afadfe32d5
Trim
2 years ago
5f2affb38c
Relocate and fix jsesc issue
2 years ago
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2 years ago
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
a823ed8ccc
Feature - Google Analytics - Removed unused import.
2 years ago
2a6d98ff01
Feat: Expand and Simplify Badge Functionality ( #2211 )
...
* [expanding badges] added new configs
* [expanding badges] recieve ping in getPreviousHeartbeat()
* [expanding badges] re-added original new badges
* [expanding badges] recreate parity between old and new badges
* [expanding badges] fix linting
2 years ago
913bb611d5
Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
2 years ago
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2 years ago
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2 years ago
fb2999706c
Feature - Google Analytics - Added JSDoc to Google Analytics functions.
2 years ago
2b3a3895b3
Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895
2 years ago
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2 years ago
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2 years ago
9446c2d102
fix: use active instead of isActive in uploadBackup
2 years ago
2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
f286386f59
fix: add message for empty group pending state
2 years ago
9286dcb6ce
fix: add serverside check against endless loops
2 years ago
683f446cf5
Add support for `.env`
2 years ago
348d0170fa
Chore: Use constants instead of int
2 years ago
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge
...
Fix: Add support for pending & maintenance in badges
2 years ago
9a46b50989
docs: add comments
2 years ago
f3ac351d75
feat: set childs under maintenance if parent is too
2 years ago
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
aba515e172
feat: disable childs if parent is disabled
2 years ago
ddce8f0cb0
Fix plugin installation
2 years ago
97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
2 years ago
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2 years ago
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2 years ago
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2 years ago
c4c720027c
Fix: Use correct log call format
2 years ago
83e0401dd8
Show game list for GameDig monitor
2 years ago
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2 years ago
cd017fce98
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
fa23e7ad19
Removed superflous Message prefix
2 years ago
aef85078eb
reorder fix
2 years ago
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2 years ago
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2 years ago
a5ff27da7a
Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2 years ago
27585d0812
Fix #2618
2 years ago
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
...
Fix: Allow long sms in PromoSMS
2 years ago
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
2 years ago
1326761a8a
Update mongodb and simplify the logic of mongodbPing
2 years ago
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2 years ago
be850dd596
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
2 years ago
3adc9e65d6
Add only xml support to http monitors
2 years ago
712a3c29d4
Fix Postgres monitor do not handle some error cases correctly
2 years ago
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2 years ago
3b5893ea60
fix: add preserve line in redisPingAsync
2 years ago
21cd4d64c3
fix: redisPingAsync
2 years ago
db757123ba
refactor: reuse databaseConnectionString
2 years ago
71f00b3690
Parse push ping parameter with parseInt.
2 years ago
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2 years ago
b91fe9d96d
Added a more telegram options
...
such as thread id, silent notifications and forward protect
2 years ago
a21a47de93
[ #2593 ] renamed the method `sendCertNotification` to better represent what id does. Evaluate certificate expiry from all certs in chain. Send a separate notification for every cert in chain, including cert type and CN.
2 years ago
f6d0f28b3a
[ #2593 ] during certificate evaluation also set the cert type for improved notifications
2 years ago
8433bceb32
Trim message to maximum allowed length
2 years ago
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
...
Add Splunk Notification Provider
2 years ago
0ed3dd5e4f
Fix: Add support for pending in badges
2 years ago
d9f12a6376
Fallback to `/bin/ping` if `ping` is not found
2 years ago
56ba133a1f
Missing semicolon
2 years ago
ec30147a7f
Add option for allowing long sms in PromoSMS
2 years ago
2172112144
Setting for allowing long sms
2 years ago
ecd661c801
Allow long sms in PromoSMS
2 years ago
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
33355c51b7
Add Splunk Notifications
2 years ago
94b69935fe
chore(server): remove comments from status-page router
2 years ago
3f30feaefb
feat(server): add badge for overall status of status-page
2 years ago
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
...
Fixed negative retention time values
2 years ago
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
f8658d6160
Removed redundant title in Pushover notification
2 years ago
dd82f36da3
Fix: Improve syntax & fix weird label logic
2 years ago
774d754b21
Add GameDig monitor
2 years ago
5d6770c0db
Removed excess space around function
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2 years ago
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
40ebc2df79
feat: support redis monitor
2 years ago
8ec240fe19
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
...
feat: Change ping module to danielzzz/node-ping
2 years ago
0b959514f8
Fix timeout
2 years ago
7d92351568
Match previous settings
2 years ago
494c53971c
Convert to UTF8 on Windows only
2 years ago
fc1914bccd
Fix lint
2 years ago
c196c34840
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
90a2668272
Restructured condition + ensure data is UTF-8
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
69e1880cd3
Added not active condition to prevent false error
...
Added a check to see if the host is alive. This prevents failiures when
the user specifies a hostname of `unknown`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
73835f3328
Changed from ping-lite to ping module
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
#Fixes 2126
2 years ago
204792dd2d
Fix: Fix incorrect handling for container down
2 years ago
942b55ca03
Fix: Add support for maintenance in badges
2 years ago
0cead83705
Fix #2516
2 years ago
a8af2a418e
Slack notification block not working ( #1958 )
...
* [empty commit] pull request for slack notification
* Add attachments block for slack notification
* chore: update action button in new attachment block
* chore: loop in attachments to push blocks
* chore: missing semicolon
Co-authored-by: pruekanw <arniwatt.c@linecorp.com>
2 years ago
39ac9b887e
Fix #2504
2 years ago
50711391d1
Revert "Auth: Case insensitive login check on username"
2 years ago
e88e10cc8e
Fix #2494
2 years ago
27146ffeef
Merge pull request #2433 from mathiash98/mathias/Auth-case-insensitive-login
...
Auth: Case insensitive login check on username
2 years ago
41a9f2ff8a
Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc
...
Bug fix: gRPC check throws errors when response data size > 50 chars
2 years ago
cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
...
Add Kook notification provider
2 years ago
8bb064c6fa
Merge pull request #2157 from Mikkel-T/fix-discord-embed
...
Improve the URL field in Discord embeds
2 years ago
1006fbd873
A possible fix for #2447
2 years ago
5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
...
Zoho Cliq Notification Provider
2 years ago
d111db0321
fix: add accurate error message when user input invalid service name or method name
2 years ago
4147a4c404
fix : #2480
2 years ago
9404efd86d
Fixed the metrics for the push type.
2 years ago
c60b741406
Add kook notification provider
2 years ago
e12225e595
Fix #2475 #2468 #2455 , add Accept-Encoding only if encountered the abort error
2 years ago
1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
...
Fix discord notification not sending when docker container goes down
2 years ago
14fffcf06b
Globally fix if heartbeatJSON["msg"] is undefined
2 years ago
a4de93f976
WIP
2 years ago
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
2 years ago
c79b2913a2
Auth: Case insensitive login check on username
...
Allows users to add users with capital letters and then login with just lowercase letters.
We accidentally capitalized the first letter of our username so the other people using it frequently thinks they wrote the wrong password.
2 years ago
df21f7da76
Check login for initServerTimezone
2 years ago
b75db27658
Fix lint
2 years ago
765d8e1297
Fix #2318
2 years ago
9dc2cc1f0d
Copy timezone.js from dayjs
2 years ago
1da00d19fd
Try to fix `incorrect header check`
2 years ago
466b403a96
Handle unexpected error of checkCertificate
2 years ago
f32441e2f6
fix discord notification not sending when docker container is down
2 years ago
39987ba9ac
Init server timezone
2 years ago
3b87209e26
Add configurable dns cache
2 years ago
3b58fd3b3c
Cache uptime
2 years ago
bc86f8bb5f
Reset busy_timeout to default
2 years ago
02b5cae577
Fix #2371 by left join maintenance_timeslot
2 years ago
4cd5b5563f
Fix #1145
2 years ago
9da28fbbc7
zoho cliq code style
2 years ago
851a04b082
zoho cliq code style
2 years ago
68bc7ac421
zoho cliq code style
2 years ago
73bfdb9ef9
zoho cliq notification provider
2 years ago
e478084ff9
Fix Uptime Kuma cannot be stopped
2 years ago
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
3 years ago
c4125a8334
style: fix linter error
3 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
3 years ago
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
3 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
3 years ago
e5e8db6c38
Add cacheable-lookup
3 years ago
dddd2c0042
Cache settings, reduce the database / disk usage
3 years ago
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
3 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
3 years ago
f84ae82983
feat: added Home Assistant notification integration
3 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
3 years ago
1f5466a3e8
Revert #1598
3 years ago
c36d9a4b8b
Fix port data type #1802
3 years ago
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
3 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
3 years ago
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
3 years ago
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
edcdedcaae
Added check for blank password.
3 years ago
945288f0c0
Added postgres monitor
3 years ago
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
3 years ago
869a040011
Merge branch 'master' into introduce-resend-interval
3 years ago
fdbdf83a0d
Fix data type of `notification.isDefault` and `notification.active` ( #1765 )
3 years ago
ac449ec1c2
Merge branch 'master' into master
3 years ago
660005b143
cleaned up code
3 years ago
98f3c126e5
passed lint
3 years ago
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
3 years ago
c690d1c3a1
fix timeout bypass for upside down push monitor
3 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
3 years ago
54b9698a05
Update
3 years ago
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
3 years ago
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
3 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
3 years ago
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
3 years ago
1c4ddaeddf
Update
3 years ago
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
404923b7c8
bugfix
3 years ago
a41023ca2a
Update
3 years ago
817c941489
Add Bark Notification Parameters
3 years ago
5f6347d277
pull request for adding alertnow notification
3 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>
3 years ago
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 years ago
aa398948da
Merge branch 'louislam:master' into patch-1
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
54548e34ed
Added label to status badge
3 years ago
2c0180f323
Fix: Fix error when status page desc. is null
3 years ago
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
3 years ago
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
3 years ago
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
3 years ago
091158cfe7
[Status Page] Preload data
3 years ago
e4ad8cbfc8
Remove unused variables
3 years ago
a674caa520
[Status Page] Add og meta tags
3 years ago
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c095767f4a
[Status Page] SSR
3 years ago
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
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
5830f1e0b5
[feat] Adding PagerDuty notification
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
f23baf9c22
Added Push Monitor to Discord Notifications
3 years ago
54184350a4
fix: missing semicolons
3 years ago
14dbe7c334
clean up + default ntfs.sh server url
3 years ago
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
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
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
cec0521834
[Discord] Fix ping type should no port, update better naming
3 years ago
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
3 years ago
ef73af391f
added option for ntlm authorization
3 years ago
44f6fca945
added finally to close connection pool
3 years ago
c346ea7864
updated name on export
3 years ago
f0ad32a252
merged
3 years ago
5720017fb4
updated name on import
3 years ago
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
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
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
59be9bb971
working
3 years ago
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
3 years ago
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
7da9f139c1
Bug fix
3 years ago
42f931f6cf
Merge branch 'master' into master
3 years ago
2fe5c090aa
small fixes
3 years ago
b680371746
Make apprise notification title configurable in UI
3 years ago
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
cd3fbc80b4
Add first parameter back to logging in api router
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
Louis Lam
Faruk Genç
Haytham Salama
c
Joseph
Peace
Peace
Nelson Chan
Thomas Spalinger
alejandrohernandezrosales
long2ice
Ruben
shyneko
Sebastian Kaempfe
Łukasz Szczepański
Luke
twiggotronix
Matthew Nickson
Joseph Irving
Sjouke de Vries
SlothCroissant
Adam Spurgeon
David Twigger
Arniwatt Chonkiattipoom
minhhoang
401Unauthorized
Mathias Haugsbø
zImPatrick
panos
Joshua Brunner
rmarops
Jan Hartje
Dafnik
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
Karel Krýda
Marc Hagen
DasCanard
Philipp Dormann
Sascha Kruse
Sascha Kruse
Christopher Pickering
Jordan Bertasso
Karel Krýda
Clemens Wolff