c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-08-13 21:15:16 +02:00
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2022-08-11 21:04:11 -04:00
2b9bf095a6
Add non-json support for http body
2022-08-11 20:57:03 -04:00
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
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40:06 +08:00
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
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
71d62ee151
removed ; after the PRAGMA command
2022-07-31 19:00:19 +03:00
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2022-07-31 18:59:02 +03:00
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
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
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
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2022-07-04 18:21:56 +08:00
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
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2022-06-18 23:53:35 +01:00
869a040011
Merge branch 'master' into introduce-resend-interval
2022-06-15 16:19:47 +02:00
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
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
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
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
93050208bb
Merge database changes into single patch file
2022-05-05 16:01:19 +02:00
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
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
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2022-04-27 15:00:49 +08:00
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:15:39 +01:00
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2022-04-21 13:01:22 +01:00
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-20 19:56:40 +01:00
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
2022-04-17 14:53:13 +08:00
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
e9ce1433cd
Change log_info to log.info by making it into an object
2022-04-13 23:33:37 +08:00
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
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
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2022-04-09 16:07:09 +08:00
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320)
2022-04-08 00:56:56 +08:00
fee88b32e3
Set PRAGMA synchronous = FULL
2022-04-06 20:48:13 +08:00
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
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
91366ff565
Merge branch 'master' into introduce-resend-interval
2022-03-27 21:19:57 +02:00
28d72fcd08
Fix #1409 , slug cannot be empty
2022-03-24 23:43:07 +08:00
8d981c8f0b
[Status Page] Fix migration and unpin incident
2022-03-18 14:14:22 +08:00
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
2022-03-16 15:38:10 +08:00
18ec42b060
[Status Page] wip
2022-03-16 14:14:47 +08:00
7c7dbf68c1
[Status Page] wip, sidebar for editor
2022-03-15 12:00:29 +08:00
72ce28a541
Migrate status page table
2022-03-08 14:33:35 +08:00
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
f390a8caf1
Fix missing DB patch and use DATETIME as column format
2022-01-24 21:59:25 +01:00
f931e709e6
Add database patch
2022-01-24 09:18:12 +01:00
0d3414c6d6
A complete maintenance planning system has been created
2022-01-23 15:22:00 +01:00
4818bb67d6
Added trailing comma, fixed spelling & translation
2022-01-14 09:09:37 +00:00
b0259b5592
Added docker container monitor
2022-01-13 16:17:07 +00:00
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +08:00
72a59ce7a4
add status page table
2021-12-27 18:54:48 +08:00
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
a13bdaac84
Merge branch 'master' into logging
2021-11-29 20:32:42 +01:00
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
2021-11-23 22:48:54 +08:00
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
e5913c5abc
separate log functions
2021-11-15 17:52:28 +01:00
bdcdf47e52
introduce consistent logging
2021-11-11 12:31:28 +01:00
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
665c263c03
Add db migrations for new basic auth fields
2021-11-04 09:50:10 +01:00
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
44c1b336dc
send certificate notifications in 21, 14, 7 days
2021-10-27 15:33:15 +08:00
a9e319517a
add auto vacuum and shrink database button
2021-10-26 23:02:32 +08:00
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
acc2995d86
invalidate used token
2021-10-19 00:42:33 +02:00
572a5300aa
Recommended updates.
2021-10-18 13:25:53 -06:00
e1f1d4a959
Merge branch 'louislam:master' into textchanges
2021-10-18 12:57:28 -06:00
20d59e5a13
fix and move the steam api key to settings page
2021-10-18 17:02:05 +08:00
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
8cb26d2b31
Text update
2021-10-15 19:12:09 -06:00
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
2021-10-02 16:48:27 +02:00
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
32c9dfbb31
Fix: clear important beats after deleteMonitor
2021-09-23 23:21:08 +08:00
15c00d9158
upload logo and expose ./data/upload to url
2021-09-21 21:22:35 +08:00
469e8f6fd6
Merge branch 'master' into public-dashboard
...
# Conflicts:
# package-lock.json
2021-09-21 17:05:13 +08:00
4591adc05e
second attempt: prebuilt node-sqlite3 and update SQLite to 3.36
2021-09-21 01:15:20 +08:00
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
2021-09-20 18:48:44 +08:00
b0e9c5bcb4
fix reset-password ( #448 )
2021-09-20 16:29:18 +08:00
fd95d41d9f
[status page] many update and save group list
2021-09-19 19:04:51 +08:00
2955abb5d9
[status page] create incident
2021-09-16 22:48:28 +08:00
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
2021-09-16 16:53:54 +08:00
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
9902c181bc
Merge branch 'master' into public-dashboard
...
# Conflicts:
# src/components/MonitorList.vue
# src/icon.js
2021-09-14 15:05:04 +08:00
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
2617e1f4d8
Update database.js
2021-09-13 00:25:18 +02:00
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
2021-09-13 00:19:51 +02:00
e205adfd7b
[status page] developing
2021-09-13 02:26:45 +08:00
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
389d247463
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-09-12 17:05:23 +02:00
Matthew Nickson
minhhn3
Louis Lam
Justin Tisdale
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