Commit graph

365 commits

Author SHA1 Message Date
Ponkhy b604910bbb
Merge branch 'master' into clear-monitor-data 2021-09-01 17:17:40 +02:00
Ponkhy 2f6c5963c5 Added import and export function 2021-09-01 17:09:32 +02:00
LouisLam e4b76717be revert back to node-sqlite3 2021-09-01 15:02:04 +08:00
LouisLam cd1a3a2fb9 revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems 2021-09-01 14:33:00 +08:00
Ponkhy 7b92166d18 Added clear all db statistics function 2021-09-01 00:36:24 +02:00
Ponkhy 1341d220ed
Merge branch 'louislam:master' into clear-monitor-data 2021-08-31 23:22:45 +02:00
LouisLam 697fa6bdfd fix discord notification appended port unexpectedly 2021-08-31 22:15:02 +08:00
LouisLam 527e0c3444 raise the ping timeout from 2s to 10s (avoid #294) 2021-08-31 22:14:33 +08:00
LouisLam a41534ca60 no declare vars with comma, one line only one statement 2021-08-31 22:08:05 +08:00
LouisLam ec731d174d Merge branch 'MichelBaie_master' 2021-08-31 20:02:39 +08:00
LouisLam 0d65918a6a change bcrypt to bcryptjs, use my own prebuilt better-sqlite3, supports more prebuilt 2021-08-31 19:56:44 +08:00
LouisLam bf29f28726 send stats only if there is at least one client in the room 2021-08-30 14:55:33 +08:00
Ponkhy 1952e34110 Added the possibility to clear monitor data 2021-08-29 18:47:01 +02:00
LouisLam ada6606217 move the new sql to patch8.sql 2021-08-29 11:16:06 +08:00
Ponkhy 858affa808 Removed useless database query 2021-08-28 21:29:24 +02:00
Ponkhy 303adbf9b1 Show latest dns result in Details.vue 2021-08-28 21:20:25 +02:00
Louis Lam 7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
Added DNS Monitor Type
2021-08-28 00:21:10 +08:00
Louis Lam d2f0a15076
Merge pull request #264 from antiseptikk/master
feat: add rocket.chat notification
2021-08-26 23:34:07 +08:00
Thomas Ferney 44d9967cfb
feat: add rocket.chat notification 2021-08-25 21:01:29 +02:00
LouisLam 46ac753c46 Merge branch 'master' into dns-monitor 2021-08-26 01:05:46 +08:00
Thies 72740ba477
Update the styling to better match existing styles
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-08-25 14:08:41 +02:00
Thies Nieborg 5d438ca2b6
Discord notification URL now also represents non http services 2021-08-25 13:07:52 +02:00
Ponkhy d313a06d5c Optimizations for output handling 2021-08-25 09:31:42 +02:00
Rashad 23851ef539 added mattermost notification support 2021-08-24 21:19:21 +03:00
LouisLam 397fd12081 remove unused import 2021-08-25 01:26:10 +08:00
LouisLam 682e4d45e2 eslint for notification.js 2021-08-25 01:21:06 +08:00
LouisLam f96d792fa1 fix patch database using better-sqlite3 2021-08-25 01:11:19 +08:00
Ponkhy 44d9fa63f0 Adjusted the output for A and AAAA records 2021-08-24 11:47:12 +02:00
LouisLam 14652c9b5f Remove unused variables 2021-08-24 15:46:22 +08:00
Ponkhy b2041cb36b Fixed ESLint Errors 2021-08-23 16:30:11 +02:00
LouisLam aa2233eb2d log notification error 2021-08-23 20:57:42 +08:00
Ponkhy e5981b10ce Replaced var with let and removed re-declaration 2021-08-23 13:08:22 +02:00
LouisLam 46cb955172 afterLogin change to non blocking 2021-08-23 18:52:55 +08:00
LouisLam 50f300dd28 heartbeat interval change to use setTimeout() 2021-08-23 18:52:24 +08:00
LouisLam 2f50fc4c00 plan to switch to better-sqlite3, drop node-sqlite3 2021-08-23 17:27:03 +08:00
Ponkhy c79be19ec3 Added DNS Monitor Type 2021-08-23 00:05:48 +02:00
LouisLam b892a92fc8 retry if acquire error 2021-08-22 23:35:24 +08:00
LouisLam ec0dbf3cbe probably still memory leak over time, not sure what happen, change back to singal pool. 2021-08-22 14:43:26 +08:00
LouisLam 210a0d414c fix check update interval too short 2021-08-22 14:07:56 +08:00
LouisLam 05680472a7 fix high memory usage 2021-08-22 02:07:10 +08:00
LouisLam ca3b0a0f19 fix setInterval 2021-08-22 00:39:29 +08:00
LouisLam 4571a9b8c1 check update 2021-08-21 19:50:22 +08:00
LouisLam 209e44c2e1 prevent all monitors making requests at the same moment when start the server 2021-08-19 18:41:31 +08:00
LouisLam 30b8d3d0ab prevent all monitors making requests at the same moment when start the server 2021-08-19 18:33:52 +08:00
LouisLam 7ffdb2eb80 also backup sqlite shm, val file 2021-08-19 17:49:19 +08:00
Ponkhy 64501bf065 Added Line Messenger Notification Service 2021-08-17 13:41:36 +02:00
LouisLam 440c178403 change sqlite to WAL mode 2021-08-17 18:18:41 +08:00
LouisLam 61e758d872 disable pool for sqlite, re-use a connection to improve the performance. 2021-08-17 15:59:23 +08:00
LouisLam 86826fb826 Merge remote-tracking branch 'origin/master' 2021-08-17 15:32:55 +08:00
LouisLam 7a32e5e6ff catch rejection error globally 2021-08-17 15:32:34 +08:00
AverageHumanoid 01e9c76a6f
Use ping in FreeBSD 2021-08-16 19:48:37 -07:00
LouisLam eed6d3e847 add more query log for dev env 2021-08-17 02:09:40 +08:00
LouisLam 31d5b4fd3d do not pass smtp user/pass to nodemailer if both are empty 2021-08-17 01:26:21 +08:00
LouisLam fc76c2836b increase the query timeout 2021-08-17 01:22:22 +08:00
Chris Taylor efe75bde75 Add Pushbullet notification service 2021-08-13 21:18:43 +01:00
Louis Lam af34e861c5
Merge pull request #200 from proffalken/feature/187_add_cert_checks_to_prometheus
Add certificate monitoring to the Prometheus handler
2021-08-13 00:26:58 +08:00
Louis Lam 2ae2022e62
Merge pull request #211 from AlexandreGagner/master
Add Octopush Notification Service
2021-08-13 00:26:35 +08:00
LouisLam d39b43dacc fix require problem 2021-08-13 00:13:46 +08:00
Alexandre Gagner eb34dc6cc2 Update notification.js
Fix remove non ascii char from msg
2021-08-12 00:58:51 +02:00
Alexandre Gagner ed93aae1c2 add octopush notification service 2021-08-12 00:15:53 +02:00
LouisLam 6a8ccf627a add version to user agent 2021-08-12 01:31:07 +08:00
LouisLam b14f63491d timeout change to 80% of its interval 2021-08-11 23:12:38 +08:00
LouisLam d5149f90b4 fix ping 2021-08-10 22:00:29 +08:00
LouisLam 3227a2660b log undefined ping 2021-08-10 21:47:14 +08:00
LouisLam 70e7945a66 fix possible race condition 2021-08-10 21:37:51 +08:00
LouisLam b413427a37 graceful shutdown when listen error 2021-08-10 21:28:54 +08:00
LouisLam debcac4924 run eslint 2021-08-10 14:24:05 +01:00
Matthew Macdonald-Wallace 268dd33792 Add TLS Info to Prometheus metric output 2021-08-10 14:24:05 +01:00
LouisLam 692a11e51e pass tls info to prometheus.update 2021-08-10 14:24:05 +01:00
Matthew Macdonald-Wallace 5eb4f55dfd Add the new gauges to the prometheus handler 2021-08-10 14:24:05 +01:00
LouisLam e7cc5340e5 ping ipv6 for macos 2021-08-10 21:07:11 +08:00
LouisLam 4d4d504d6e retry ping domain with ipv6, if domain is not found 2021-08-10 21:03:14 +08:00
LouisLam 2a4695a774 add -6 to ping cmd if ipv6 address 2021-08-10 20:39:58 +08:00
LouisLam f099e4270d change to Accept: */* to better support all websites 2021-08-10 20:23:15 +08:00
LouisLam d93f6e2716 server.listen bind to ipv6 too 2021-08-10 16:45:37 +08:00
LouisLam d6fad7f1ef server.listen bind to ipv6 too 2021-08-10 16:36:21 +08:00
LouisLam ba1d271afa fix jwt error 2021-08-09 20:09:01 +08:00
LouisLam b69185ee9e control search engine visibility 2021-08-09 18:16:27 +08:00
LouisLam 59ef1f13db set longer timeout for axios request 2021-08-09 13:54:24 +08:00
LouisLam d0aad3400c add reset password in cli 2021-08-09 13:34:44 +08:00
LouisLam f9cb8293f3 improve a bit ux 2021-08-09 01:58:56 +08:00
Adam Stachowicz 46c7e5d058 Save maxredirects on edit 2021-08-08 18:23:51 +02:00
Louis Lam 44391117ab
Merge pull request #173 from chakflying/redirects&status
Feat: Implement Max.Redirects & Accepted Status Codes
2021-08-08 21:19:20 +08:00
LouisLam 3265c3cbc3 improve multiselect 2021-08-08 21:03:10 +08:00
Nelson Chan 4ff68238c4
Chore: Improve logging during db development 2021-08-08 15:04:20 +08:00
LouisLam 7b1000d995 Merge remote-tracking branch 'chakflying/redirects&status' into redirects&status 2021-08-08 15:03:39 +08:00
LouisLam 3005585c0f Merge branch 'master' into redirects&status 2021-08-08 14:48:00 +08:00
Philipp Dormann 123fca43a1
FEAT: darkmode (#155)
* darkmode fixes

* fix: darkmode: empty beats in active/ hovered state

* fix: color for empty beats

* fix: navbar background color

* Update src/assets/vars.scss

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>

* Update src/assets/app.scss

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>

* wip, split dark theme style by .dark and store light theme to normal

* add back missing css

* working switch theme button and tuning dark theme

* finish dark theme

Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
Co-authored-by: LouisLam <louislam@users.noreply.github.com>
2021-08-08 13:47:29 +08:00
LouisLam d5b40dfebf better code reuse and "Username" to "Bot Display Name" 2021-08-08 11:03:22 +08:00
LouisLam c990edc87d allowElseIf for else return, since its auto fix removes "else" but without newline 2021-08-08 02:34:51 +08:00
LouisLam 2677f5dd87 run eslint for discord enhancement 2021-08-08 02:18:33 +08:00
Niyas ebf207c2f5
Custom embed username 2021-08-07 11:12:36 +05:30
Nelson Chan a50aa93e84 Fix: Fix monitor creation json parsing 2021-08-07 02:10:38 +08:00
Niyas 3a7414125a
Updated discord embeds 2021-08-06 17:37:22 +05:30
LouisLam adcd251076 Merge branch 'master' into redirects&status 2021-08-06 19:26:44 +08:00
LouisLam dadc270876 Merge branch 'master' into discord-enhancements 2021-08-06 19:13:43 +08:00
LouisLam a98ba41c8e minor 2021-08-06 19:12:49 +08:00
LouisLam a40816b948 fix high severity vulnerabilities by using my fork sqlite3 package 2021-08-06 19:09:00 +08:00
Niyas 9ade9af1e2
Discord enhancements 2021-08-05 21:41:11 +05:30
Nelson Chan 8f7885e58a Feat: Implement MaxRedirects & StatusCodes 2021-08-05 19:04:38 +08:00
LouisLam dffe3cf8f2 Revert "try to support subdirectory reverse proxy"
This reverts commit a03dd91e40.
2021-08-05 18:20:34 +08:00
LouisLam a03dd91e40 try to support subdirectory reverse proxy 2021-08-05 17:56:38 +08:00
LouisLam 38c0c170e7 add some comments 2021-08-04 13:31:17 +08:00
Nelson Chan 655536e457
Fix: use send() instead of end() (#161) 2021-08-04 11:56:10 +08:00
LouisLam d707eba046 fix disable auth 2021-08-04 01:03:40 +08:00
Philipp Dormann e34a8e2e4a
FEAT: PUSHY Notifier (#154)
FEAT: PUSHY Notifier (#154)
2021-08-03 23:14:27 +08:00
Louis Lam 6bd9d85a9a
Merge pull request #150 from chakflying/created_date
Fix: [DB] Add default for created_date in monitor
2021-08-03 22:58:56 +08:00
Nelson Chan 0c3c59df4e Fix: [DB] Add default for created_date in monitor 2021-08-03 17:42:57 +08:00
LouisLam 44c8ca9da8 requires empty username/password if set disableAuth for basic auth 2021-08-03 00:08:46 +08:00
LouisLam 6f868c9ec3 implement no auth 2021-07-31 23:41:24 +08:00
LouisLam 33d7f8645a json format for setting value 2021-07-31 22:02:30 +08:00
LouisLam c6a66fad79 add setting for disable auth 2021-07-31 21:57:58 +08:00
LouisLam 2ebd79d037 run eslint for lunasea change 2021-07-31 13:35:18 +08:00
Niyas 3f84e5e8ab
Update notification.js 2021-07-31 10:51:13 +05:30
Niyas ab1fe2e2d1
LunaSea Support 2021-07-31 10:33:20 +05:30
LouisLam 63f0a36811 implement upside down mode and ignore tls error 2021-07-31 00:01:04 +08:00
LouisLam 06377af7e5 turn off object-curly-newline, it makes const { a, b, c, d } = require(...) ugly 2021-07-30 22:11:14 +08:00
LouisLam 60aa67892d store ignoreTls and upsideDown into db 2021-07-30 19:18:26 +08:00
LouisLam e032072900 eslint: allow while (true) 2021-07-30 15:13:51 +08:00
Nelson Chan 47b19ea2f2 ESLint: fix file 2021-07-30 12:35:02 +08:00
LouisLam 5a053e5875 parse the port to int 2021-07-30 11:33:44 +08:00
LouisLam 081abcb6a1 add util.ts for sharing common functions between frontend and backend 2021-07-30 11:23:04 +08:00
LouisLam 063697c20a set the port by env.PORT, specific node version in package.json 2021-07-29 00:52:41 +08:00
LouisLam 7dbec90c95 cache index.html and fix basic auth applied to all routes 2021-07-28 23:40:50 +08:00
LouisLam 53a90347ca update database schema, add upside_down and ignore_tls 2021-07-28 23:26:27 +08:00
LouisLam 3666ebb931 change no-unused-vars from error to warn 2021-07-28 20:52:49 +08:00
LouisLam 6bce270f42 cleanup code 2021-07-28 20:35:55 +08:00
LouisLam 4a9690437f Merge branch 'eslint_stylelint'
# Conflicts:
#	server/server.js
2021-07-28 20:20:10 +08:00
Nelson Chan ac0f418294
Fix: passwordHash is not imported 2021-07-28 10:58:36 +08:00
Adam Stachowicz d97091af51 Missing this 2021-07-27 20:02:20 +02:00
Adam Stachowicz 4c8fdd07d9 Manual fixes 2021-07-27 19:53:59 +02:00
Adam Stachowicz 9648d700d7 Autofix on save 2021-07-27 19:47:13 +02:00
LouisLam 209fa83cff Add Basic Auth for /metrics 2021-07-28 00:52:31 +08:00
LouisLam 934b797623 Merge branch 'master' into feature/add_prometheus_metrics
# Conflicts:
#	server/model/monitor.js
2021-07-27 23:13:03 +08:00
LouisLam 2819094377 improve the page load performance 2021-07-26 23:26:47 +08:00
LouisLam 06c4523ce3 update the latest db version to 3 2021-07-26 23:05:04 +08:00
LouisLam caec933186 prevent unexpected error throw from checkCertificate interrupt the beat 2021-07-26 12:25:44 +08:00
Nelson Chan 51ac7a58dc Fix: Fix incorrect error handling 2021-07-26 12:24:13 +08:00
Nelson Chan db26b7d123 Fix: Fix no certificate caused by session reuse 2021-07-26 12:24:13 +08:00
Nelson Chan 7b8459c73a Fix: use Optional chaining 2021-07-26 12:24:12 +08:00
Nelson Chan d0c63ebe3e Feat: Add database storage for TLS info 2021-07-26 12:24:12 +08:00
Nelson Chan 803f0d6219 Feat: Add Barebones certificate info display 2021-07-26 12:24:06 +08:00
LouisLam d556509d07 戈mprove the readibility of important condition 2021-07-24 11:42:14 +08:00
Louis Lam 0dbecca10f
Merge pull request #102 from NiNiyas/pushover-enhancements
Pushover enhancements
2021-07-23 12:32:36 +08:00
Sam 1d4d7fa9c4 fix parenthesis mistake 2021-07-22 20:25:03 +02:00
Matthew Macdonald-Wallace 3a8fbff514 Change casing in README, apply DRY to label values 2021-07-22 16:00:56 +01:00
Matthew Macdonald-Wallace 3b45006567 Move common labels into dedicated const 2021-07-22 14:58:22 +01:00
Niyas b7a32d4ab6
Pushover enhancements 2021-07-22 19:26:54 +05:30
Matthew Macdonald-Wallace 720051a351 Typo in monitor status name 2021-07-22 11:18:20 +01:00
LouisLam 86e18ac11d Merge branch 'master' into Spiritreader_master
# Conflicts:
#	src/pages/EditMonitor.vue
2021-07-22 17:34:41 +08:00
Matthew Macdonald-Wallace 3dcbae0889 Add labels to metrics for querying 2021-07-22 10:21:20 +01:00
Matthew Macdonald-Wallace 96242dce0d Expose check status and response time to Prometheus 2021-07-22 09:38:27 +01:00
Matthew Macdonald-Wallace 582fb2fe29 Export general metrics via the /metrics endpoint 2021-07-22 08:43:04 +01:00
Matthew Macdonald-Wallace e3d4a896b1 Fix up some formatting 2021-07-22 08:33:21 +01:00
Matthew Macdonald-Wallace 9a1bf6006a Add initial package import and config 2021-07-22 08:24:25 +01:00
LouisLam 03b3bb5b30 fix if notification throw exception, the heartbeat is not stored in to the db. 2021-07-22 12:28:47 +08:00
LouisLam 7e4a1ad279 remove used vars 2021-07-22 11:15:53 +08:00
LouisLam 916b9da0dc Merge branch 'master' into something
# Conflicts:
#	server/notification.js
#	src/components/NotificationDialog.vue
2021-07-22 11:12:52 +08:00
LouisLam e02eb72863 add db migration 2021-07-22 02:02:35 +08:00
Adam Stachowicz c4ca8e2acb More info in server logs 2021-07-21 00:41:38 +02:00
Sam 054269ecf0 fix notification when changing from pending -> up 2021-07-20 11:50:33 +02:00
Sam 02230930c5 Merge branch 'master' of https://github.com/Spiritreader/uptime-kuma 2021-07-19 18:26:00 +02:00
Sam a8b102ad4a add retries for pinging function
backend:
- new field for monitor: maxretries
- new pending status while service is retrying: 2
- pending status event is not marked important
- pending pings however register as downtime in the calculation

frontend:
- added pending status while service is retrying
- added color for new pending status
- added field to configure amount of retries

database:
- IMPORTANT: THIS REQUIRES MIGRATION!!!!
- added field: maxretries with default value 0
2021-07-19 18:23:06 +02:00
Adam Stachowicz 7cba9ce231 Remove debug spam 2021-07-18 18:35:40 +02:00
LouisLam 9ca2444dab improve testing notification response 2021-07-18 20:49:46 +08:00
LouisLam 66037e236c add apprise support 2021-07-18 18:51:58 +08:00
Adam Stachowicz 7c94c3b502
Update server/notification.js 2021-07-18 09:42:34 +00:00
Adam Stachowicz 268c8e50f5
Merge branch 'master' into something 2021-07-18 09:42:08 +00:00
Louis Lam 13b3a5be9c
Merge pull request #68 from Saibamen/use_console_error
Improve printing to console
2021-07-18 14:55:30 +08:00
Louis Lam 6f3ea21864
Merge pull request #61 from NiNiyas/slack-enhancements
Slack Enhancements and aligns footer to center
2021-07-18 13:47:04 +08:00
Adam Stachowicz d94894b7e0 Fix require-v-for-key, remove unused declarations and double spaces 2021-07-18 03:10:15 +02:00
Adam Stachowicz 2bff62cade Improve printing to console 2021-07-17 23:13:54 +02:00
Niyas 01f2fccb23
Update notification.js 2021-07-17 18:59:26 +05:30
Niyas ce2d78f45a
Pushover support 2021-07-17 17:55:02 +05:30
Niyas 1935da5b16
Slack Enhancements 2021-07-17 12:47:52 +05:30
LouisLam dfa9b3a0ca fix require() actually not working after build in the frontend 2021-07-17 00:51:28 +08:00
LouisLam b3bff8d735 add graceful shutdown 2021-07-16 01:44:51 +08:00
Louis Lam f2af5bc064
Merge pull request #46 from NiNiyas/slack-webhook
Added Slack webhook notification
2021-07-15 11:59:41 +08:00
Philipp Dormann 53e203d2f9
add gotify priority
ref https://github.com/louislam/uptime-kuma/pull/43
closes https://github.com/louislam/uptime-kuma/issues/50
2021-07-14 21:56:38 +02:00
Niyas 60493f0f86
Updated Slack test notification 2021-07-14 21:59:16 +05:30
Niyas 5f6d5588a6
Added Slack Webhook support 2021-07-14 21:07:14 +05:30
Philipp Dormann 126f00e739
added Gotify Support 2021-07-14 11:25:10 +02:00
LouisLam d4fe5908f5 fix merging problem 2021-07-13 23:29:40 +08:00
LouisLam 5a6e83b777 remove debug msg 2021-07-13 23:05:52 +08:00
LouisLam 9c23cd09ce use bcrypt for password hash 2021-07-13 22:22:46 +08:00
LouisLam 010ebea210 show version in the footer 2021-07-13 18:08:12 +08:00
LouisLam 3e4a98b6bc Merge branch 'dev'
# Conflicts:
#	server/notification.js
2021-07-13 11:42:51 +08:00
LouisLam 0f1a95fde9 smtp without username password 2021-07-13 11:01:02 +08:00
jacr13 c6237277c0 add support for signal notifications 2021-07-12 22:06:03 +02:00
TheGuyDanish 613c42b6d8 Discord revamp! Changed from bot to webhook, removed discord.js dep 2021-07-12 14:13:36 +01:00
LouisLam 0176857a2c add ability to change the listening port and hostname 2021-07-12 18:33:25 +08:00
LouisLam a9d19ae06a support json for keyword type 2021-07-12 10:52:41 +08:00
TheGuyDanish f84f7aca75
Introduce custom user agent. Fixes #5
Quick and easy fix. Could be improved by adding a version number as well. Like `Uptime-Kuma/0.0.1`, for example.
2021-07-11 21:01:34 +01:00
LouisLam d357dcb334 fix first beat's uptime is 0% 2021-07-11 20:07:03 +08:00
LouisLam 5f89940ab6 add setup page 2021-07-11 13:47:57 +08:00
LouisLam 86492f6dad remove some debug msg 2021-07-10 12:04:40 +08:00
LouisLam 44bcd78f9a implement discord 2021-07-10 11:38:00 +08:00
LouisLam ff4259380e do not send notification if first beat is UP 2021-07-10 01:15:21 +08:00
LouisLam 072e86542a implement smtp 2021-07-10 01:08:08 +08:00
LouisLam 0ad04d1468 implement webhook 2021-07-09 19:33:22 +08:00