Commit Graph

617 Commits (649f3106e1f7b6f39d81fce9f90ab64429834553)

Author SHA1 Message Date
Louis Lam 674b387c95 Merge branch 'master' into smtp-subject
3 years ago
Louis Lam 5ff9a64e5e [Push Type] Fix missing duration calculation (#685)
3 years ago
Louis Lam 4bee57ea7f Merge remote-tracking branch 'giacomo892/patch-1'
3 years ago
Louis Lam f75c9e4f0c add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
3 years ago
xJoker 6e04ec436e
Update server/notification-providers/dingding.js
3 years ago
xJoker 2d471a5e84
Update server/notification-providers/dingding.js
3 years ago
xJoker cae194f58f
Update server/notification-providers/dingding.js
3 years ago
Aaron Erkenswick 655ccc86b9 Add monitor name context to Slack fallback text.
3 years ago
Louis Lam e2dbacb383 Fix encoding problem of ping result for non-English Windows
3 years ago
Lukas 89b34b5748 Use double curly brackets and sanity check for customSubject
3 years ago
wuwenjing 843992c410 Add DingDing notification
3 years ago
wuwenjing 57a76e6129 remove `alicloud/pop-core` keep simple
3 years ago
giacomo892 3fe3450533
Prioritize port passed from args
3 years ago
Lukas 330cd6e058
Minor rehabilitanty impedyment
3 years ago
wuwenjing a2f2253221 Add aliyun sms notification
3 years ago
Lukas 30d8aadf12 Slightly refactor
3 years ago
giacomo892 d733ec018e
Prioritize host arg
3 years ago
Nelson Chan 03b07730d3 Fix: Increase default kept period
3 years ago
Andreas Brett 2538bd04ce notp verification defaults
3 years ago
xJoker 1bc77a06e5
Update server/notification-providers/feishu.js
3 years ago
xJoker 69c623ac2b
Update server/notification-providers/feishu.js
3 years ago
wuwenjing ce2df137e6 change text to using variable `msg`
3 years ago
wuwenjing 6d9b71c054 Add Feishu notification
3 years ago
Andreas Brett e223e826a3 linting
3 years ago
Andreas Brett b5b391c73b
avoid default values for token verification
3 years ago
Bert Verhelst 5445c2a2ff fix(monitor): revert unintentional change to comment
3 years ago
Bert Verhelst dc08510e72 Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
Louis 2286f78f57 update to 1.8.0
3 years ago
LouisLam 82131f4dd2 merge conflict
3 years ago
Bert Verhelst 5137c80c07 fix(monitor): handle empty headers
3 years ago
Lukas 792f3c7c5c Add support for values of Name, Hostname and Status
3 years ago
Lukas edb75808d8
Merge branch 'louislam:master' into smtp-subject
3 years ago
LouisLam 56ae6f6117 fix demoMode export
3 years ago
Lukas 5e3ea3293c Very basic email subject customization
3 years ago
LouisLam 5c89562650 not allow lower than 20s for demo mode
3 years ago
Nelson Chan ac80631bcd Fix: Run clear data at specific time
3 years ago
Nelson Chan 8caf47988c Fix: Allow setting settings type
3 years ago
Nelson Chan dca5a59dbc Feat: Implement data clearing logic & frontend
3 years ago
Nelson Chan 656a4d6270 WIP: Enable background jobs
3 years ago
Bert Verhelst d71d27220b fix(edit-monitor): store headers as JSON
3 years ago
Bert Verhelst fba4f86552 Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam 23a2d33f8c [backup] restore pushToken
3 years ago
Bert Verhelst daab2a05f5 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam a15e9077fc [status page] clear cache if it is an important beat
3 years ago
LouisLam fc8d1e78b6 [push type] hide upside down mode, apply primary base url
3 years ago
Lukas db791c880a
Don't use then with await.
3 years ago
Lukas dfd63386ba
Make PromoSMS actually working
3 years ago
Lukas 12b5489eb5 PromoSMS as Notification Provider
3 years ago
LouisLam ddad2dcb4a Merge remote-tracking branch 'origin/master'
3 years ago
LouisLam 5b4af550fb Merge branch 'master' into DeeJayPee_master
3 years ago
LouisLam 3a0143ac46 [matrix] use encodeURIComponent to handle the url encode
3 years ago
LouisLam 2ce5c28ed4 Merge branch 'master' into feature/matrix-notifications
3 years ago
Bert Verhelst ec4b7e4064 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam e5f6d7f047 slack and rocket.chat use the primary base url
3 years ago
Bert Verhelst 162ef04c41 Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
Gero Gerke 6bebc623f9 UI polish
3 years ago
Gero Gerke 34b86352f2 remove double spaces
3 years ago
Gero Gerke 99e8a33118 escape room characters
3 years ago
Gero Gerke d7cc585101
Update server/notification-providers/matrix.js
3 years ago
Gero Gerke 5decfb9fad Matrix Notifications
3 years ago
DeeJayPee bc4db6c692 Merge branch 'master' of https://github.com/louislam/uptime-kuma into louislam-master
3 years ago
DeeJayPee f14a798b2c Fix indentation + typo
3 years ago
Bert Verhelst 550825927c Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam edad2caf8e return the correct exit code from jest
3 years ago
LouisLam 49720c709c improve the test with a single command only "npm test"
3 years ago
Louis Lam 865b721b79
Merge pull request #519 from chakflying/improve-certInfo
3 years ago
Bert Verhelst 6b44116245 Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
LouisLam a2a4c70cf5 setup jest-puppeteer
3 years ago
Bert Verhelst 3f0b85e5a8 feat(http-requests): add support for methods, body and headers for http
3 years ago
Nelson Chan 13bdfefa9d Feat: Improve Certificaet Info Display
3 years ago
LouisLam 7fa1cb83af [push type] add ping parameter
3 years ago
LouisLam 8d5eaaf8a7 minor
3 years ago
LouisLam b246c8e0f2 Fix 2fa for iOS Google authenticator (#486)
3 years ago
LouisLam 1ed4ac9494 add Push-based monitoring (#279)
3 years ago
LouisLam 6eceb4c744 Merge remote-tracking branch 'origin/master'
3 years ago
LouisLam 3e4154dfb5 Fix retry interval affected bug
3 years ago
Louis Lam fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor
3 years ago
Denis Freund b67b4d5afd add steam gameserver for monitoring
3 years ago
LouisLam 0afa3a2c21 Merge branch '1.6.X'
3 years ago
Nelson Chan 662c97dcde
Fix: Fix importing tag if tag doesn't exist
3 years ago
Ponkhy 7fb55b8875 Fixed issues
3 years ago
Ponkhy 4786514e9f
Merge branch 'louislam:master' into import-export
3 years ago
Nelson Chan 32c9dfbb31 Fix: clear important beats after deleteMonitor
3 years ago
Ponkhy d3d4363031 Used compare-version instead of replace
3 years ago
Adam Stachowicz f6a984b671 start-server-dev. Fixes #460
3 years ago
LouisLam 23a63213aa Merge branch 'master' into import-export
3 years ago
LouisLam 0a5a6e6a4b [status page] fix monitor order
3 years ago
LouisLam fe0fc63843 [status page] send uptime
3 years ago
LouisLam 8c7ee94769 add modified apicache library with disabling client cache
3 years ago
LouisLam 15c00d9158 upload logo and expose ./data/upload to url
3 years ago
LouisLam 469e8f6fd6 Merge branch 'master' into public-dashboard
3 years ago
LouisLam 4591adc05e second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
3 years ago
LouisLam 5f6aa32844 fix store/fetch status page config
3 years ago
LouisLam a8e170f6a8 Merge branch 'master' into public-dashboard
3 years ago
LouisLam 34c0fa59a8 fix reset-password (#448)
3 years ago
LouisLam b0e9c5bcb4 fix reset-password (#448)
3 years ago
LouisLam 0b572df3d0 [status page] store config
3 years ago
LouisLam 7ee98d989c [status page] implement rest api for heartbeat
3 years ago
LouisLam fd95d41d9f [status page] many update and save group list
3 years ago
Louis a6fdd272a6 [status page] minor
3 years ago
Ponkhy 1b5e723f60 Added descriptions to uploadBackup function
3 years ago
Ponkhy 4bdada36a9 Removed if includes version
3 years ago
LouisLam 9b8f01cfc6 since eslint can auto fix semicolon, standardize all end with semicolon
3 years ago
LouisLam 2955abb5d9 [status page] create incident
3 years ago
Ponkhy 8b463e70df
Apply suggestions from @Saibamen
3 years ago
LouisLam 392f8275b3 Merge branch 'master' into public-dashboard
3 years ago
Ponkhy 54aa68ec58 Added import/export compatibility for version 1.7
3 years ago
Louis Lam 72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
3 years ago
LouisLam 80322cbfe7 Merge branch 'import-export'
3 years ago
LouisLam 7e0272077b cleanup demo mode code
3 years ago
LouisLam 512ff09cca set entry page
3 years ago
LouisLam e8f4fabcd0 [status page] crop and resize logo
3 years ago
LouisLam 2ab06f87b8 Merge branch 'master' into public-dashboard
3 years ago
Louis Lam 76db55b657
Merge pull request #395 from WillianRod/feat/add-microsoft-teams-notification
3 years ago
LouisLam 1693873f4a [Teams] change handleTestNotification to GeneralNotification
3 years ago
LouisLam db05b506f3 [status page] checkpoint
3 years ago
No0Vad 1300448bed Adjustments to the retry interval
3 years ago
LouisLam 1d6670ed9a Merge branch 'master' into public-dashboard
3 years ago
LouisLam 3234aec5b3 NODE_ENV if not set, change to production
3 years ago
LouisLam afe91078c4 [status page] checkpoint
3 years ago
LouisLam 9902c181bc Merge branch 'master' into public-dashboard
3 years ago
Louis Lam 069c811af8
Merge pull request #278 from chakflying/tags
3 years ago
LouisLam f9311e4e7f [status page]
3 years ago
LouisLam d7a230ac15 Merge branch 'master' into public-dashboard
3 years ago
LouisLam 97360dab26 add /.well-known/change-password
3 years ago
Willian Rodrigues Barbosa ccb8736b3d fix: send msg if heartbeat message is not set
3 years ago
Louis Lam 2c02dad1f9
Merge pull request #393 from Revyn112/master
3 years ago
DeeJayPee 29d0db805d Add legacy octopush (Octopush-DM from 2011 to 2020 accounts) version
3 years ago
Nelson Chan a0e4e96160 Fix: Fix tag removal, reuse and validation
3 years ago
Nelson Chan 6e3a904aaa WIP: Add tags functionality
3 years ago
No0Vad 2617e1f4d8 Update database.js
3 years ago
No0Vad 91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
3 years ago
LouisLam e205adfd7b [status page] developing
3 years ago
Willian Rodrigues Barbosa 063d64eec8 feat: add microsoft teams notification provider
3 years ago
LouisLam f47f7758f9 Merge branch 'master' into public-dashboard
3 years ago
Ponkhy d313966d80
Merge branch 'master' into import-export
3 years ago
Denis Freund 8352d9abbe add posibility to have a prefixMessage before the embed
3 years ago
No0Vad 389d247463
Update server/database.js
3 years ago
Ponkhy 7fee4a7ea7 Added import options
3 years ago
LouisLam c4f78d776e [2fa] "UptimeKuma" to "Uptime Kuma"
3 years ago
No0Vad f8f9f59464 Added support for a retry interval to monitors
3 years ago
LouisLam 934685637a [Status Page] WIP: Checkpoint
3 years ago
Ponkhy 295ccba44b Adjusted for new db patch management
3 years ago
Ponkhy 8cd5bad44c
Merge branch 'master' into 2fa
3 years ago
Ponkhy f6d1a82989
Update server/server.js
3 years ago
Ponkhy 651b525d06
Update server/server.js
3 years ago
LouisLam 3e25f0e9d9 [Status Page] WIP: Checkpoint
3 years ago
LouisLam 08de0090dc add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0
3 years ago
Ponkhy 59cccf8c50 Fixed typo
3 years ago
Ponkhy 403202d4d4 Added simple TOTP Two Factor Authentication
3 years ago
LouisLam 573c7faddd switch on the notification, if it is added in EditMonitor.vue
3 years ago
LouisLam e330875c80 fix restore fail if no isDefault
3 years ago
Louis Lam 331ae5ec20
Merge pull request #306 from Ponkhy/import-export
3 years ago
LouisLam 8ee34c7904 also handle the first beat problem in uptime
3 years ago
LouisLam 4f07c2ea9a uptime calculation fully sum in sql
3 years ago
LouisLam 24facc79d7 sendHeartbeatList use raw data
3 years ago
LouisLam 9f9c1007d7 increase sqlite cache size from 2MB to 12MB
3 years ago
LouisLam dd283423ab improve smtp with cc, bbc and ignore tls
3 years ago
LouisLam 6006038689 fix monitor.stop() in some cases
3 years ago
LouisLam a7b50c3630 Revert "add user-monitor-list"
3 years ago
LouisLam 0ddbac5109 Revert "move userMonitorList out of server.js"
3 years ago
LouisLam 0f440596c8 Revert "cache last heartbeat list in memory"
3 years ago
LouisLam 87678ea92d cache last heartbeat list in memory
3 years ago
LouisLam a7cf14c663 move userMonitorList out of server.js
3 years ago
LouisLam 230a9bfaf9 add user-monitor-list
3 years ago
Ponkhy 1ef4562905 Paused monitors stay paused after import
3 years ago
LouisLam 62712f5cc4 Merge branch 'master' into import-export
3 years ago
LouisLam 0aeaf87f5b Merge branch 'master' into default-notification
3 years ago
LouisLam da74391c3e convert notifications into modules
3 years ago
Ponkhy 242e494cb5
Merge branch 'master' into import-export
3 years ago
Ponkhy 4faa409027
Merge branch 'master' into default-notification
3 years ago
LouisLam da131a5156 Merge branch 'master' into clear-monitor-data
3 years ago
Ponkhy fd8c95d64e
Merge branch 'master' into default-notification
3 years ago
Ponkhy 58240aceef Added the option for default notifications
3 years ago
Louis Lam f9c177b150
Merge pull request #315 from tgxn/patch-1
3 years ago
LouisLam 299506ce45 reset the heartbeat list instead of reload the page after cleared events or heartbeats
3 years ago
Domenic Horner 41d32bb9dd Undo parm changes
3 years ago
Domenic Horner b0acda52f9 Add time to smtp body content
3 years ago
Domenic Horner e9cd9be03a Use constants for UP/DOWN through notifications class
3 years ago
Domenic Horner 6ae279c7f3 Move title generation to notification class
3 years ago
Domenic Horner 9c32adfb55
Update pushbullet down body
3 years ago
Domenic Horner d346afd33b
Update pushbullet up body
3 years ago
Domenic Horner 3bf380c684
Update lunasea "up" body content
3 years ago
Domenic Horner dca5c59982
Update lunasea body content
3 years ago
Ponkhy 8f9a973ede
Merge branch 'master' into import-export
3 years ago
LouisLam ebf362754c Merge branch 'master' into clear-monitor-data
3 years ago
LouisLam e31be8caf5 demo mode
3 years ago
LouisLam 60f2f08cea add demo db
3 years ago
LouisLam b1647a310e add demo db
3 years ago
Ponkhy 7d70c4d8cd Code optimizations
3 years ago
Domenic Horner 532ad3044c
Add space to pushbullet and lunasea notifications
3 years ago
LouisLam f23ecef636 add missing cert parameters
3 years ago
LouisLam 51cf2ff6f9 add missing cert parameters
3 years ago
LouisLam b30b1d3a52 create data dir before copy
3 years ago
LouisLam 582e14098d create data dir before copy
3 years ago
LouisLam 6e3e2fc85c fix db path
3 years ago
LouisLam b604807cfe create data dir if not exists
3 years ago
LouisLam 3ee13bddd1 dash style for args
3 years ago
LouisLam c74986647e allow changing data dir
3 years ago
LouisLam b88b357b55 add support for https
3 years ago
Ponkhy 2dd392e609 Added uptime kuma version to backup file
3 years ago
Ponkhy c13cc62d3d
Update server/server.js
3 years ago
Ponkhy b604910bbb
Merge branch 'master' into clear-monitor-data
3 years ago
Ponkhy 2f6c5963c5 Added import and export function
3 years ago
LouisLam e4b76717be revert back to node-sqlite3
3 years ago
LouisLam cd1a3a2fb9 revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems
3 years ago
Ponkhy 7b92166d18 Added clear all db statistics function
3 years ago
Ponkhy 1341d220ed
Merge branch 'louislam:master' into clear-monitor-data
3 years ago
LouisLam 697fa6bdfd fix discord notification appended port unexpectedly
3 years ago
LouisLam 527e0c3444 raise the ping timeout from 2s to 10s (avoid #294)
3 years ago
LouisLam a41534ca60 no declare vars with comma, one line only one statement
3 years ago
LouisLam ec731d174d Merge branch 'MichelBaie_master'
3 years ago
LouisLam 0d65918a6a change bcrypt to bcryptjs, use my own prebuilt better-sqlite3, supports more prebuilt
3 years ago
LouisLam bf29f28726 send stats only if there is at least one client in the room
3 years ago
Ponkhy 1952e34110 Added the possibility to clear monitor data
3 years ago
LouisLam ada6606217 move the new sql to patch8.sql
3 years ago
Ponkhy 858affa808 Removed useless database query
3 years ago
Ponkhy 303adbf9b1 Show latest dns result in Details.vue
3 years ago
Louis Lam 7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
3 years ago
Louis Lam d2f0a15076
Merge pull request #264 from antiseptikk/master
3 years ago
Thomas Ferney 44d9967cfb
feat: add rocket.chat notification
3 years ago
LouisLam 46ac753c46 Merge branch 'master' into dns-monitor
3 years ago
Thies 72740ba477
Update the styling to better match existing styles
3 years ago
Thies Nieborg 5d438ca2b6
Discord notification URL now also represents non http services
3 years ago
Ponkhy d313a06d5c Optimizations for output handling
3 years ago
Rashad 23851ef539 added mattermost notification support
3 years ago
LouisLam 397fd12081 remove unused import
3 years ago
LouisLam 682e4d45e2 eslint for notification.js
3 years ago
LouisLam f96d792fa1 fix patch database using better-sqlite3
3 years ago
Ponkhy 44d9fa63f0 Adjusted the output for A and AAAA records
3 years ago
LouisLam 14652c9b5f Remove unused variables
3 years ago
Ponkhy b2041cb36b Fixed ESLint Errors
3 years ago
LouisLam aa2233eb2d log notification error
3 years ago
Ponkhy e5981b10ce Replaced var with let and removed re-declaration
3 years ago
LouisLam 46cb955172 afterLogin change to non blocking
3 years ago
LouisLam 50f300dd28 heartbeat interval change to use setTimeout()
3 years ago
LouisLam 2f50fc4c00 plan to switch to better-sqlite3, drop node-sqlite3
3 years ago
Ponkhy c79be19ec3 Added DNS Monitor Type
3 years ago
LouisLam b892a92fc8 retry if acquire error
3 years ago
LouisLam ec0dbf3cbe probably still memory leak over time, not sure what happen, change back to singal pool.
3 years ago
LouisLam 210a0d414c fix check update interval too short
3 years ago
LouisLam 05680472a7 fix high memory usage
3 years ago
LouisLam ca3b0a0f19 fix setInterval
3 years ago
LouisLam 4571a9b8c1 check update
3 years ago
LouisLam 209e44c2e1 prevent all monitors making requests at the same moment when start the server
3 years ago
LouisLam 30b8d3d0ab prevent all monitors making requests at the same moment when start the server
3 years ago
LouisLam 7ffdb2eb80 also backup sqlite shm, val file
3 years ago
Ponkhy 64501bf065 Added Line Messenger Notification Service
3 years ago
LouisLam 440c178403 change sqlite to WAL mode
3 years ago
LouisLam 61e758d872 disable pool for sqlite, re-use a connection to improve the performance.
3 years ago