Justin Tisdale
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2022-08-11 21:04:11 -04:00
Justin Tisdale
2b9bf095a6
Add non-json support for http body
2022-08-11 20:57:03 -04:00
Louis Lam
3b3763351b
Merge remote-tracking branch 'origin/master' into radius-check
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
# src/pages/EditMonitor.vue
2022-08-11 21:08:06 +08:00
Louis Lam
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07:00
Joseph Benguira
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
Joseph Benguira
71d62ee151
removed ; after the PRAGMA command
2022-07-31 19:00:19 +03:00
Joseph Benguira
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2022-07-31 18:59:02 +03:00
Joseph Benguira
f016caa513
Avoid error "SQLITE_BUSY: database is locked"
...
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2022-07-31 18:51:53 +03:00
Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
Matthew Nickson
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-14 08:32:51 +01:00
Louis Lam
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
Louis Lam
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2022-06-28 22:11:59 +08:00
Matthew Nickson
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2022-06-18 23:53:35 +01:00
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2022-06-15 16:19:47 +02:00
Moritz R
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
Louis Lam
6682839ec8
Merge remote-tracking branch 'origin/master' into ntml-auth
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# server/util-server.js
2022-06-14 10:36:29 +08:00
Matthew Nickson
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-11 17:23:12 +01:00
Moritz R
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
Christopher Pickering
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
Christopher Pickering
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
Sascha Kruse
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
OidaTiftla
93050208bb
Merge database changes into single patch file
2022-05-05 16:01:19 +02:00
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
Karel Krýda
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
2022-04-30 13:40:34 +02:00
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
Adam Stachowicz
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
Matthew Nickson
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:15:39 +01:00
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2022-04-21 13:01:22 +01:00
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-20 19:56:40 +01:00
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
Louis Lam
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
Louis Lam
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
2022-04-12 16:32:14 +08:00
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
Louis Lam
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
2022-04-08 00:56:56 +08:00
Louis Lam
fee88b32e3
Set PRAGMA synchronous = FULL
2022-04-06 20:48:13 +08:00
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
Moritz R
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
Louis Lam
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
2022-04-01 14:57:35 +08:00
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
2022-03-27 21:19:57 +02:00
Louis Lam
28d72fcd08
Fix #1409 , slug cannot be empty
2022-03-24 23:43:07 +08:00
Louis Lam
8d981c8f0b
[Status Page] Fix migration and unpin incident
2022-03-18 14:14:22 +08:00
Louis Lam
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
2022-03-16 15:38:10 +08:00
Louis Lam
18ec42b060
[Status Page] wip
2022-03-16 14:14:47 +08:00
Louis Lam
7c7dbf68c1
[Status Page] wip, sidebar for editor
2022-03-15 12:00:29 +08:00
Louis Lam
72ce28a541
Migrate status page table
2022-03-08 14:33:35 +08:00
Uğur Erkan
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
2022-03-06 19:34:49 +03:00
OidaTiftla
f390a8caf1
Fix missing DB patch and use DATETIME as column format
2022-01-24 21:59:25 +01:00
OidaTiftla
f931e709e6
Add database patch
2022-01-24 09:18:12 +01:00
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
2022-01-23 15:22:00 +01:00
c0derMo
4818bb67d6
Added trailing comma, fixed spelling & translation
2022-01-14 09:09:37 +00:00
c0derMo
b0259b5592
Added docker container monitor
2022-01-13 16:17:07 +00:00
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +08:00
Louis Lam
72a59ce7a4
add status page table
2021-12-27 18:54:48 +08:00
Juan Cruz Vincenti
934d633d4d
Add description to monitor
...
* Add description to monitor model
* Add description field to database
* Add english and spanish translation for description
* Closes : #482
2021-12-14 19:11:32 -03:00
Andreas Brett
a13bdaac84
Merge branch 'master' into logging
2021-11-29 20:32:42 +01:00
Louis Lam
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
2021-11-23 22:48:54 +08:00
Nelson Chan
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
2021-11-17 10:45:19 +08:00
Andreas Brett
e5913c5abc
separate log functions
2021-11-15 17:52:28 +01:00
Andreas Brett
bdcdf47e52
introduce consistent logging
2021-11-11 12:31:28 +01: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ć
665c263c03
Add db migrations for new basic auth fields
2021-11-04 09:50:10 +01:00
Tarun Singh
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
Louis Lam
44c1b336dc
send certificate notifications in 21, 14, 7 days
2021-10-27 15:33:15 +08:00
Louis Lam
a9e319517a
add auto vacuum and shrink database button
2021-10-26 23:02:32 +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
Andreas Brett
acc2995d86
invalidate used token
2021-10-19 00:42:33 +02: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
20d59e5a13
fix and move the steam api key to settings page
2021-10-18 17:02:05 +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
NeuralMiner
8cb26d2b31
Text update
2021-10-15 19:12:09 -06: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
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
Denis Freund
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
Nelson Chan
32c9dfbb31
Fix: clear important beats after deleteMonitor
2021-09-23 23:21:08 +08:00
LouisLam
15c00d9158
upload logo and expose ./data/upload to url
2021-09-21 21:22:35 +08:00
LouisLam
469e8f6fd6
Merge branch 'master' into public-dashboard
...
# Conflicts:
# package-lock.json
2021-09-21 17:05:13 +08:00
LouisLam
4591adc05e
second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
2021-09-21 01:15:20 +08:00
LouisLam
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
2021-09-20 18:48:44 +08:00
LouisLam
b0e9c5bcb4
fix reset-password ( #448 )
2021-09-20 16:29:18 +08:00
LouisLam
fd95d41d9f
[status page] many update and save group list
2021-09-19 19:04:51 +08:00
LouisLam
2955abb5d9
[status page] create incident
2021-09-16 22:48:28 +08:00
LouisLam
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
2021-09-16 16:53:54 +08: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
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
2021-09-14 15:05:04 +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
2617e1f4d8
Update database.js
2021-09-13 00:25:18 +02:00
No0Vad
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
2021-09-13 00:19:51 +02:00
LouisLam
e205adfd7b
[status page] developing
2021-09-13 02:26:45 +08: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
No0Vad
389d247463
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 17:05:23 +02: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
295ccba44b
Adjusted for new db patch management
2021-09-11 16:37:33 +02:00
LouisLam
08de0090dc
add a better approach for patching db, change setting.value from varchar to TEXT, restore Database.close() to 1.2.0
2021-09-10 17:23:45 +08:00
LouisLam
9f9c1007d7
increase sqlite cache size from 2MB to 12MB
2021-09-09 11:56:42 +08:00
Ponkhy
58240aceef
Added the option for default notifications
2021-09-05 23:23:06 +02: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
c74986647e
allow changing data dir
2021-09-02 20:27:18 +08: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
LouisLam
ada6606217
move the new sql to patch8.sql
2021-08-29 11:16:06 +08:00
LouisLam
46ac753c46
Merge branch 'master' into dns-monitor
2021-08-26 01:05:46 +08:00
LouisLam
f96d792fa1
fix patch database using better-sqlite3
2021-08-25 01:11:19 +08:00
LouisLam
14652c9b5f
Remove unused variables
2021-08-24 15:46:22 +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
05680472a7
fix high memory usage
2021-08-22 02:07:10 +08:00
LouisLam
7ffdb2eb80
also backup sqlite shm, val file
2021-08-19 17:49:19 +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
eed6d3e847
add more query log for dev env
2021-08-17 02:09:40 +08:00
LouisLam
fc76c2836b
increase the query timeout
2021-08-17 01:22:22 +08:00
LouisLam
d0aad3400c
add reset password in cli
2021-08-09 13:34:44 +08: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
Nelson Chan
4ff68238c4
Chore: Improve logging during db development
2021-08-08 15:04:20 +08:00
LouisLam
adcd251076
Merge branch 'master' into redirects&status
2021-08-06 19:26:44 +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
Nelson Chan
8f7885e58a
Feat: Implement MaxRedirects & StatusCodes
2021-08-05 19:04:38 +08:00
Nelson Chan
0c3c59df4e
Fix: [DB] Add default for created_date in monitor
2021-08-03 17:42:57 +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
081abcb6a1
add util.ts for sharing common functions between frontend and backend
2021-07-30 11:23:04 +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
06c4523ce3
update the latest db version to 3
2021-07-26 23:05:04 +08:00
Nelson Chan
96c60dd94a
Feat: Add database storage for TLS info
2021-07-22 16:04:32 +08:00
LouisLam
e02eb72863
add db migration
2021-07-22 02:02:35 +08:00
