ce70b3fc62
feat: add a space to separate the words
2 years ago
06fba5b55a
feat: show time as server timezone in dingding notification
2 years ago
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
0eaaa8b6fa
Minor
2 years ago
5cd506e340
Minor
2 years ago
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2 years ago
72c16c3aa2
Fix eslint warnings
2 years ago
d23cb0b382
Fix maintenance do not start after 1.21.2
2 years ago
8207f16396
Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization
2 years ago
0e516a42e5
Trim before truncating "keword not found" message
2 years ago
6356b1e50a
Merge pull request #2961 from chakflying/feat/flush-wal
...
Chore: Flush WAL on shutdown
2 years ago
11f4cb8725
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
4c1ac5e870
Merge pull request #2863 from mtelgkamp/ntfy-notification-improvements
...
Improve ntfy notifications
2 years ago
9e320dc5fb
Expose timezone and local datetime to notification providers
2 years ago
2f3f929fbd
Merge pull request #2831 from mtelgkamp/mattermost-notification-improvements
...
Improve mattermost notifications
2 years ago
682f8e52a8
lint
2 years ago
171aff1226
add invert keyword feature
2 years ago
1f7f1f70bf
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
21ad715e6a
Merge pull request #3021 from louislam/1.22.X
...
1.22.x -> master
2 years ago
23af66f618
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
45ef7b2f69
Fix Effective Date Range cannot be removed
2 years ago
38fab198bb
Fix: Fix user count check
2 years ago
8d5679a8ab
Fix: Create database before connect
2 years ago
6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization
2 years ago
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
2 years ago
32f84b5e4e
Merge pull request #2491 from RubenNL/fix-metrics-push
...
Fixed the metrics for the push type.
2 years ago
dbfaddafca
Validate cron before submit
2 years ago
511038b45a
Remove unused code
2 years ago
17ae47d091
Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.
2 years ago
de0d1edfd4
Merge pull request #2988 from chakflying/fix/socks-rejectUnauthorized
...
Fix: Pass rejectUnauthorized to Socks Proxy
2 years ago
524cf7c607
WIP
2 years ago
227cec86a8
WIP
2 years ago
02291730fe
WIP
2 years ago
8ee4b844fd
Fix: Pass rejectUnauthorized to Socks Proxy
2 years ago
fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization
2 years ago
fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision
...
Fix: Apply toPrecision as last step
2 years ago
41bda4e1d7
Merge pull request #2975 from chakflying/fix/badge-no-label
...
Fix: Allow status badge with empty label
2 years ago
4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider
...
Add Twilio Sms Notification Provider
2 years ago
302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
...
Feat: Add opsgenie notification provider
2 years ago
3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
...
Fix: Check for TLS expiry notified days smaller than target
2 years ago
b64c835cee
Add Twilio Sms Notification Provider
2 years ago
4f05912276
Fix: Allow status badge with empty label
2 years ago
bf525371d9
Fix: Apply toPrecision as last step
2 years ago
89bfc3bf33
Merge pull request #2908 from chakflying/chore/encrypted-private-key
...
Chore: Add support for encrypted SSL-key
2 years ago
f4ee5271af
Improve error handling of mysqlQuery and return row count as result
2 years ago
7330db3563
Improve error handling of mysqlQuery and return row count as result
2 years ago
ca52047bf5
Feat: Flush WAL on shutdown
2 years ago
d9558833fc
Fix linting
2 years ago
d2527d7254
Merge branch 'master' into feature/opsgenie-alerts
2 years ago
6dfca0c163
Add Opsgenie notification provider
2 years ago
35a56dd9e0
Added dropdown for authentication methods
2 years ago
442f54de84
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
2 years ago
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
533bc1505b
Prevent generating duplicated timeslots
2 years ago
391692a708
Chore: Add support for encrypted SSL-key
2 years ago
a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis
...
Fix: Disconnect redis after ping
2 years ago
f32fcb204f
Fix: Check for notified days smaller than target
2 years ago
230de63460
Fix: Disconnect redis after ping
2 years ago
e8814e8479
added option for ntfy access tokens
2 years ago
2dedc1cfbd
Fix #2776
2 years ago
ce8eebc838
Fix #2880
2 years ago
7ec09d0118
Fix ipv6 issue for ping
2 years ago
92c9b8bb63
Fix ipv6 issue for ping
2 years ago
010c7d681f
Fix ipv6 issue for ping
2 years ago
8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id
...
Add ability to use User ID for LunaSea notifications
2 years ago
bc87abf5c2
Fix: Clear uptime cache on push beat
2 years ago
bb7de6aa88
chore: notification toggle missing when import from backup
2 years ago
150607cc93
Feat: Support auto theme in status pages
2 years ago
cbbd3e20ad
Codestyle: Add trailing comma
2 years ago
71c800b880
Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
...
# Conflicts:
# src/lang/en.json
2 years ago
7b4f90ce92
Improve ntfy notifications
...
- use tags `red_circle` for down and `green_circle` for up
- increase priority for down alert by 1 if not already max
- add monitor name and status to title
- use heartbeat msg as Message
- add monitor url as action
2 years ago
b21c2adcc2
Rework lunasea notification to allow for device id and user id
2 years ago
958354e4db
Minor
2 years ago
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2 years ago
669f8700b2
Switched to nanoid for key generation
...
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key
2 years ago
42a69c16ca
Switched to crypto.randomBytes fpr key generation
...
Keys are now 32 bytes long encoded in a URL safe base64 string
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
ea3b3abe36
Fine tune
2 years ago
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
2 years ago
d668812df1
Fix merge issue
2 years ago
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
a7b49fcd98
Fix json body after xml body added
2 years ago
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2 years ago
e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification
...
Adds name + status + message to Slack notification
2 years ago
c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty
...
Fix: getGameList returns nothing on first run
2 years ago
c65a920050
Chore: Fix code comment
2 years ago
7b8ed01f27
Fix: getGameList returns nothing on first run
2 years ago
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2 years ago
2fa233ae7f
Fix prometheus null issues
2 years ago
e9475ed3c0
Merge remote-tracking branch 'origin/master' into telegram_test
...
# Conflicts:
# server/notification-providers/telegram.js
# src/languages/en.js
2 years ago
10228874fa
Merge manually
2 years ago
186ca30508
Improve mattermost notifications
2 years ago
7f88aacbe7
make monitor start() and stop() async
2 years ago
896e33815d
Merge branch 'louislam:master' into fix-metrics-push
2 years ago
7e3734af53
Better handling
2 years ago
5789112f55
Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction
2 years ago
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
2 years ago
5e1489a6ed
PagerTree Notification - Send msg when heartbeatJSON null
2 years ago
9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1
...
sorted tags on dashboard
2 years ago
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code
...
Feat: Use error message to detect and set status code
2 years ago
0be8b111e2
chore: better up message
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
cef0a0faf4
Merge branch 'master' into group-monitors
2 years ago
b8720b46c3
Switched to using Authorization header
...
Prometheus doesn't support using custom headers for exporters, however
it does support using the Authorisation header with basic auth. As
such, we switched from using X-API-Key to Authorization with the basic
scheme and an empty username field.
Also added a rate limit for API endpoints of 60 requests in a minute
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
2 years ago
01c71a0242
Fixed logic errors, removed dev leftovers
...
Fixed a logic error where a comma was used instead of an or, also
removed leftover console.logs from testing.
Date picker is now dissabled when don't expire is checked.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
e7feca1cd6
Added API key authentication handler
...
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.
In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
d1175ff471
Fix #2777
2 years ago
cd18b96f69
Added check to ensure backup exists when restoring ( #2779 )
...
A check to ensure that the backup database exists before deleting the
current database.
Fixes #2778
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
f2633a5d01
Finished knex_init_db.js
2 years ago
4056951915
WIP: building database in knex.js
2 years ago
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2 years ago
db4663d6be
Merge remote-tracking branch 'origin/master' into 2.0.X
2 years ago
c12b06348b
Fix parsing issues of status page's og tags
2 years ago
48b637d4c8
Refactor to not introduce a breaking change
2 years ago
3439074835
Feat: Use message to improve errror status code
2 years ago
3a361d2621
lint fix
2 years ago
8725e5daf9
Add ability to use User ID for LunaSea notifications
2 years ago
d45aee450d
Removes unecessary ternary operator
2 years ago
727acb32bf
Adds name + status + message to slack notification
2 years ago
43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
2 years ago
e1f956879d
Fix: Use .destroy() instead of .end()
2 years ago
ef54d9e3b6
Add PagerTree Notification Provider
2 years ago
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
f89ed0a3a4
feat: added HTTP method option for push monitor
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
AnnAngela
Louis Lam
Christopher Wilkinson
Josua Frank
Miles Steele
Nelson Chan
Faruk Genç
niclas.koegl
tombii
Arniwatt Chonkiattipoom
Michael Telgkamp
Bobby Ore
Matthew Nickson
Thomas Spalinger
Ruben van Dijk
Austin Miller
Peace
Luke Hamburg
Brayan Lozano
Suriya Soutmun
Haytham Salama
c
Joseph
Peace
alejandrohernandezrosales
long2ice
Ruben
shyneko
Sebastian Kaempfe
Łukasz Szczepański
Luke
twiggotronix
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
Stefan Ottosson
Minh Hoàng
Joseph Benguira