Commit Graph

1428 Commits (38f5f16dc7676427266c9be8971b870634868aa6)

Author SHA1 Message Date
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
Nelson Chan dd82f36da3 Fix: Improve syntax & fix weird label logic
2 years ago
Adam Spurgeon 774d754b21 Add GameDig monitor
2 years ago
Matthew Nickson 5d6770c0db
Removed excess space around function
2 years ago
Matthew Nickson 7a13b959a3
Updated to match changes in #2223
2 years ago
Louis Lam 21c1921867
Update server/uptime-kuma-server.js
2 years ago
Matthew Nickson caff9ca736
Added JSDoc for server/
2 years ago
long2ice 40ebc2df79 feat: support redis monitor
2 years ago
twiggotronix 8ec240fe19
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
Louis Lam fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
2 years ago
Louis Lam 0b959514f8 Fix timeout
2 years ago
Louis Lam 7d92351568 Match previous settings
2 years ago
Louis Lam 494c53971c Convert to UTF8 on Windows only
2 years ago
David Twigger fc1914bccd Fix lint
2 years ago
David Twigger c196c34840 Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
Matthew Nickson 90a2668272
Restructured condition + ensure data is UTF-8
2 years ago
Matthew Nickson 69e1880cd3
Added not active condition to prevent false error
2 years ago
Matthew Nickson 73835f3328
Changed from ping-lite to ping module
2 years ago
Nelson Chan 204792dd2d Fix: Fix incorrect handling for container down
2 years ago
Nelson Chan 942b55ca03 Fix: Add support for maintenance in badges
2 years ago
Louis Lam 0cead83705 Fix #2516
2 years ago
Arniwatt Chonkiattipoom a8af2a418e
Slack notification block not working (#1958)
2 years ago
Louis Lam 39ac9b887e Fix #2504
2 years ago
Louis Lam 50711391d1
Revert "Auth: Case insensitive login check on username"
2 years ago
Louis Lam e88e10cc8e Fix #2494
2 years ago
Louis Lam 27146ffeef
Merge pull request #2433 from mathiash98/mathias/Auth-case-insensitive-login
2 years ago
Louis Lam 41a9f2ff8a
Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc
2 years ago
Louis Lam cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
2 years ago
Louis Lam 8bb064c6fa
Merge pull request #2157 from Mikkel-T/fix-discord-embed
2 years ago
Louis Lam 1006fbd873 A possible fix for #2447
2 years ago
Louis Lam 5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
2 years ago
minhhoang d111db0321 fix: add accurate error message when user input invalid service name or method name
2 years ago
minhhoang 4147a4c404 fix: #2480
2 years ago
Ruben 9404efd86d
Fixed the metrics for the push type.
2 years ago
401Unauthorized c60b741406
Add kook notification provider
2 years ago
Louis Lam e12225e595 Fix #2475 #2468 #2455, add Accept-Encoding only if encountered the abort error
2 years ago
Louis Lam 1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
2 years ago
Louis Lam 14fffcf06b Globally fix if heartbeatJSON["msg"] is undefined
2 years ago
Louis Lam a4de93f976 WIP
2 years ago
Mathias Haugsbø b3ac7c3d43 Username case insensitive, patch db instead of using LIKE
2 years ago
Mathias Haugsbø c79b2913a2 Auth: Case insensitive login check on username
2 years ago
Louis Lam df21f7da76 Check login for initServerTimezone
2 years ago
Louis Lam b75db27658 Fix lint
2 years ago
Louis Lam 765d8e1297 Fix #2318
2 years ago
Louis Lam 9dc2cc1f0d Copy timezone.js from dayjs
2 years ago
Louis Lam 1da00d19fd Try to fix `incorrect header check`
2 years ago
Louis Lam 466b403a96 Handle unexpected error of checkCertificate
2 years ago
zImPatrick f32441e2f6 fix discord notification not sending when docker container is down
2 years ago
Louis Lam 39987ba9ac Init server timezone
2 years ago
Louis Lam 3b87209e26 Add configurable dns cache
2 years ago
Louis Lam 3b58fd3b3c Cache uptime
2 years ago
Louis Lam bc86f8bb5f Reset busy_timeout to default
2 years ago
Louis Lam 02b5cae577 Fix #2371 by left join maintenance_timeslot
2 years ago
Louis Lam 4cd5b5563f Fix #1145
2 years ago
panos 9da28fbbc7 zoho cliq code style
2 years ago
panos 851a04b082 zoho cliq code style
2 years ago
panos 68bc7ac421 zoho cliq code style
2 years ago
panos 73bfdb9ef9 zoho cliq notification provider
2 years ago
Louis Lam e478084ff9 Fix Uptime Kuma cannot be stopped
2 years ago
Louis Lam eadf2c810a Fix check version
2 years ago
Louis Lam ee1a56caae Update /test-webhook and reevaluate sensitive fields
2 years ago
Louis Lam e886df4788 Fix typo
2 years ago
Louis Lam 5196abfd36 Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
Louis Lam 3e68cf2a1c Specify `Accept-Encoding` for axios request (Fix #2253)
2 years ago
Louis Lam 191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
2 years ago
Joshua Brunner cd270bd8b5 Add socks5h support
2 years ago
Matthew Nickson 2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
2 years ago
Matthew Nickson 15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
2 years ago
Matthew Nickson b053bc61ce
Fixed MySQL monitor to close connection
2 years ago
rmarops 0e30843a75 fixed lint check missing semicolon
2 years ago
rmarops 2103edb604 moved client close out of finally block and fixed linting errors
2 years ago
rmarops b059a36e66 added MongoDB ping monitor
2 years ago
Jan Hartje 258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
Louis Lam cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
2 years ago
Dafnik 4042c26390 Fix 'undefined' in link preview generation
2 years ago
Louis Lam cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
2 years ago
Louis Lam 68862c0b3f Fix Pushbullet do not handle general message correctly and fix name convention (Close #1890)
2 years ago
Louis Lam fd15e7c2dc Merge remote-tracking branch 'origin/master' into ntfy-icon
2 years ago
Louis Lam 5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
2 years ago
minhhn3 b459408b10 fix: resolve conflict
2 years ago
Adam Stachowicz 134b3b8ac1 Fix 'dayjs' is never used warning
2 years ago
Marcin Kiszka 08763b700a Added support for SMSEagle device API notifications
2 years ago
Matthew Nickson 4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam 24cb212a37 Fix recurring
2 years ago
Louis Lam d8a676abb6 Implement recurring day of month and day of week
2 years ago
Louis Lam 0b8d4cdaac Generate Next Timeslot for recurring interval
2 years ago
Louis Lam 268cbdbf8d Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
Matthew Nickson f459ea845c
Added #2182 Add support for custom radius ports (#2197)
2 years ago
Louis Lam b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect
2 years ago
Louis Lam edacff123b Add UTC in the serverTimezone dropdown
2 years ago
Louis Lam 2faf866e9e Implement generateTimeslot() for recurring interval type
2 years ago
Louis Lam 7b9766091e Revert testing
2 years ago
Louis Lam 39b6725163 Update maintenance tables
2 years ago
Louis Lam dfb75c8afb Update status page's maintenance message
2 years ago
Louis Lam e07aa982c3 WIP
2 years ago
Christian Meis 1e8a16504b Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2 years ago
Louis Lam 2271ac4a5a Add info.serverTimezoneOffset and improve some styles
2 years ago
Louis Lam c84de4d259 WIP: Add maintenance status
2 years ago
Louis Lam c1ccaa7a9f WIP
2 years ago
Louis Lam 539683f8e9 Merge remote-tracking branch 'origin/master' into maintenance
2 years ago