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
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
2 years ago
80c8fd7372
Chore: Remove util-worker
2 years ago
a27386bb92
Fix: Use croner for clear-old-data
2 years ago
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
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
Louis Lam
Nelson Chan
AnnAngela
Christopher Wilkinson
Josua Frank
Miles Steele
Faruk Genç
niclas.koegl
tombii
Arniwatt Chonkiattipoom
Michael Telgkamp
Bobby Ore
Matthew Nickson
Ruben van Dijk
Austin Miller
Peace
Luke Hamburg
Brayan Lozano
Suriya Soutmun
Haytham Salama
c
Joseph
Peace
Thomas Spalinger
alejandrohernandezrosales
long2ice
Ruben
shyneko