4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
39b6725163
Update maintenance tables
2 years ago
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2 years ago
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
6bb79597e8
fix: resolve merge conflict
2 years ago
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
2b9bf095a6
Add non-json support for http body
2 years ago
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
2 years ago
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2 years ago
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
71d62ee151
removed ; after the PRAGMA command
2 years ago
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2 years ago
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
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
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>
2 years ago
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2 years ago
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
ac449ec1c2
Merge branch 'master' into master
2 years ago
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
2 years ago
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>
2 years ago
a9f3142cee
Merge branch 'master' into master
3 years ago
ef73af391f
added option for ntlm authorization
3 years ago
87f933df4f
added sqlserver monitor
3 years ago
398ecb7666
add radius check
3 years ago
93050208bb
Merge database changes into single patch file
3 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
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
3 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
1e595eaa76
Update linters
3 years ago
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
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
3 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
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
3 years ago
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
3 years ago
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
3 years ago
fee88b32e3
Set PRAGMA synchronous = FULL
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
af44b0beab
Merge branch 'master' into master
3 years ago
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
3 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
28d72fcd08
Fix #1409 , slug cannot be empty
3 years ago
8d981c8f0b
[Status Page] Fix migration and unpin incident
3 years ago
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
18ec42b060
[Status Page] wip
3 years ago
7c7dbf68c1
[Status Page] wip, sidebar for editor
3 years ago
72ce28a541
Migrate status page table
3 years ago
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
3 years ago
f390a8caf1
Fix missing DB patch and use DATETIME as column format
3 years ago
f931e709e6
Add database patch
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
4818bb67d6
Added trailing comma, fixed spelling & translation
3 years ago
b0259b5592
Added docker container monitor
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
72a59ce7a4
add status page table
3 years ago
934d633d4d
Add description to monitor
...
* Add description to monitor model
* Add description field to database
* Add english and spanish translation for description
* Closes : #482
3 years ago
a13bdaac84
Merge branch 'master' into logging
3 years ago
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
3 years ago
e5913c5abc
separate log functions
3 years ago
bdcdf47e52
introduce consistent logging
3 years ago
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
665c263c03
Add db migrations for new basic auth fields
3 years ago
670754b697
added MQTT monitor type
3 years ago
44c1b336dc
send certificate notifications in 21, 14, 7 days
3 years ago
a9e319517a
add auto vacuum and shrink database button
3 years ago
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
3 years ago
acc2995d86
invalidate used token
3 years ago
572a5300aa
Recommended updates.
3 years ago
e1f1d4a959
Merge branch 'louislam:master' into textchanges
3 years ago
20d59e5a13
fix and move the steam api key to settings page
3 years ago
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
3 years ago
8cb26d2b31
Text update
3 years ago
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
3 years ago
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
b67b4d5afd
add steam gameserver for monitoring
3 years ago
32c9dfbb31
Fix: clear important beats after deleteMonitor
3 years ago
15c00d9158
upload logo and expose ./data/upload to url
3 years ago
469e8f6fd6
Merge branch 'master' into public-dashboard
...
# Conflicts:
# package-lock.json
3 years ago
4591adc05e
second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
3 years ago
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
3 years ago
b0e9c5bcb4
fix reset-password ( #448 )
3 years ago
fd95d41d9f
[status page] many update and save group list
3 years ago
2955abb5d9
[status page] create incident
3 years ago
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
3 years ago
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
3 years ago
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
3 years ago
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
3 years ago
2617e1f4d8
Update database.js
3 years ago
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
3 years ago
e205adfd7b
[status page] developing
3 years ago
f47f7758f9
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
# server/server.js
# server/util-server.js
3 years ago
389d247463
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
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.
3 years ago
934685637a
[Status Page] WIP: Checkpoint
3 years ago
295ccba44b
Adjusted for new db patch management
3 years ago
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
9f9c1007d7
increase sqlite cache size from 2MB to 12MB
3 years ago
58240aceef
Added the option for default notifications
3 years ago
582e14098d
create data dir before copy
3 years ago
6e3e2fc85c
fix db path
3 years ago
b604807cfe
create data dir if not exists
3 years ago
c74986647e
allow changing data dir
3 years ago
e4b76717be
revert back to node-sqlite3
3 years ago
cd1a3a2fb9
revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems
3 years ago
ada6606217
move the new sql to patch8.sql
3 years ago
46ac753c46
Merge branch 'master' into dns-monitor
3 years ago
f96d792fa1
fix patch database using better-sqlite3
3 years ago
14652c9b5f
Remove unused variables
3 years ago
2f50fc4c00
plan to switch to better-sqlite3, drop node-sqlite3
3 years ago
c79be19ec3
Added DNS Monitor Type
3 years ago
b892a92fc8
retry if acquire error
3 years ago
ec0dbf3cbe
probably still memory leak over time, not sure what happen, change back to singal pool.
3 years ago
05680472a7
fix high memory usage
3 years ago
7ffdb2eb80
also backup sqlite shm, val file
3 years ago
440c178403
change sqlite to WAL mode
3 years ago
61e758d872
disable pool for sqlite, re-use a connection to improve the performance.
3 years ago
eed6d3e847
add more query log for dev env
3 years ago
fc76c2836b
increase the query timeout
3 years ago
d0aad3400c
add reset password in cli
3 years ago
44391117ab
Merge pull request #173 from chakflying/redirects&status
...
Feat: Implement Max.Redirects & Accepted Status Codes
3 years ago
4ff68238c4
Chore: Improve logging during db development
3 years ago
adcd251076
Merge branch 'master' into redirects&status
3 years ago
a98ba41c8e
minor
3 years ago
a40816b948
fix high severity vulnerabilities by using my fork sqlite3 package
3 years ago
8f7885e58a
Feat: Implement MaxRedirects & StatusCodes
3 years ago
0c3c59df4e
Fix: [DB] Add default for created_date in monitor
3 years ago
e032072900
eslint: allow while (true)
3 years ago
47b19ea2f2
ESLint: fix file
3 years ago
081abcb6a1
add util.ts for sharing common functions between frontend and backend
3 years ago
53a90347ca
update database schema, add upside_down and ignore_tls
3 years ago
3666ebb931
change no-unused-vars from error to warn
3 years ago
06c4523ce3
update the latest db version to 3
3 years ago
96c60dd94a
Feat: Add database storage for TLS info
3 years ago
e02eb72863
add db migration
3 years ago
Matthew Nickson
Louis Lam
Justin Tisdale
minhhn3
Minh Hoàng
Joseph Benguira
Moritz R
OidaTiftla
Christopher Pickering
Christopher Pickering
Sascha Kruse
OidaTiftla
Karel Krýda
Adam Stachowicz
Uğur Erkan
c0derMo
Juan Cruz Vincenti
Andreas Brett
Nelson Chan
Andreas Brett
Ivan Bratović
Tarun Singh
NeuralMiner
NeuralMiner
Bert Verhelst
Denis Freund
No0Vad
Ponkhy
Ponkhy
Nelson Chan