Louis Lam
2b46693995
Merge pull request #3239 from madnight/master
...
Fix: prometheus monitor_status metric has 4 values
2 years ago
kefoster951
d37c33ad42
Update server/util-server.js
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
Louis Lam
c4c3fc81b2
Merge pull request #2693 from julian-piehl/group-monitors
...
Group monitors
2 years ago
Fabian Beuke
37ae8eb44a
Fix: prometheus monitor_status metric has 4 values
...
The prometheus monitor_status metric has actually 4 values. This can easily be verified by looking up the related source code or by using the metric in grafana an see values like 2 (which indicates timeout).
2 years ago
Kenneth Foster
8897385690
Fixed linting
2 years ago
Kenneth Foster
6132a45c7c
fixed when auth is needed but not provided
2 years ago
Kenneth Foster
f68452c47a
Added changes to stop auth attempts after an error
2 years ago
Nelson Chan
58ec53fb1d
Fix: Try to close mysql connection properly
2 years ago
duane
9a8bea5761
Changes 'Mention Channel' -> 'Notify Channel'
...
- Updates variable names
- Updates any Slack mention references
2 years ago
Peace
56f448bfe5
fix: maintenance heredity
2 years ago
Peace
2b46da0f47
style: fix linting
2 years ago
Peace
9bd76c2795
Merge branch 'master' into group-monitors
2 years ago
duane
376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack
2 years ago
Louis Lam
343a1d3344
Merge pull request #3203 from CommanderStorm/applied_timezone_formatting
...
chore: Made sure that every notification provider uses `timezone`/`localTime`
2 years ago
Wojciech Kapcia
f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials
2 years ago
Frank Elsinga
f3c09f2bbd
made every Notification provider supply time like dingding after #3152
2 years ago
Louis Lam
8ed2b59410
Resolve conflict
2 years ago
Louis Lam
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
2 years ago
Louis Lam
bc95875aa0
Merge pull request #3156 from maximilian-krauss/feat/add-pushover-ttl
...
feat: Adds message ttl to pushover notification
2 years ago
Louis Lam
c1efe0f26d
Add a warning for Node.js >= 20
2 years ago
Maximilian Krauß
a0d0d5b015
fix: sends pushover ttl only if defined
2 years ago
Maximilian Krauß
8d05d80a5f
feat: Adds message ttl to pushover notification
2 years ago
duane
5200e10aab
Removes ternary operator for Slack channel mention
2 years ago
Nelson Chan
f1a396b0f7
Fix: Align radius timeout to default
2 years ago
Nelson Chan
f70b971810
Fix: Improve error message
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
duane
00f733d352
Adds ability to notify channel when Slack webhook triggered
...
- Adds field to toggle channel mentions on/off for Slack integration
- Adds special mention for @channel when enabled
Reference:
[Slack docs](https://api.slack.com/reference/surfaces/formatting#special-mentions )
2 years ago
Nelson Chan
317024ed72
Fix: Use safebeat for push monitor
2 years ago
Janne Nowak
f604d96c5b
splited if to inner if
2 years ago
Janne Nowak
f30f00655f
small fix for down containers
2 years ago
Janne Nowak
891f09def7
removed log
2 years ago
Janne Nowak
6b5e179bb0
linting
2 years ago
Janne Nowak
f653aba735
added docker health status
2 years ago
Louis Lam
bb15fa0179
Merge pull request #3154 from chakflying/fix/clear-data-remove-worker-thread
...
Fix: Remove use of worker threads in clear-old-data
2 years ago
Louis Lam
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
2 years ago
Nelson Chan
80c8fd7372
Chore: Remove util-worker
2 years ago
Nelson Chan
a27386bb92
Fix: Use croner for clear-old-data
2 years ago
AnnAngela
ce70b3fc62
feat: add a space to separate the words
2 years ago
AnnAngela
06fba5b55a
feat: show time as server timezone in dingding notification
2 years ago
Louis Lam
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
Louis Lam
0eaaa8b6fa
Minor
2 years ago
Louis Lam
5cd506e340
Minor
2 years ago
Louis Lam
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2 years ago
Louis Lam
72c16c3aa2
Fix eslint warnings
2 years ago
Louis Lam
d23cb0b382
Fix maintenance do not start after 1.21.2
2 years ago
Louis Lam
8207f16396
Merge remote-tracking branch 'origin/master' into ntfy-bearer-authorization
2 years ago
Christopher Wilkinson
0e516a42e5
Trim before truncating "keword not found" message
2 years ago
Louis Lam
6356b1e50a
Merge pull request #2961 from chakflying/feat/flush-wal
...
Chore: Flush WAL on shutdown
2 years ago
Josua Frank
11f4cb8725
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
Louis Lam
4c1ac5e870
Merge pull request #2863 from mtelgkamp/ntfy-notification-improvements
...
Improve ntfy notifications
2 years ago
Louis Lam
9e320dc5fb
Expose timezone and local datetime to notification providers
2 years ago
Louis Lam
2f3f929fbd
Merge pull request #2831 from mtelgkamp/mattermost-notification-improvements
...
Improve mattermost notifications
2 years ago
Miles Steele
682f8e52a8
lint
2 years ago
Miles Steele
171aff1226
add invert keyword feature
2 years ago
Josua Frank
1f7f1f70bf
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
Louis Lam
21ad715e6a
Merge pull request #3021 from louislam/1.22.X
...
1.22.x -> master
2 years ago
Josua Frank
23af66f618
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
Louis Lam
45ef7b2f69
Fix Effective Date Range cannot be removed
2 years ago
Nelson Chan
38fab198bb
Fix: Fix user count check
2 years ago
Nelson Chan
8d5679a8ab
Fix: Create database before connect
2 years ago
Josua Frank
6b078b83bd
Merge branch 'master' into ntfy-bearer-authorization
2 years ago
Louis Lam
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
2 years ago
Louis Lam
32f84b5e4e
Merge pull request #2491 from RubenNL/fix-metrics-push
...
Fixed the metrics for the push type.
2 years ago
Louis Lam
dbfaddafca
Validate cron before submit
2 years ago
Louis Lam
511038b45a
Remove unused code
2 years ago
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.
2 years ago
Louis Lam
de0d1edfd4
Merge pull request #2988 from chakflying/fix/socks-rejectUnauthorized
...
Fix: Pass rejectUnauthorized to Socks Proxy
2 years ago
Louis Lam
524cf7c607
WIP
2 years ago
Louis Lam
227cec86a8
WIP
2 years ago
Louis Lam
02291730fe
WIP
2 years ago
Nelson Chan
8ee4b844fd
Fix: Pass rejectUnauthorized to Socks Proxy
2 years ago
Josua Frank
fc4312ca1a
Merge branch 'master' into ntfy-bearer-authorization
2 years ago
Louis Lam
fbdeb30ce7
Merge pull request #2973 from chakflying/fix/limit-precision
...
Fix: Apply toPrecision as last step
2 years ago
Louis Lam
41bda4e1d7
Merge pull request #2975 from chakflying/fix/badge-no-label
...
Fix: Allow status badge with empty label
2 years ago
Louis Lam
4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider
...
Add Twilio Sms Notification Provider
2 years ago
Louis Lam
302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
...
Feat: Add opsgenie notification provider
2 years ago
Louis Lam
3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
...
Fix: Check for TLS expiry notified days smaller than target
2 years ago
Faruk Genç
b64c835cee
Add Twilio Sms Notification Provider
2 years ago
Nelson Chan
4f05912276
Fix: Allow status badge with empty label
2 years ago
Nelson Chan
bf525371d9
Fix: Apply toPrecision as last step
2 years ago
Louis Lam
89bfc3bf33
Merge pull request #2908 from chakflying/chore/encrypted-private-key
...
Chore: Add support for encrypted SSL-key
2 years ago
Louis Lam
f4ee5271af
Improve error handling of mysqlQuery and return row count as result
2 years ago
Louis Lam
7330db3563
Improve error handling of mysqlQuery and return row count as result
2 years ago
Nelson Chan
ca52047bf5
Feat: Flush WAL on shutdown
2 years ago
niclas.koegl
d9558833fc
Fix linting
2 years ago
niclas.koegl
d2527d7254
Merge branch 'master' into feature/opsgenie-alerts
2 years ago
niclas.koegl
6dfca0c163
Add Opsgenie notification provider
2 years ago
Josua Frank
35a56dd9e0
Added dropdown for authentication methods
2 years ago
Josua Frank
442f54de84
Merge branch 'louislam:master' into ntfy-bearer-authorization
2 years ago
tombii
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
2 years ago
Louis Lam
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
Louis Lam
533bc1505b
Prevent generating duplicated timeslots
2 years ago
Nelson Chan
391692a708
Chore: Add support for encrypted SSL-key
2 years ago
Louis Lam
a599f5149b
Merge pull request #2907 from chakflying/fix/disconnect-redis
...
Fix: Disconnect redis after ping
2 years ago
Nelson Chan
f32fcb204f
Fix: Check for notified days smaller than target
2 years ago
Nelson Chan
230de63460
Fix: Disconnect redis after ping
2 years ago
Josua Frank
e8814e8479
added option for ntfy access tokens
2 years ago
Louis Lam
2dedc1cfbd
Fix #2776
2 years ago
Louis Lam
ce8eebc838
Fix #2880
2 years ago
Louis Lam
7ec09d0118
Fix ipv6 issue for ping
2 years ago
Louis Lam
92c9b8bb63
Fix ipv6 issue for ping
2 years ago
Louis Lam
010c7d681f
Fix ipv6 issue for ping
2 years ago
Louis Lam
8d1847c032
Merge pull request #2744 from bobby-ore/add-lunasea-user-id
...
Add ability to use User ID for LunaSea notifications
2 years ago
Nelson Chan
bc87abf5c2
Fix: Clear uptime cache on push beat
2 years ago
Arniwatt Chonkiattipoom
bb7de6aa88
chore: notification toggle missing when import from backup
2 years ago
Nelson Chan
150607cc93
Feat: Support auto theme in status pages
2 years ago
Michael Telgkamp
cbbd3e20ad
Codestyle: Add trailing comma
2 years ago
Louis Lam
71c800b880
Merge remote-tracking branch 'origin/master' into notification-provider-pagertree
...
# Conflicts:
# src/lang/en.json
2 years ago
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
2 years ago
Bobby Ore
b21c2adcc2
Rework lunasea notification to allow for device id and user id
2 years ago
Louis Lam
958354e4db
Minor
2 years ago
Louis Lam
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2 years ago
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>
2 years ago
Matthew Nickson
06ee68dc0e
Merge branch 'feature/1685-prometheus-api-key' of github.com:Computroniks/uptime-kuma into feature/1685-prometheus-api-key
2 years ago
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>
2 years ago
Louis Lam
ea3b3abe36
Fine tune
2 years ago
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
2 years ago
Louis Lam
d668812df1
Fix merge issue
2 years ago
Louis Lam
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
Louis Lam
a7b49fcd98
Fix json body after xml body added
2 years ago
Louis Lam
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2 years ago
Louis Lam
e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification
...
Adds name + status + message to Slack notification
2 years ago
Louis Lam
c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty
...
Fix: getGameList returns nothing on first run
2 years ago
Nelson Chan
c65a920050
Chore: Fix code comment
2 years ago
Nelson Chan
7b8ed01f27
Fix: getGameList returns nothing on first run
2 years ago
Louis Lam
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2 years ago
Louis Lam
2fa233ae7f
Fix prometheus null issues
2 years ago
Louis Lam
e9475ed3c0
Merge remote-tracking branch 'origin/master' into telegram_test
...
# Conflicts:
# server/notification-providers/telegram.js
# src/languages/en.js
2 years ago
Louis Lam
10228874fa
Merge manually
2 years ago
Michael Telgkamp
186ca30508
Improve mattermost notifications
2 years ago
Ruben van Dijk
896e33815d
Merge branch 'louislam:master' into fix-metrics-push
2 years ago
Louis Lam
7e3734af53
Better handling
2 years ago
Louis Lam
5789112f55
Merge remote-tracking branch 'origin/master' into feat-add-message-thread-id-telegram-nonfiction
2 years ago
Louis Lam
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
2 years ago
Austin Miller
5e1489a6ed
PagerTree Notification - Send msg when heartbeatJSON null
2 years ago
Louis Lam
9ccaa4d120
Merge pull request #2786 from luckman212/luckman212-tagsort-1
...
sorted tags on dashboard
2 years ago
Louis Lam
42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code
...
Feat: Use error message to detect and set status code
2 years ago
Peace
0be8b111e2
chore: better up message
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Faruk Genç
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace
cef0a0faf4
Merge branch 'master' into group-monitors
2 years ago
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>
2 years ago
Matthew Nickson
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Luke Hamburg
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
2 years ago
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>
2 years ago
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>
2 years ago
Matthew Nickson
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
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>
2 years ago
Louis Lam
d1175ff471
Fix #2777
2 years ago
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>
2 years ago
Faruk Genç
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago