Calum Bird
f55350bebc
Generated documentation :)
2021-11-09 21:24:31 -08:00
Ivan Bratović
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
Ivan Bratović
23736549f9
Implement HTTP basic auth feature
2021-11-04 09:50:10 +01:00
Louis Lam
c094dc0c5b
speed up redirect by using 302 redirect instead of vue redirect
2021-11-02 21:48:46 +08:00
Louis
ba93129b18
Merge branch '1.9.X'
...
# Conflicts:
# server/server.js
2021-10-30 10:05:08 +08:00
Louis
caa2a34177
fix 2fa not working #833
2021-10-30 02:35:05 +08:00
Louis
d7f7dba13f
write some error logs to ./data/error.log
2021-10-29 18:24:47 +08:00
Louis Lam
a9e319517a
add auto vacuum and shrink database button
2021-10-26 23:02:32 +08:00
Nelson Chan
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
2021-10-24 01:44:55 +08:00
Nelson Chan
b83c59e308
WIP: Add options for chart period
...
Fix: Fix callback, add toast on error
Fix: Improve styling
Fix: Restore default chart behavior
Fix: Replace 1h with 3h
draft only
2021-10-24 01:44:08 +08:00
Louis Lam
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
2021-10-23 17:00:46 +08:00
Louis Lam
b77b33e790
add login rate limiter
2021-10-23 16:35:13 +08:00
Louis Lam
56094a43d7
add passwordStrength
2021-10-21 22:54:04 +08:00
Louis Lam
cd04ac4557
"dist/index.html" is no longer needed for development environment
2021-10-20 01:32:19 +08:00
Louis Lam
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
...
Text update
2021-10-19 16:34:00 +08:00
Louis Lam
6c1ee70e15
fix
2021-10-19 16:29:09 +08:00
Louis Lam
5c3892313e
add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN
2021-10-19 14:41:05 +08:00
Louis Lam
c57c94642c
Merge remote-tracking branch 'origin/master'
2021-10-19 14:26:26 +08:00
Louis Lam
62f168a2a5
config response header
2021-10-19 14:26:10 +08:00
Andreas Brett
acc2995d86
invalidate used token
2021-10-19 00:42:33 +02:00
NeuralMiner
9ddffc0f7f
Updates
2021-10-18 14:35:47 -06:00
NeuralMiner
76e7c8b276
Rebase
2021-10-18 14:35:36 -06:00
NeuralMiner
572a5300aa
Recommended updates.
2021-10-18 13:25:53 -06:00
NeuralMiner
e1f1d4a959
Merge branch 'louislam:master' into textchanges
2021-10-18 12:57:28 -06:00
Louis Lam
23714ab688
genSecret don't need await
2021-10-18 17:37:11 +08:00
Louis Lam
6e18f39eb4
[steam] code cleanup
2021-10-18 17:15:28 +08:00
Louis Lam
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
2021-10-18 15:50:35 +08:00
Louis Lam
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
2021-10-16 15:06:59 +08:00
Louis Lam
6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2
...
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
2021-10-16 14:30:25 +08:00
NeuralMiner
8cb26d2b31
Text update
2021-10-15 19:12:09 -06:00
Louis Lam
7276f34d90
fix reset-password
2021-10-16 00:57:26 +08:00
Louis Lam
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-15 16:07:05 +08:00
Louis Lam
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
2021-10-14 14:09:16 +08:00
giacomo892
3fe3450533
Prioritize port passed from args
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-13 08:29:55 +02:00
giacomo892
d733ec018e
Prioritize host arg
...
Otherwise launching the program with the --host argument does nothing
2021-10-12 19:37:58 +02:00
Andreas Brett
2538bd04ce
notp verification defaults
2021-10-11 20:18:40 +02:00
Andreas Brett
e223e826a3
linting
2021-10-11 01:02:54 +02:00
Andreas Brett
b5b391c73b
avoid default values for token verification
...
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640 )
2021-10-10 22:13:18 +02:00
Bert Verhelst
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
2021-10-10 18:40:53 +02:00
LouisLam
82131f4dd2
merge conflict
2021-10-10 13:09:30 +08:00
LouisLam
56ae6f6117
fix demoMode export
2021-10-10 02:36:20 +08:00
LouisLam
5c89562650
not allow lower than 20s for demo mode
2021-10-10 02:23:27 +08:00
Nelson Chan
656a4d6270
WIP: Enable background jobs
...
WIP: Remove better-sqlite3
2021-10-09 21:46:59 +08:00
Bert Verhelst
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-09 12:35:08 +02:00
LouisLam
23a2d33f8c
[backup] restore pushToken
2021-10-09 17:45:05 +08:00
Bert Verhelst
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-09 11:13:16 +02:00
LouisLam
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
2021-10-08 20:03:52 +08:00
Bert Verhelst
162ef04c41
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-06 21:56:28 +02:00
LouisLam
49720c709c
improve the test with a single command only "npm test"
2021-10-05 19:13:57 +08:00
Bert Verhelst
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
2021-10-02 16:48:27 +02:00
LouisLam
b246c8e0f2
Fix 2fa for iOS Google authenticator ( #486 )
2021-10-01 00:23:18 +08:00
LouisLam
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
Louis Lam
fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor
...
Fix: clear important beats after deleteMonitor
2021-09-29 15:39:57 +08:00
Denis Freund
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
LouisLam
0afa3a2c21
Merge branch '1.6.X'
...
# Conflicts:
# server/database.js
# server/server.js
2021-09-24 19:12:57 +08:00
Nelson Chan
662c97dcde
Fix: Fix importing tag if tag doesn't exist
2021-09-24 14:34:53 +08:00
Ponkhy
7fb55b8875
Fixed issues
2021-09-23 17:31:01 +02:00
Nelson Chan
32c9dfbb31
Fix: clear important beats after deleteMonitor
2021-09-23 23:21:08 +08:00
Ponkhy
d3d4363031
Used compare-version instead of replace
2021-09-23 17:15:11 +02:00
LouisLam
23a63213aa
Merge branch 'master' into import-export
...
# Conflicts:
# server/server.js
2021-09-23 17:20:13 +08:00
LouisLam
15c00d9158
upload logo and expose ./data/upload to url
2021-09-21 21:22:35 +08:00
LouisLam
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
2021-09-20 18:48:44 +08:00
LouisLam
34c0fa59a8
fix reset-password ( #448 )
...
(cherry picked from commit b0e9c5bcb4
)
2021-09-20 16:33:22 +08:00
LouisLam
b0e9c5bcb4
fix reset-password ( #448 )
2021-09-20 16:29:18 +08:00
Ponkhy
1b5e723f60
Added descriptions to uploadBackup function
2021-09-17 03:25:18 +02:00
Ponkhy
4bdada36a9
Removed if includes version
2021-09-16 20:18:31 +02:00
LouisLam
2955abb5d9
[status page] create incident
2021-09-16 22:48:28 +08:00
Ponkhy
8b463e70df
Apply suggestions from @Saibamen
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-16 12:29:33 +02:00
LouisLam
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
2021-09-16 16:53:54 +08:00
Ponkhy
54aa68ec58
Added import/export compatibility for version 1.7
2021-09-15 22:07:28 +02:00
Louis Lam
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
2021-09-16 00:21:53 +08:00
LouisLam
80322cbfe7
Merge branch 'import-export'
...
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
2021-09-16 00:18:07 +08:00
LouisLam
7e0272077b
cleanup demo mode code
2021-09-16 00:13:28 +08:00
LouisLam
512ff09cca
set entry page
2021-09-15 20:40:26 +08:00
LouisLam
1d6670ed9a
Merge branch 'master' into public-dashboard
2021-09-14 23:29:22 +08:00
LouisLam
3234aec5b3
NODE_ENV if not set, change to production
2021-09-14 23:28:38 +08:00
LouisLam
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
2021-09-14 15:05:04 +08:00
Louis Lam
069c811af8
Merge pull request #278 from chakflying/tags
...
Monitor: Tags with metadata
2021-09-14 14:57:53 +08:00
LouisLam
f9311e4e7f
[status page]
2021-09-14 14:55:45 +08:00
LouisLam
d7a230ac15
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
# src/main.js
2021-09-14 14:16:24 +08:00
LouisLam
97360dab26
add /.well-known/change-password
2021-09-14 12:10:25 +08:00
Nelson Chan
a0e4e96160
Fix: Fix tag removal, reuse and validation
2021-09-13 14:12:17 +08:00
Nelson Chan
6e3a904aaa
WIP: Add tags functionality
...
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
2021-09-13 14:12:11 +08:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
2021-09-13 00:19:51 +02:00
LouisLam
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
2021-09-13 01:09:01 +08:00
Ponkhy
d313966d80
Merge branch 'master' into import-export
2021-09-12 18:46:11 +02:00
Ponkhy
7fee4a7ea7
Added import options
2021-09-11 21:53:17 +02:00
LouisLam
c4f78d776e
[2fa] "UptimeKuma" to "Uptime Kuma"
2021-09-12 02:25:51 +08:00
No0Vad
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
LouisLam
934685637a
[Status Page] WIP: Checkpoint
2021-09-11 23:43:07 +08:00
Ponkhy
f6d1a82989
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:19 +02:00
Ponkhy
651b525d06
Update server/server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-11 14:34:12 +02:00
LouisLam
3e25f0e9d9
[Status Page] WIP: Checkpoint
2021-09-11 19:40:03 +08:00
Ponkhy
59cccf8c50
Fixed typo
2021-09-09 21:12:29 +02:00
Ponkhy
403202d4d4
Added simple TOTP Two Factor Authentication
2021-09-09 21:10:31 +02:00
LouisLam
573c7faddd
switch on the notification, if it is added in EditMonitor.vue
2021-09-09 21:24:29 +08:00
Ponkhy
1ef4562905
Paused monitors stay paused after import
2021-09-07 23:32:25 +02:00
LouisLam
62712f5cc4
Merge branch 'master' into import-export
2021-09-08 00:18:43 +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
LouisLam
299506ce45
reset the heartbeat list instead of reload the page after cleared events or heartbeats
2021-09-05 02:03:40 +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
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
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
2f6c5963c5
Added import and export function
2021-09-01 17:09:32 +02:00
Ponkhy
7b92166d18
Added clear all db statistics function
2021-09-01 00:36:24 +02:00
Ponkhy
1952e34110
Added the possibility to clear monitor data
2021-08-29 18:47:01 +02:00
LouisLam
46ac753c46
Merge branch 'master' into dns-monitor
2021-08-26 01:05:46 +08:00
LouisLam
397fd12081
remove unused import
2021-08-25 01:26:10 +08:00
LouisLam
46cb955172
afterLogin change to non blocking
2021-08-23 18:52:55 +08:00
Ponkhy
c79be19ec3
Added DNS Monitor Type
2021-08-23 00:05:48 +02: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
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
7a32e5e6ff
catch rejection error globally
2021-08-17 15:32:34 +08:00
LouisLam
eed6d3e847
add more query log for dev env
2021-08-17 02:09:40 +08:00
LouisLam
d5149f90b4
fix ping
2021-08-10 22:00:29 +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
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
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
LouisLam
3265c3cbc3
improve multiselect
2021-08-08 21:03:10 +08:00
Nelson Chan
a50aa93e84
Fix: Fix monitor creation json parsing
2021-08-07 02:10:38 +08:00
LouisLam
adcd251076
Merge branch 'master' into redirects&status
2021-08-06 19:26:44 +08:00
LouisLam
a40816b948
fix high severity vulnerabilities by using my fork sqlite3 package
2021-08-06 19:09:00 +08:00
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
LouisLam
6f868c9ec3
implement no auth
2021-07-31 23:41:24 +08:00
LouisLam
c6a66fad79
add setting for disable auth
2021-07-31 21:57:58 +08:00
LouisLam
60aa67892d
store ignoreTls and upsideDown into db
2021-07-30 19:18:26 +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
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
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
86e18ac11d
Merge branch 'master' into Spiritreader_master
...
# Conflicts:
# src/pages/EditMonitor.vue
2021-07-22 17:34:41 +08: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
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
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
268c8e50f5
Merge branch 'master' into something
2021-07-18 09:42:08 +00: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
LouisLam
b3bff8d735
add graceful shutdown
2021-07-16 01:44:51 +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
0176857a2c
add ability to change the listening port and hostname
2021-07-12 18:33:25 +08:00
LouisLam
5f89940ab6
add setup page
2021-07-11 13:47:57 +08:00
LouisLam
0ad04d1468
implement webhook
2021-07-09 19:33:22 +08:00
LouisLam
d24a15410e
send notification for important heartbeat
2021-07-09 17:55:48 +08:00
LouisLam
3bdf174e90
add telegram notification
2021-07-09 14:14:03 +08:00
LouisLam
04ec91d7a9
improve uptime calculation
2021-07-06 14:30:10 +08:00
LouisLam
55bd6b6d7a
implement timezone
2021-07-01 21:47:14 +08:00
LouisLam
1d64f643b1
implement keyword monitor
2021-07-01 17:19:28 +08:00
LouisLam
9c653c3d05
implement tcping
2021-07-01 14:03:06 +08:00
LouisLam
84c21b71c0
implement uptime
2021-07-01 13:11:16 +08:00
LouisLam
46f07fc17e
many update again
2021-06-30 21:04:58 +08:00
Louis
9fa84a0a2b
many update
2021-06-29 16:06:20 +08:00
LouisLam
d02401b1c2
many update
2021-06-27 16:10:55 +08:00
LouisLam
497d63ef7d
implementing heartbeat bar
2021-06-26 03:03:06 +08:00
LouisLam
0a4fb45a8c
init
2021-06-25 21:55:49 +08:00