LouisLam
62712f5cc4
Merge branch 'master' into import-export
2021-09-08 00:18:43 +08:00
LouisLam
0aeaf87f5b
Merge branch 'master' into default-notification
...
# Conflicts:
# server/notification.js
# src/components/NotificationDialog.vue
2021-09-07 23:40:42 +08:00
LouisLam
da74391c3e
convert notifications into modules
2021-09-07 22:42:46 +08:00
Ponkhy
242e494cb5
Merge branch 'master' into import-export
2021-09-07 14:12:53 +02:00
Ponkhy
4faa409027
Merge branch 'master' into default-notification
2021-09-07 14:07:50 +02:00
LouisLam
da131a5156
Merge branch 'master' into clear-monitor-data
...
# Conflicts:
# src/languages/da-DK.js
# src/languages/en.js
# src/languages/es-ES.js
# src/languages/fr-FR.js
# src/languages/ja.js
# src/languages/ko-KR.js
# src/languages/nl-NL.js
# src/languages/ru-RU.js
# src/languages/sr-latn.js
# src/languages/sr.js
# src/languages/sv-SE.js
# src/languages/zh-CN.js
# src/languages/zh-HK.js
2021-09-07 17:36:37 +08:00
Ponkhy
fd8c95d64e
Merge branch 'master' into default-notification
2021-09-05 23:32:31 +02:00
Ponkhy
58240aceef
Added the option for default notifications
2021-09-05 23:23:06 +02:00
Louis Lam
f9c177b150
Merge pull request #315 from tgxn/patch-1
...
Notifications Content Improvements: SMTP, LunaSea, PushBullet
2021-09-05 11:52:50 +08:00
LouisLam
299506ce45
reset the heartbeat list instead of reload the page after cleared events or heartbeats
2021-09-05 02:03:40 +08:00
Domenic Horner
41d32bb9dd
Undo parm changes
2021-09-04 20:08:18 +08:00
Domenic Horner
b0acda52f9
Add time to smtp body content
2021-09-04 11:27:18 +08:00
Domenic Horner
e9cd9be03a
Use constants for UP/DOWN through notifications class
2021-09-04 11:09:34 +08:00
Domenic Horner
6ae279c7f3
Move title generation to notification class
2021-09-04 11:06:06 +08:00
Domenic Horner
9c32adfb55
Update pushbullet down body
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:26:44 +08:00
Domenic Horner
d346afd33b
Update pushbullet up body
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:26:38 +08:00
Domenic Horner
3bf380c684
Update lunasea "up" body content
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:26:10 +08:00
Domenic Horner
dca5c59982
Update lunasea body content
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-04 18:24:43 +08:00
Ponkhy
8f9a973ede
Merge branch 'master' into import-export
2021-09-04 01:26:48 +02:00
LouisLam
ebf362754c
Merge branch 'master' into clear-monitor-data
2021-09-03 14:56:43 +08:00
LouisLam
e31be8caf5
demo mode
2021-09-02 22:52:20 +08:00
LouisLam
60f2f08cea
add demo db
2021-09-02 22:39:04 +08:00
LouisLam
b1647a310e
add demo db
2021-09-02 22:37:51 +08:00
Ponkhy
7d70c4d8cd
Code optimizations
2021-09-02 16:13:31 +02:00
Domenic Horner
532ad3044c
Add space to pushbullet and lunasea notifications
...
Start changes regarding standardization of notification messages
2021-09-02 21:55:25 +08:00
LouisLam
f23ecef636
add missing cert parameters
2021-09-02 21:16:04 +08:00
LouisLam
51cf2ff6f9
add missing cert parameters
2021-09-02 21:13:59 +08:00
LouisLam
b30b1d3a52
create data dir before copy
2021-09-02 21:11:20 +08:00
LouisLam
582e14098d
create data dir before copy
2021-09-02 21:10:18 +08:00
LouisLam
6e3e2fc85c
fix db path
2021-09-02 21:08:00 +08:00
LouisLam
b604807cfe
create data dir if not exists
2021-09-02 20:42:55 +08:00
LouisLam
3ee13bddd1
dash style for args
2021-09-02 20:36:52 +08:00
LouisLam
c74986647e
allow changing data dir
2021-09-02 20:27:18 +08:00
LouisLam
b88b357b55
add support for https
2021-09-02 20:18:27 +08:00
Ponkhy
2dd392e609
Added uptime kuma version to backup file
2021-09-02 10:15:25 +02:00
Ponkhy
c13cc62d3d
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-01 21:32:33 +02:00
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
