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
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
230de63460
Fix: Disconnect redis after ping
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
71c800b880
Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
...
# Conflicts:
# src/lang/en.json
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
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
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-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
Louis Lam
tombii
Nelson Chan
Bobby Ore
Matthew Nickson
Austin Miller
Faruk Genç
Luke Hamburg