mudhorn/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-12-28 23:19:44 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3872 commits 31 branches 117 tags 71 MiB
Commit graph

3872 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Nickson 97e276bdb5
Fixed processing error with add API key 
Also added padding below add button

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-27 18:19:56 +00: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 11fa690e09
Updated API Keys UI 
The UI has now been moved to the settings page.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2023-02-26 18:07:57 +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 46894793fc Update Learn More url 2023-02-25 00:44:12 +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 8e3dd4202f
Merge pull request #2595 from tminei/telegram_test 
Added a more telegram notifications options
 2023-02-24 17:22:43 +08:00
Louis Lam af82ea742c Merge manually 2023-02-24 17:21:53 +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 b923ba72ca
Merge pull request #2334 from nlutsenko/nlutsenko.telegram_silentnotification 
Add ability to send Telegram notifications silently, behind a setting.
 2023-02-24 17:04:51 +08:00
Louis Lam 06278dc51f Fix telegram silent issue 2023-02-24 17:03:40 +08:00
Louis Lam 10228874fa Merge manually 2023-02-24 16:54:58 +08:00
Louis Lam c5034c8f38 Merge remote-tracking branch 'origin/master' into nlutsenko.telegram_silentnotification 
# Conflicts:
#	server/notification-providers/telegram.js
#	src/components/notifications/Telegram.vue
#	src/languages/en.js
 2023-02-24 16:42:57 +08: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
Louis Lam 6235ce6b29
Merge pull request #2823 from chakflying/fix/footer-null 
Fix: Add null check for injected HTML
 2023-02-23 18:03:33 +08:00
Louis Lam 81a829bda7
Merge pull request #2812 from louislam/remove-translate-keys 
Remove untranslatable keys and notification list optimization
 2023-02-23 18:03:04 +08:00
Louis Lam fa7f75a930 Organize notification list 2023-02-23 18:01:42 +08:00
Nelson Chan 7c8cff7708 Fix: Add null check for injected HTML 2023-02-23 17:02:16 +08:00
Louis Lam df5da0054e Remove more keys 2023-02-22 04:40:03 +08:00
Louis Lam 7da48b27a5 Fix getUniqueDefaultName 2023-02-22 04:29:43 +08:00
Louis Lam de7df46aa8 Sort the notification list by name and remove translation keys of brand names or product names 2023-02-22 04:27:12 +08: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
Louis Lam aad1a7e0fa
Merge pull request #2806 from andreasbrett/markdown_description 
add markdown support for description
 2023-02-21 16:19:14 +08:00
Louis Lam 2c62d197a0 [exe] Update dependencies 2023-02-21 16:03:41 +08:00
Louis Lam dad21065cf Update release procedures 2023-02-21 15:45:18 +08:00
Louis Lam 02ddb58686 Fix cwd issues 2023-02-21 15:16:54 +08:00
Louis Lam c061455475
Merge pull request #2191 from louislam/exe 
Windows Executable File - uptime-kuma.exe
 2023-02-21 03:23:07 +08:00
Louis Lam 0e38391454 Fix dpi issue using app.manifest 2023-02-21 03:11:29 +08:00
Louis Lam 22902139d2 Implement update 2023-02-21 02:50:25 +08:00
Louis Lam 4642f9be0a Fix download-dist.js do not exit sometimes 2023-02-20 23:15:49 +08:00
Andreas Brett 372c6b9078
add markdown support for description 2023-02-20 16:09:17 +01:00
Louis Lam cf32b8bc64 Read latest version from website and add Run when system starts 2023-02-20 20:26:53 +08:00
Louis Lam 6a98ffe2f6 Merge remote-tracking branch 'origin/master' into exe 
# Conflicts:
#	.dockerignore
#	.gitignore
 2023-02-20 18:28:35 +08: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
Faruk Genç 3ab0faee91 Add update query for old monitors and save new data correctly 2023-02-18 22:18:48 +03:00
Faruk Genç 9e3a77f419 Customize body placeholder for body encoding 2023-02-18 17:02:56 +03:00
Louis Lam d1c43f432a
Merge pull request #2747 from OidaTiftla/rename-consequently-to-consecutively 
Rename "consequently" to "consecutively" as suggested by @skylarv
 2023-02-18 16:53:45 +08:00
Louis Lam ba3c7210ab Merge remote-tracking branch 'origin/master' into rename-consequently-to-consecutively 
# Conflicts:
#	src/lang/cs-CZ.json
#	src/lang/de-DE.json
#	src/lang/en.json
#	src/lang/es-ES.json
#	src/lang/fr-FR.json
#	src/lang/id-ID.json
#	src/lang/pl.json
#	src/lang/pt-BR.json
#	src/lang/tr-TR.json
#	src/lang/zh-HK.json
 2023-02-18 16:52:47 +08:00
Faruk Genç c9b4a7f53e Change column type 2023-02-17 17:59:43 +03: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