Commit Graph

1527 Commits (207847505a157448bc24082b97332809669d4696)

Author SHA1 Message Date
kefoster951 d37c33ad42
Update server/util-server.js
1 year ago
Louis Lam c4c3fc81b2
Merge pull request #2693 from julian-piehl/group-monitors
1 year ago
Fabian Beuke 37ae8eb44a
Fix: prometheus monitor_status metric has 4 values
1 year ago
Kenneth Foster 8897385690 Fixed linting
1 year ago
Kenneth Foster 6132a45c7c fixed when auth is needed but not provided
1 year ago
Kenneth Foster f68452c47a Added changes to stop auth attempts after an error
1 year ago
Nelson Chan 58ec53fb1d Fix: Try to close mysql connection properly
1 year ago
duane 9a8bea5761 Changes 'Mention Channel' -> 'Notify Channel'
1 year ago
Peace 56f448bfe5
fix: maintenance heredity
1 year ago
Peace 2b46da0f47
style: fix linting
1 year ago
Peace 9bd76c2795
Merge branch 'master' into group-monitors
1 year ago
duane 376d84c742
Merge branch 'master' into feature/add-channel-notification-for-slack
1 year ago
Louis Lam 343a1d3344
Merge pull request #3203 from CommanderStorm/applied_timezone_formatting
1 year ago
Wojciech Kapcia f3fe392ec4
Add option to use ApiKeys in Twilio in addition to main account credentials
1 year ago
Frank Elsinga f3c09f2bbd made every Notification provider supply time like dingding after #3152
1 year ago
Louis Lam 8ed2b59410 Resolve conflict
1 year ago
Louis Lam 0b8dddba24 Merge remote-tracking branch 'origin/master' into skaempfe#2593
1 year ago
Louis Lam bc95875aa0
Merge pull request #3156 from maximilian-krauss/feat/add-pushover-ttl
1 year ago
Louis Lam c1efe0f26d Add a warning for Node.js >= 20
1 year ago
Maximilian Krauß a0d0d5b015 fix: sends pushover ttl only if defined
1 year ago
Maximilian Krauß 8d05d80a5f feat: Adds message ttl to pushover notification
1 year 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
2 years ago
duane 00f733d352 Adds ability to notify channel when Slack webhook triggered
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
2 years ago
Louis Lam 8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
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'
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
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
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
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
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
2 years ago
Louis Lam 32f84b5e4e
Merge pull request #2491 from RubenNL/fix-metrics-push
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
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
2 years ago
Louis Lam 41bda4e1d7
Merge pull request #2975 from chakflying/fix/badge-no-label
2 years ago
Louis Lam 4869e6531c
Merge pull request #2980 from Genc/feature/twilio-notification-provider
2 years ago
Louis Lam 302b9cf644
Merge pull request #2956 from wwniclask25/feature/opsgenie-alerts
2 years ago
Louis Lam 3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
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
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)
2 years ago
Louis Lam 491239415e Merge remote-tracking branch 'origin/master' into doubles-ss_master
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
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
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
2 years ago
Michael Telgkamp 7b4f90ce92
Improve ntfy notifications
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
2 years ago
Matthew Nickson 669f8700b2
Switched to nanoid for key generation
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
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
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
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
2 years ago
Louis Lam e873fea86d
Merge pull request #2736 from blozano824/add-status-to-slack-notification
2 years ago
Louis Lam c4a9374671
Merge pull request #2835 from chakflying/fix/game-list-empty
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
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
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
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
2 years ago
Louis Lam 42033c692f
Merge pull request #2748 from chakflying/feat/improve-err-code
2 years ago
Peace 0be8b111e2
chore: better up message
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
2 years ago
Matthew Nickson 1d4af39820
Fixed JSDoc for one method
2 years ago
Luke Hamburg dd1d71530f
sorted tags on dashboard
2 years ago
Matthew Nickson 01c71a0242
Fixed logic errors, removed dev leftovers
2 years ago
Matthew Nickson e7feca1cd6
Added API key authentication handler
2 years ago
Matthew Nickson cd796898d0
Added expiry check for frontend
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
2 years ago
Louis Lam d1175ff471 Fix #2777
2 years ago
Matthew Nickson cd18b96f69
Added check to ensure backup exists when restoring (#2779)
2 years ago
Faruk Genç 19c8538149 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam f2633a5d01 Finished knex_init_db.js
2 years ago
Louis Lam 4056951915 WIP: building database in knex.js
2 years ago
Louis Lam e4183ee2b7
Database Setup Page (#2738)
2 years ago
Louis Lam db4663d6be Merge remote-tracking branch 'origin/master' into 2.0.X
2 years ago
Louis Lam c12b06348b Fix parsing issues of status page's og tags
2 years ago
Bobby Ore 48b637d4c8 Refactor to not introduce a breaking change
2 years ago
Nelson Chan 3439074835 Feat: Use message to improve errror status code
2 years ago
Bobby Ore 3a361d2621 lint fix
2 years ago
Bobby Ore 8725e5daf9 Add ability to use User ID for LunaSea notifications
2 years ago
Brayan Lozano d45aee450d
Removes unecessary ternary operator
2 years ago
Brayan Lozano 727acb32bf
Adds name + status + message to slack notification
2 years ago
Suriya Soutmun 43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
Suriya Soutmun faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
2 years ago
Nelson Chan e1f956879d
Fix: Use .destroy() instead of .end()
2 years ago
Austin Miller ef54d9e3b6 Add PagerTree Notification Provider
2 years ago
Louis Lam 68ead3414d WIP
2 years ago
Faruk Genç 39c99b0ec4 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam d4752b65de WIP
2 years ago
Louis Lam dc4d2a77bb WIP
2 years ago
Haytham Salama 1bfb290718 feat: add message thread id for telegram nonfiction
2 years ago
Louis Lam 0b40c65139 Merge remote-tracking branch 'origin/master' into mariadb
2 years ago
Louis Lam afadfe32d5 Trim
2 years ago
Louis Lam 5f2affb38c Relocate and fix jsesc issue
2 years ago
Louis Lam 10c6f3b688 Merge remote-tracking branch 'origin/master' into feature-google-analytics
2 years ago
Faruk Genç 666838f334 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
c a823ed8ccc Feature - Google Analytics - Removed unused import.
2 years ago
Joseph 2a6d98ff01
Feat: Expand and Simplify Badge Functionality (#2211)
2 years ago
c 913bb611d5 Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
2 years ago
c c08d8a5eaf Google Analytics - Simplified retrieving Tag ID from Status Page.
2 years ago
c 3ff0cbe311 Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2 years ago
c fb2999706c Feature - Google Analytics - Added JSDoc to Google Analytics functions.
2 years ago
c 2b3a3895b3 Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895
2 years ago
c 99c0b8cb71 Feature - Google Analytics - Addressing PR Comments.
2 years ago
c 29e24e0de9 Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
Faruk Genç 4287f7e885 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace 9446c2d102
fix: use active instead of isActive in uploadBackup
2 years ago
Peace 2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace f286386f59
fix: add message for empty group pending state
2 years ago
Peace 9286dcb6ce
fix: add serverside check against endless loops
2 years ago
Louis Lam 683f446cf5 Add support for `.env`
2 years ago
Nelson Chan 348d0170fa Chore: Use constants instead of int
2 years ago
Faruk Genç 064bc00f46 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge
2 years ago
Peace 9a46b50989
docs: add comments
2 years ago
Peace f3ac351d75
feat: set childs under maintenance if parent is too
2 years ago
Faruk Genç 35bd129d66 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace aba515e172
feat: disable childs if parent is disabled
2 years ago
Louis Lam ddce8f0cb0 Fix plugin installation
2 years ago
Peace 97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace 645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
Louis Lam e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support (#1787)
2 years ago
Faruk Genç 9329ec9234 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam 5050ebc249 Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam 1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
2 years ago
Louis Lam 9cc3bd0de4 Avoid the multiple queries for Gamedig monitor
2 years ago
Nelson Chan c4c720027c Fix: Use correct log call format
2 years ago
Louis Lam 83e0401dd8 Show game list for GameDig monitor
2 years ago
Louis Lam aab04f6644 Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
Thomas Spalinger f155ec9ba8 remember prometheus instance and expose it
2 years ago
Faruk Genç cd017fce98 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
alejandrohernandezrosales fa23e7ad19 Removed superflous Message prefix
2 years ago
Faruk Genç aef85078eb reorder fix
2 years ago
Faruk Genç 86ba6f829e Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Nelson Chan 6961b1bdd2 Fix: Use default timeout & CachebleDnsHttpsAgent
2 years ago
Louis Lam c47b6c5995 Merge remote-tracking branch 'origin/1.19.X'
2 years ago
Louis Lam a5ff27da7a Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2 years ago
Louis Lam 27585d0812 Fix #2618
2 years ago
Louis Lam e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
2 years ago
Louis Lam 31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
2 years ago
Louis Lam 49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
2 years ago
Louis Lam 1326761a8a Update mongodb and simplify the logic of mongodbPing
2 years ago
Louis Lam e48a987b9c Merge remote-tracking branch 'origin/master' into mongodb-ping
2 years ago
Faruk Genç be850dd596 Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Faruk Genç 3adc9e65d6 Add only xml support to http monitors
2 years ago
Louis Lam 712a3c29d4 Fix Postgres monitor do not handle some error cases correctly
2 years ago
Louis Lam 6437ef198f
Merge pull request #2541 from long2ice/master
2 years ago
long2ice 3b5893ea60 fix: add preserve line in redisPingAsync
2 years ago
long2ice 21cd4d64c3 fix: redisPingAsync
2 years ago
long2ice db757123ba refactor: reuse databaseConnectionString
2 years ago
Ruben 71f00b3690
Parse push ping parameter with parseInt.
2 years ago
Nelson Chan e9564619f1 Feat: Implement tags manager in settings
2 years ago
shyneko b91fe9d96d Added a more telegram options
2 years ago
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.
2 years ago
Sebastian Kaempfe f6d0f28b3a [#2593] during certificate evaluation also set the cert type for improved notifications
2 years ago
Łukasz Szczepański 8433bceb32 Trim message to maximum allowed length
2 years ago
Louis Lam 98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
2 years ago
Nelson Chan 0ed3dd5e4f Fix: Add support for pending in badges
2 years ago
Louis Lam d9f12a6376 Fallback to `/bin/ping` if `ping` is not found
2 years ago
Łukasz Szczepański 56ba133a1f Missing semicolon
2 years ago
Łukasz Szczepański ec30147a7f Add option for allowing long sms in PromoSMS
2 years ago
Luke 2172112144
Setting for allowing long sms
2 years ago
Luke ecd661c801
Allow long sms in PromoSMS
2 years ago
twiggotronix 8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
Nelson Chan 21b418230c
Chore: reorder cases
2 years ago
Matthew Nickson 66d5408aad
Added DB schema for api keys
2 years ago
Joseph Irving 33355c51b7 Add Splunk Notifications
2 years ago
Sjouke de Vries 94b69935fe
chore(server): remove comments from status-page router
2 years ago
Sjouke de Vries 3f30feaefb
feat(server): add badge for overall status of status-page
2 years ago
Louis Lam 439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
2 years ago
Matthew Nickson 32f7a0084a
Fixed negative retention time values
2 years ago
SlothCroissant f8658d6160 Removed redundant title in Pushover notification
2 years ago