Louis Lam
511038b45a
Remove unused code
2023-04-01 04:22:10 +08:00
Louis Lam
17ae47d091
Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.
2023-04-01 00:58:23 +08:00
Louis Lam
de0d1edfd4
Merge pull request #2988 from chakflying/fix/socks-rejectUnauthorized
...
Fix: Pass rejectUnauthorized to Socks Proxy
2023-04-01 00:48:28 +08:00
Louis Lam
524cf7c607
WIP
2023-03-31 21:34:05 +08:00
Louis Lam
227cec86a8
WIP
2023-03-31 20:25:37 +08:00
Louis Lam
02291730fe
WIP
2023-03-31 04:04:17 +08:00
Nelson Chan
8ee4b844fd
Fix: Pass rejectUnauthorized to Socks Proxy
2023-03-28 11:40:19 +08:00
Josua Frank
fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization
2023-03-26 19:09:48 +02:00
Louis Lam
fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision
...
Fix: Apply toPrecision as last step
2023-03-26 15:46:00 +08:00
Louis Lam
41bda4e1d7
Merge pull request #2975 from chakflying/fix/badge-no-label
...
Fix: Allow status badge with empty label
2023-03-26 15:42:12 +08:00
Louis Lam
4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider
...
Add Twilio Sms Notification Provider
2023-03-26 15:38:53 +08:00
Louis Lam
302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
...
Feat: Add opsgenie notification provider
2023-03-26 15:36:50 +08:00
Louis Lam
3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
...
Fix: Check for TLS expiry notified days smaller than target
2023-03-26 15:34:26 +08:00
Faruk Genç
b64c835cee
Add Twilio Sms Notification Provider
2023-03-25 19:56:01 +03:00
Nelson Chan
4f05912276
Fix: Allow status badge with empty label
2023-03-25 02:44:15 +08:00
Nelson Chan
bf525371d9
Fix: Apply toPrecision as last step
2023-03-24 22:42:50 +08:00
Louis Lam
89bfc3bf33
Merge pull request #2908 from chakflying/chore/encrypted-private-key
...
Chore: Add support for encrypted SSL-key
2023-03-24 21:36:22 +08:00
Louis Lam
f4ee5271af
Improve error handling of mysqlQuery and return row count as result
2023-03-24 16:24:00 +08:00
Louis Lam
7330db3563
Improve error handling of mysqlQuery and return row count as result
2023-03-24 16:08:30 +08:00
Nelson Chan
ca52047bf5
Feat: Flush WAL on shutdown
2023-03-22 14:46:58 +08:00
niclas.koegl
d9558833fc
Fix linting
2023-03-21 19:45:44 +01:00
niclas.koegl
d2527d7254
Merge branch 'master' into feature/opsgenie-alerts
2023-03-21 18:10:10 +01:00
niclas.koegl
6dfca0c163
Add Opsgenie notification provider
2023-03-21 18:07:19 +01:00
Josua Frank
35a56dd9e0
Added dropdown for authentication methods
2023-03-21 13:40:24 +01:00
Josua Frank
442f54de84
Merge branch 'louislam:master' into ntfy-bearer-authorization
2023-03-21 13:01:49 +01:00
tombii
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
2023-03-15 15:00:28 +08:00
Louis Lam
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-03-12 18:38:19 +08:00
Louis Lam
533bc1505b
Prevent generating duplicated timeslots
2023-03-09 22:03:23 +08:00
Nelson Chan
391692a708
Chore: Add support for encrypted SSL-key
2023-03-09 00:00:07 +08:00
Louis Lam
a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis
...
Fix: Disconnect redis after ping
2023-03-08 22:57:30 +08:00
Nelson Chan
f32fcb204f
Fix: Check for notified days smaller than target
2023-03-08 22:26:19 +08:00
Nelson Chan
230de63460
Fix: Disconnect redis after ping
2023-03-08 21:47:52 +08:00
Josua Frank
e8814e8479
added option for ntfy access tokens
2023-03-08 13:28:02 +00:00
Louis Lam
2dedc1cfbd
Fix #2776
2023-03-07 20:48:11 +08:00
Louis Lam
ce8eebc838
Fix #2880
2023-03-05 15:59:43 +08:00
Louis Lam
7ec09d0118
Fix ipv6 issue for ping
2023-03-04 20:41:08 +08:00
Louis Lam
92c9b8bb63
Fix ipv6 issue for ping
2023-03-04 20:29:52 +08:00
Louis Lam
010c7d681f
Fix ipv6 issue for ping
2023-03-04 19:12:11 +08:00
Louis Lam
8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id
...
Add ability to use User ID for LunaSea notifications
2023-03-04 17:35:15 +08:00
Nelson Chan
bc87abf5c2
Fix: Clear uptime cache on push beat
2023-03-03 05:57:36 +08:00
Arniwatt Chonkiattipoom
bb7de6aa88
chore: notification toggle missing when import from backup
2023-03-02 16:23:27 +07:00
Nelson Chan
150607cc93
Feat: Support auto theme in status pages
2023-03-02 07:26:26 +08:00
Michael Telgkamp
cbbd3e20ad
Codestyle: Add trailing comma
2023-03-01 23:05:23 +01:00
Louis Lam
71c800b880
Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
...
# Conflicts:
# src/lang/en.json
2023-03-01 16:17:18 +08:00
Michael Telgkamp
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
2023-03-01 08:37:06 +01:00
Bobby Ore
b21c2adcc2
Rework lunasea notification to allow for device id and user id
2023-02-28 09:47:35 -06:00
Louis Lam
958354e4db
Minor
2023-02-28 16:58:36 +08:00
Louis Lam
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2023-02-28 16:55:50 +08:00
Matthew Nickson
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>
2023-02-26 19:36:50 +00:00
Matthew Nickson
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key
2023-02-26 16:47:45 +00:00
Matthew Nickson
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>
2023-02-26 16:47:34 +00:00
Louis Lam
ea3b3abe36
Fine tune
2023-02-25 20:13:46 +08:00
Louis Lam
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
2023-02-25 19:14:44 +08:00
Louis Lam
d668812df1
Fix merge issue
2023-02-25 17:59:25 +08:00
Louis Lam
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-02-25 17:57:25 +08:00
Louis Lam
a7b49fcd98
Fix json body after xml body added
2023-02-25 17:28:32 +08:00
Louis Lam
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2023-02-25 00:06:25 +08:00
Louis Lam
e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification
...
Adds name + status + message to Slack notification
2023-02-24 23:54:31 +08:00
Louis Lam
c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty
...
Fix: getGameList returns nothing on first run
2023-02-24 23:34:47 +08:00
Nelson Chan
c65a920050
Chore: Fix code comment
2023-02-24 21:09:55 +08:00
Nelson Chan
7b8ed01f27
Fix: getGameList returns nothing on first run
2023-02-24 21:06:00 +08:00
Louis Lam
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2023-02-24 17:26:47 +08:00
Louis Lam
2fa233ae7f
Fix prometheus null issues
2023-02-24 17:12:57 +08:00
Louis Lam
e9475ed3c0
Merge remote-tracking branch 'origin/master' into telegram_test
...
# Conflicts:
# server/notification-providers/telegram.js
# src/languages/en.js
2023-02-24 17:08:48 +08:00
Louis Lam
10228874fa
Merge manually
2023-02-24 16:54:58 +08:00
Michael Telgkamp
186ca30508
Improve mattermost notifications
2023-02-23 17:40:39 +01:00
Ruben van Dijk
896e33815d
Merge branch 'louislam:master' into fix-metrics-push
2023-02-23 14:11:39 +01:00
Louis Lam
7e3734af53
Better handling
2023-02-23 20:59:24 +08:00
Louis Lam
5789112f55
Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction
2023-02-23 20:47:28 +08:00
Louis Lam
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
2023-02-23 20:43:05 +08:00
Austin Miller
5e1489a6ed
PagerTree Notification - Send msg when heartbeatJSON null
2023-02-22 14:32:02 -07:00
Louis Lam
9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1
...
sorted tags on dashboard
2023-02-22 01:11:03 +08:00
Louis Lam
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code
...
Feat: Use error message to detect and set status code
2023-02-22 01:01:53 +08:00
Peace
0be8b111e2
chore: better up message
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-20 13:48:16 +01:00
Faruk Genç
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-18 22:38:40 +03:00
Peace
cef0a0faf4
Merge branch 'master' into group-monitors
2023-02-16 21:38:53 +01:00
Matthew Nickson
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>
2023-02-15 21:53:49 +00:00
Matthew Nickson
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-15 19:31:22 +00:00
Luke Hamburg
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
2023-02-15 14:06:29 -05:00
Matthew Nickson
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>
2023-02-15 11:15:15 +00:00
Matthew Nickson
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>
2023-02-15 00:39:29 +00:00
Matthew Nickson
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 22:41:06 +00:00
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
Matthew Nickson
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>
2023-02-14 19:49:04 +00:00
Louis Lam
d1175ff471
Fix #2777
2023-02-15 02:50:49 +08:00
Matthew Nickson
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>
2023-02-15 00:43:40 +08:00
Faruk Genç
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-11 23:56:38 +03:00
Louis Lam
f2633a5d01
Finished knex_init_db.js
2023-02-12 03:44:15 +08:00
Louis Lam
4056951915
WIP: building database in knex.js
2023-02-11 22:21:06 +08:00
Louis Lam
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2023-02-11 14:41:02 +08:00
Louis Lam
db4663d6be
Merge remote-tracking branch 'origin/master' into 2.0.X
2023-02-11 00:51:40 +08:00
Louis Lam
c12b06348b
Fix parsing issues of status page's og tags
2023-02-10 17:29:32 +08:00
Bobby Ore
48b637d4c8
Refactor to not introduce a breaking change
2023-02-09 08:49:19 -06:00
Nelson Chan
3439074835
Feat: Use message to improve errror status code
2023-02-09 17:42:02 +08:00
Bobby Ore
3a361d2621
lint fix
2023-02-08 14:16:02 -06:00
Bobby Ore
8725e5daf9
Add ability to use User ID for LunaSea notifications
2023-02-08 14:08:25 -06:00
Brayan Lozano
d45aee450d
Removes unecessary ternary operator
2023-02-07 22:34:10 -05:00
Brayan Lozano
727acb32bf
Adds name + status + message to slack notification
2023-02-07 21:18:26 -05:00
Suriya Soutmun
43941fa2c6
feat: add mtls authen method in http/http keyword
2023-02-07 09:40:47 +07:00
Suriya Soutmun
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
2023-02-07 09:40:44 +07:00
Nelson Chan
e1f956879d
Fix: Use .destroy() instead of .end()
2023-02-07 05:01:53 +08:00
Austin Miller
ef54d9e3b6
Add PagerTree Notification Provider
2023-02-06 11:33:14 -07:00
Louis Lam
68ead3414d
WIP
2023-02-06 22:26:13 +08:00
Faruk Genç
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
2023-02-05 18:19:46 +03:00
Louis Lam
d4752b65de
WIP
2023-02-05 18:01:54 +08:00
Louis Lam
dc4d2a77bb
WIP
2023-02-05 17:45:36 +08:00
Haytham Salama
1bfb290718
feat: add message thread id for telegram nonfiction
2023-02-04 22:53:38 +02:00
Louis Lam
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
2023-02-04 18:21:34 +08:00
Louis Lam
afadfe32d5
Trim
2023-02-04 17:03:00 +08:00
Louis Lam
5f2affb38c
Relocate and fix jsesc issue
2023-02-04 16:58:39 +08:00
Louis Lam
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2023-02-04 15:40:13 +08:00
Faruk Genç
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-04 00:03:05 +03:00
c
a823ed8ccc
Feature - Google Analytics - Removed unused import.
2023-02-03 11:49:25 +00:00
Joseph
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
2023-02-03 12:33:48 +08:00
c
913bb611d5
Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
2023-02-02 21:52:45 +00:00
c
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2023-02-02 21:51:03 +00:00
c
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2023-02-02 21:51:03 +00:00
c
fb2999706c
Feature - Google Analytics - Added JSDoc to Google Analytics functions.
2023-02-02 21:51:03 +00:00
c
2b3a3895b3
Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895
2023-02-02 21:51:03 +00:00
c
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2023-02-02 21:51:03 +00:00
c
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2023-02-02 21:51:03 +00:00
Faruk Genç
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2023-02-02 19:43:17 +03:00
Peace
9446c2d102
fix: use active instead of isActive in uploadBackup
2023-02-01 23:39:42 +01:00
Peace
2c581ade90
Merge branch 'louislam:master' into group-monitors
2023-02-01 20:44:09 +01:00
Peace
f286386f59
fix: add message for empty group pending state
2023-02-01 20:19:47 +01:00
Peace
9286dcb6ce
fix: add serverside check against endless loops
2023-02-01 20:16:56 +01:00
Louis Lam
683f446cf5
Add support for .env
2023-02-01 20:07:08 +08:00
Nelson Chan
348d0170fa
Chore: Use constants instead of int
2023-02-01 05:33:36 +08:00
Faruk Genç
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-30 13:09:16 +03:00
Louis Lam
fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge
...
Fix: Add support for pending & maintenance in badges
2023-01-30 15:32:28 +08:00
Peace
9a46b50989
docs: add comments
2023-01-28 14:22:15 +01:00
Peace
f3ac351d75
feat: set childs under maintenance if parent is too
2023-01-28 14:02:10 +01:00
Faruk Genç
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
Peace
aba515e172
feat: disable childs if parent is disabled
2023-01-28 13:39:17 +01:00
Louis Lam
ddce8f0cb0
Fix plugin installation
2023-01-28 19:00:13 +08:00
Peace
97bd306a09
Merge branch 'louislam:master' into group-monitors
2023-01-28 03:07:42 +01:00
Peace
645fd94bba
feat: add ability to group monitors in dashboard
2023-01-28 02:58:03 +01:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
Faruk Genç
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
2023-01-25 20:20:11 +03:00
Louis Lam
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2023-01-25 16:12:33 +08:00
Louis Lam
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2023-01-25 00:22:51 +08:00
Louis Lam
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2023-01-25 00:19:54 +08:00
Nelson Chan
c4c720027c
Fix: Use correct log call format
2023-01-24 23:47:33 +08:00
Louis Lam
83e0401dd8
Show game list for GameDig monitor
2023-01-24 23:03:01 +08:00
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
Thomas Spalinger
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2023-01-24 10:32:49 +00:00
Faruk Genç
cd017fce98
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-22 02:22:59 +03:00
alejandrohernandezrosales
fa23e7ad19
Removed superflous Message prefix
2023-01-20 23:59:11 -06:00
Faruk Genç
aef85078eb
reorder fix
2023-01-20 12:29:56 +03:00
Faruk Genç
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-20 12:27:28 +03:00
Nelson Chan
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2023-01-18 09:53:04 +08:00
Louis Lam
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2023-01-17 21:17:04 +08:00
Louis Lam
a5ff27da7a
Drop the property monitor.maintenance
, use lastHeartBeat.status
to check status instead
2023-01-17 17:34:47 +08:00
Louis Lam
27585d0812
Fix #2618
2023-01-17 01:21:01 +08:00
Louis Lam
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
...
Fix: Allow long sms in PromoSMS
2023-01-16 13:21:56 +08:00
Louis Lam
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-15 20:14:11 +08:00
Louis Lam
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
2023-01-15 13:10:17 +08:00
Louis Lam
1326761a8a
Update mongodb and simplify the logic of mongodbPing
2023-01-15 01:36:49 +08:00
Louis Lam
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2023-01-15 01:13:11 +08:00
Faruk Genç
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
2023-01-14 16:40:13 +03:00
Faruk Genç
3adc9e65d6
Add only xml support to http monitors
2023-01-14 16:33:21 +03:00
Louis Lam
712a3c29d4
Fix Postgres monitor do not handle some error cases correctly
2023-01-14 21:06:10 +08:00
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2023-01-14 20:16:53 +08:00
long2ice
3b5893ea60
fix: add preserve line in redisPingAsync
2023-01-13 21:30:10 +08:00
long2ice
21cd4d64c3
fix: redisPingAsync
2023-01-13 19:10:07 +08:00
long2ice
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +08:00
Ruben
71f00b3690
Parse push ping parameter with parseInt.
2023-01-12 18:33:39 +01:00
Nelson Chan
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2023-01-12 21:25:33 +08:00
shyneko
b91fe9d96d
Added a more telegram options
...
such as thread id, silent notifications and forward protect
2023-01-12 15:09:05 +02:00
Sebastian Kaempfe
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.
2023-01-12 11:39:36 +01:00
Sebastian Kaempfe
f6d0f28b3a
[ #2593 ] during certificate evaluation also set the cert type for improved notifications
2023-01-12 11:34:37 +01:00
Łukasz Szczepański
8433bceb32
Trim message to maximum allowed length
2023-01-12 08:14:31 +01:00
Louis Lam
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
...
Add Splunk Notification Provider
2023-01-12 14:15:36 +08:00
Nelson Chan
0ed3dd5e4f
Fix: Add support for pending in badges
2023-01-12 04:14:46 +08:00
Louis Lam
d9f12a6376
Fallback to /bin/ping
if ping
is not found
2023-01-12 01:05:16 +08:00
Łukasz Szczepański
56ba133a1f
Missing semicolon
2023-01-11 14:36:33 +01:00
Łukasz Szczepański
ec30147a7f
Add option for allowing long sms in PromoSMS
2023-01-11 14:32:57 +01:00
Luke
2172112144
Setting for allowing long sms
2023-01-11 12:13:47 +01:00
Luke
ecd661c801
Allow long sms in PromoSMS
2023-01-11 12:06:09 +01:00
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-11 10:34:24 +01:00
Nelson Chan
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-01-10 19:25:31 +08:00
Matthew Nickson
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-09 20:20:09 +00:00
Joseph Irving
33355c51b7
Add Splunk Notifications
2023-01-09 13:33:10 +00:00
Sjouke de Vries
94b69935fe
chore(server): remove comments from status-page router
2023-01-09 11:16:47 +01:00
Sjouke de Vries
3f30feaefb
feat(server): add badge for overall status of status-page
2023-01-09 11:04:32 +01:00
Louis Lam
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
...
Fixed negative retention time values
2023-01-09 13:08:35 +08:00
Matthew Nickson
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 19:09:06 +00:00
SlothCroissant
f8658d6160
Removed redundant title in Pushover notification
2023-01-08 10:32:16 -06:00
Nelson Chan
dd82f36da3
Fix: Improve syntax & fix weird label logic
2023-01-09 00:16:18 +08:00
Adam Spurgeon
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
Matthew Nickson
5d6770c0db
Removed excess space around function
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:12:21 +00:00
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
Louis Lam
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2023-01-06 23:04:02 +08:00
Matthew Nickson
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:19:05 +00:00
long2ice
40ebc2df79
feat: support redis monitor
2023-01-05 23:02:56 +08:00
twiggotronix
8ec240fe19
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-05 14:08:05 +01:00
Louis Lam
fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
...
feat: Change ping module to danielzzz/node-ping
2023-01-05 20:40:41 +08:00
Louis Lam
0b959514f8
Fix timeout
2023-01-05 20:38:37 +08:00
Louis Lam
7d92351568
Match previous settings
2023-01-05 19:30:55 +08:00
Louis Lam
494c53971c
Convert to UTF8 on Windows only
2023-01-05 19:22:15 +08:00
David Twigger
fc1914bccd
Fix lint
2023-01-05 11:42:19 +01:00
David Twigger
c196c34840
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-05 08:57:48 +01:00
Matthew Nickson
90a2668272
Restructured condition + ensure data is UTF-8
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-04 17:32:27 +00:00
Matthew Nickson
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>
2023-01-04 16:46:36 +00:00
Matthew Nickson
73835f3328
Changed from ping-lite to ping module
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
#Fixes 2126
2023-01-03 20:03:36 +00:00
Nelson Chan
204792dd2d
Fix: Fix incorrect handling for container down
2023-01-03 22:07:14 +08:00
Nelson Chan
942b55ca03
Fix: Add support for maintenance in badges
2023-01-03 21:45:55 +08:00
Louis Lam
0cead83705
Fix #2516
2023-01-03 14:50:41 +08:00
Arniwatt Chonkiattipoom
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>
2023-01-02 15:01:50 +08:00
Louis Lam
39ac9b887e
Fix #2504
2023-01-01 22:27:14 +08:00
Louis Lam
50711391d1
Revert "Auth: Case insensitive login check on username"
2023-01-01 22:19:00 +08:00
Louis Lam
e88e10cc8e
Fix #2494
2023-01-01 21:43:54 +08:00
Louis Lam
27146ffeef
Merge pull request #2433 from mathiash98/mathias/Auth-case-insensitive-login
...
Auth: Case insensitive login check on username
2023-01-01 14:16:59 +08:00
Louis Lam
41a9f2ff8a
Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc
...
Bug fix: gRPC check throws errors when response data size > 50 chars
2023-01-01 13:57:10 +08:00
Louis Lam
cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
...
Add Kook notification provider
2023-01-01 02:53:03 +08:00
Louis Lam
8bb064c6fa
Merge pull request #2157 from Mikkel-T/fix-discord-embed
...
Improve the URL field in Discord embeds
2022-12-31 22:41:40 +08:00
Louis Lam
1006fbd873
A possible fix for #2447
2022-12-30 13:46:53 +08:00
Louis Lam
5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
...
Zoho Cliq Notification Provider
2022-12-29 19:00:50 +08:00
minhhoang
d111db0321
fix: add accurate error message when user input invalid service name or method name
2022-12-29 08:10:58 +07:00
minhhoang
4147a4c404
fix : #2480
2022-12-28 22:31:33 +07:00
Ruben
9404efd86d
Fixed the metrics for the push type.
2022-12-28 10:37:25 +01:00
401Unauthorized
c60b741406
Add kook notification provider
2022-12-27 14:12:22 +08:00
Louis Lam
e12225e595
Fix #2475 #2468 #2455 , add Accept-Encoding only if encountered the abort error
2022-12-26 21:00:46 +08:00
Louis Lam
1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
...
Fix discord notification not sending when docker container goes down
2022-12-24 14:26:53 +08:00
Louis Lam
14fffcf06b
Globally fix if heartbeatJSON["msg"] is undefined
2022-12-24 14:23:50 +08:00
Louis Lam
a4de93f976
WIP
2022-12-23 22:43:56 +08:00
Mathias Haugsbø
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
2022-12-19 12:18:33 +01:00
Mathias Haugsbø
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.
2022-12-18 17:16:19 +01:00
Louis Lam
df21f7da76
Check login for initServerTimezone
2022-12-16 12:56:40 +08:00
Louis Lam
b75db27658
Fix lint
2022-12-15 13:57:28 +08:00
Louis Lam
765d8e1297
Fix #2318
2022-12-15 13:39:48 +08:00
Louis Lam
9dc2cc1f0d
Copy timezone.js from dayjs
2022-12-15 13:05:04 +08:00
Louis Lam
1da00d19fd
Try to fix incorrect header check
2022-12-14 21:34:13 +08:00
Louis Lam
466b403a96
Handle unexpected error of checkCertificate
2022-12-13 02:21:12 +08:00
zImPatrick
f32441e2f6
fix discord notification not sending when docker container is down
2022-12-12 18:05:10 +01:00
Louis Lam
39987ba9ac
Init server timezone
2022-12-12 22:57:57 +08:00
Louis Lam
3b87209e26
Add configurable dns cache
2022-12-12 17:19:22 +08:00
Louis Lam
3b58fd3b3c
Cache uptime
2022-12-11 21:33:26 +08:00
Louis Lam
bc86f8bb5f
Reset busy_timeout to default
2022-12-11 20:25:15 +08:00
Louis Lam
02b5cae577
Fix #2371 by left join maintenance_timeslot
2022-12-09 21:03:12 +08:00
Louis Lam
4cd5b5563f
Fix #1145
2022-12-08 23:21:55 +08:00
panos
9da28fbbc7
zoho cliq code style
2022-12-08 13:56:02 +02:00
panos
851a04b082
zoho cliq code style
2022-12-08 13:53:02 +02:00
panos
68bc7ac421
zoho cliq code style
2022-12-08 13:41:05 +02:00
panos
73bfdb9ef9
zoho cliq notification provider
2022-12-08 13:32:10 +02:00
Louis Lam
e478084ff9
Fix Uptime Kuma cannot be stopped
2022-12-08 19:13:47 +08:00
Louis Lam
eadf2c810a
Fix check version
2022-12-05 19:17:24 +08:00
Louis Lam
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2022-12-05 18:18:19 +08:00
Louis Lam
e886df4788
Fix typo
2022-12-05 17:55:45 +08:00
Louis Lam
5196abfd36
Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919
2022-12-05 17:52:02 +08:00
Louis Lam
3e68cf2a1c
Specify Accept-Encoding
for axios request ( Fix #2253 )
2022-12-04 22:55:05 +08:00
Louis Lam
191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
...
Add socks5h support
2022-11-25 16:24:21 +08:00
Joshua Brunner
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
2022-11-22 11:18:16 +01:00
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 19:04:14 +00:00
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:46:58 +00:00
Matthew Nickson
b053bc61ce
Fixed MySQL monitor to close connection
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:34:02 +00:00
rmarops
0e30843a75
fixed lint check missing semicolon
2022-11-16 22:27:18 -05:00
rmarops
2103edb604
moved client close out of finally block and fixed linting errors
2022-11-16 22:21:15 -05:00
rmarops
b059a36e66
added MongoDB ping monitor
2022-11-16 20:50:34 -05:00
Jan Hartje
258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919
2022-11-14 20:17:36 +01:00
Louis Lam
cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2022-11-15 02:37:28 +08:00
Dafnik
4042c26390
Fix 'undefined' in link preview generation
2022-11-14 18:05:52 +01:00
Louis Lam
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2022-11-11 12:34:35 +08:00
Louis Lam
68862c0b3f
Fix Pushbullet do not handle general message correctly and fix name convention ( Close #1890 )
2022-11-01 20:27:40 +08:00
Louis Lam
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
2022-10-31 17:10:20 +08:00
Louis Lam
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
...
Added support for SMSEagle device API notifications
2022-10-31 17:03:34 +08:00
minhhn3
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
Adam Stachowicz
134b3b8ac1
Fix 'dayjs' is never used warning
2022-10-25 01:27:25 +02:00
Marcin Kiszka
08763b700a
Added support for SMSEagle device API notifications
2022-10-24 12:45:56 +02:00
Matthew Nickson
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-10-22 16:22:28 +01:00
Louis Lam
24cb212a37
Fix recurring
2022-10-15 20:15:50 +08:00
Louis Lam
d8a676abb6
Implement recurring day of month and day of week
2022-10-15 18:49:09 +08:00
Louis Lam
0b8d4cdaac
Generate Next Timeslot for recurring interval
2022-10-15 17:17:26 +08:00
Louis Lam
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
Matthew Nickson
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>
2022-10-13 00:32:05 +08:00
Louis Lam
b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect
...
Fixed entry route not redirecting correctly.
2022-10-13 00:28:34 +08:00
Louis Lam
edacff123b
Add UTC in the serverTimezone dropdown
2022-10-12 22:13:07 +08:00
Louis Lam
2faf866e9e
Implement generateTimeslot() for recurring interval type
2022-10-12 17:02:16 +08:00
Louis Lam
7b9766091e
Revert testing
2022-10-11 22:18:09 +08:00
Louis Lam
39b6725163
Update maintenance tables
2022-10-11 21:48:43 +08:00
Louis Lam
dfb75c8afb
Update status page's maintenance message
2022-10-11 20:56:48 +08:00
Louis Lam
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
Christian Meis
1e8a16504b
Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2022-10-11 11:15:33 +02:00
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
Louis Lam
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +08:00
Louis Lam
c1ccaa7a9f
WIP
2022-10-10 20:48:11 +08:00
Louis Lam
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2022-10-10 16:50:25 +08:00
Louis Lam
71af23cf00
Fix #2207
2022-10-10 02:47:24 +08:00
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +08:00
Louis Lam
a36f24d827
Add configurable server timezone
2022-10-09 20:59:58 +08:00
Louis Lam
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2022-10-09 19:26:00 +08:00
Louis Lam
ad1a7c255f
Drop exports.entryPage fully
2022-10-08 23:56:58 +08:00
Louis Lam
6e07ed2081
Fix #2186
2022-10-07 15:02:19 +08:00
Louis Lam
959ecc65ff
Merge remote-tracking branch 'origin/master'
2022-10-06 23:28:29 +08:00
Louis Lam
c24b64921d
Fix #2183 ntfy issue
2022-10-06 23:28:06 +08:00
janhartje
b879428a03
feat(notification): add additional Header to webhook
2022-10-05 17:48:07 +02:00
Ben Scobie
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-05 23:45:21 +08:00
janhartje
3c5de1c889
Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919
2022-10-05 16:44:13 +02:00
CL0Pinette
528a615fb2
Add free.fr SMS notification provider ( #2159 )
2022-10-05 17:30:49 +08:00
Louis Lam
b993859926
Drop Jest e2e testing ( #2174 )
2022-10-05 14:26:30 +08:00