120e578398
Move maintenance code to `maintenance-socket-handler.js`
2 years ago
7017c2e625
Move maintenance code to `maintenance-socket-handler.js`
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
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
3a90d246a4
fix: wrong type
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
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
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
a3b1612938
getClientIP respect trustProxy setting
2 years ago
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
986c03aecd
test cypress run
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
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
c4125a8334
style: fix linter error
2 years ago
0a368ff553
feat: add x-real-ip as a secondary header for client ip
...
Now allows both x-forwarded-for as well as x-real-ip to be used for the client ip, preferring x-forwarded-for
2 years ago
6f01a448ad
feat: get client ip from x-forwarded-for header if available
...
Useful for use-cases where Uptime Kuma is running behind a reverse proxy
2 years ago
c36d9a4b8b
Fix port data type #1802
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
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
a707b51053
Page Loading Speed Optimization ( #1711 )
...
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets
Original: ~1.2MB
Optimized: ~370KB
3 years ago
e4ad8cbfc8
Remove unused variables
3 years ago
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
c095767f4a
[Status Page] SSR
3 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
59be9bb971
working
3 years ago
9a35386841
Merge branch 'master' into master
3 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
b4ffcc5555
Added JSDoc
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
023db1450d
Fix #1577
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
5fbfacf5ce
Fix ESlint warnings
3 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
19933bbd99
Improve backwards compatibility
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
200fdfb808
Merge code manually since some code moved to another file
3 years ago
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
addf75daa7
Fix MQTT password do not save
3 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
e6a8a84278
Include only nessacary data in webhook
3 years ago
d71c086447
Standardize array bracket spacing
3 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
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
0a5db0cecb
Fix #1478
3 years ago
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
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
4053b9db1f
Merge remote-tracking branch 'origin/master'
3 years ago
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
3 years ago
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
3 years ago
94770cf865
Resolve log message null reference
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
5027fcd320
Export server using an object class
3 years ago
d5e68f8453
Export monitor list
3 years ago
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
3 years ago
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
48d679234a
Stop bree and cloudflared while the server shutting down
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
b72a2d350f
Set cloudflared token from env var or arg
3 years ago
82ea896bbc
Improve the workflow of cloudflared
3 years ago
a6b52b7ba6
Merge branch 'master' into cloudflared
3 years ago
b8dea3a823
Merge remote-tracking branch 'origin/master'
3 years ago
0da6e6b1fb
Some improvements
3 years ago
44fb2a88f2
Add cloudflared socket handler
3 years ago
d8013f31e8
Update version after merging new master branch
3 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
3adda48f3a
Load the status page list earlier
3 years ago
719a136d1e
[Status Page] Improved entry page
3 years ago
50d6e888c2
[new status page] wip
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
b69a8b8493
Fix formatting
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
1ac904d6d6
Introduce resend interval if down
3 years ago
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
d1a99b0a22
Check Node.js version, better error message
3 years ago
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
ed64853125
Keep FBSD, BSD for ping only
3 years ago
0f822d3b2a
FBSD does not exists anymore
3 years ago
6bda5c6329
update comment
3 years ago
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
3 years ago
0bbe157099
change parsing priority for all passed arguments
...
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
3 years ago
0053a29d10
add validation to port value parsing
...
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
3 years ago
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
3 years ago
1bbd744d02
Chore: Improve syntax
3 years ago
2e0e35a1ee
Fix: Fix typo
3 years ago
1e92487f30
Chore: Remove onDelete as unused
3 years ago
edd2534a1b
Fix: Clear metrics also on stop and edit
3 years ago
f6ef390c76
Fix: Remove Prom. metrics on delete monitor
3 years ago
d3c90df8a8
fixed edit monitor fields empty issues
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
e3745da986
Merge branch 'master' into master
3 years ago
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
3 years ago
c811c1ccde
Merge pull request #753 from chakflying/settings-redesign
...
UI: Redesign/organize settings page
3 years ago
ed96757b24
Merge branch 'louislam:master' into logging
3 years ago
5d3bf68123
add remove-2fa command
3 years ago
7f4d5a0f76
Test: fix tests
...
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Attempt to fix tests
Test: Investigate error message
Test: Attempt to fix tests
Chore: Cleanup code
Test: Attempt to fix tests
Test: Attempt to fix tests
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
f55350bebc
Generated documentation :)
3 years ago
179ca232bc
Minor refactor - change variable names and add commas to object definitions
3 years ago
23736549f9
Implement HTTP basic auth feature
3 years ago
c094dc0c5b
speed up redirect by using 302 redirect instead of vue redirect
3 years ago
ba93129b18
Merge branch '1.9.X'
...
# Conflicts:
# server/server.js
3 years ago
caa2a34177
fix 2fa not working #833
3 years ago
d7f7dba13f
write some error logs to ./data/error.log
3 years ago
a9e319517a
add auto vacuum and shrink database button
3 years ago
2f7b60f5e5
Feat: Use separate storage for custom chart period
...
Fix: Fix import error
3 years ago
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
3 years ago
d578300104
Merge pull request #743 from andreasbrett/patch-4
...
Harden 2FA/TOTP implementation according to rfc6238 (part 2)
3 years ago
b77b33e790
add login rate limiter
3 years ago
56094a43d7
add passwordStrength
3 years ago
cd04ac4557
"dist/index.html" is no longer needed for development environment
3 years ago
e03ee593e2
Merge pull request #716 from NeuralMiner/textchanges
...
Text update
3 years ago
6c1ee70e15
fix
3 years ago
5c3892313e
add env var: UPTIME_KUMA_DISABLE_FRAME_SAMEORIGIN
3 years ago
c57c94642c
Merge remote-tracking branch 'origin/master'
3 years ago
62f168a2a5
config response header
3 years ago
acc2995d86
invalidate used token
3 years ago
9ddffc0f7f
Updates
3 years ago
76e7c8b276
Rebase
3 years ago
572a5300aa
Recommended updates.
3 years ago
e1f1d4a959
Merge branch 'louislam:master' into textchanges
3 years ago
23714ab688
genSecret don't need `await`
3 years ago
6e18f39eb4
[steam] code cleanup
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
cb43ecb46e
Merge branch 'master' into background-jobs
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
3 years ago
6ff3cb275e
Merge pull request #642 from andreasbrett/patch-2
...
Harden 2FA/TOTP implementation according to rfc6238 (part 3)
3 years ago
8cb26d2b31
Text update
3 years ago
7276f34d90
fix reset-password
3 years ago
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
f75c9e4f0c
add UPTIME_KUMA_HOST, UPTIME_KUMA_PORT and special handling for FreeBSD
3 years ago
3fe3450533
Prioritize port passed from args
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
d733ec018e
Prioritize host arg
...
Otherwise launching the program with the --host argument does nothing
3 years ago
2538bd04ce
notp verification defaults
3 years ago
e223e826a3
linting
3 years ago
b5b391c73b
avoid default values for token verification
...
override default values: window=1, window size=30 (see https://github.com/louislam/uptime-kuma/issues/640 )
3 years ago
dc08510e72
Merge remote-tracking branch 'origin/master' into feature/add-support-for-method-body-and-headers
3 years ago
82131f4dd2
merge conflict
3 years ago
56ae6f6117
fix demoMode export
3 years ago
5c89562650
not allow lower than 20s for demo mode
3 years ago
656a4d6270
WIP: Enable background jobs
...
WIP: Remove better-sqlite3
3 years ago
fba4f86552
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
23a2d33f8c
[backup] restore pushToken
3 years ago
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
3 years ago
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
3 years ago
162ef04c41
Merge branch 'master' into feature/add-support-for-method-body-and-headers
3 years ago
49720c709c
improve the test with a single command only "npm test"
3 years ago
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
3 years ago
b246c8e0f2
Fix 2fa for iOS Google authenticator ( #486 )
3 years ago
1ed4ac9494
add Push-based monitoring ( #279 )
3 years ago
fbc8828ddc
Merge pull request #464 from chakflying/fix-delete-monitor
...
Fix: clear important beats after deleteMonitor
3 years ago
b67b4d5afd
add steam gameserver for monitoring
3 years ago
0afa3a2c21
Merge branch '1.6.X'
...
# Conflicts:
# server/database.js
# server/server.js
3 years ago
662c97dcde
Fix: Fix importing tag if tag doesn't exist
3 years ago
7fb55b8875
Fixed issues
3 years ago
32c9dfbb31
Fix: clear important beats after deleteMonitor
3 years ago
d3d4363031
Used compare-version instead of replace
3 years ago
23a63213aa
Merge branch 'master' into import-export
...
# Conflicts:
# server/server.js
3 years ago
15c00d9158
upload logo and expose ./data/upload to url
3 years ago
a8e170f6a8
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/server.js
3 years ago
34c0fa59a8
fix reset-password ( #448 )
...
(cherry picked from commit b0e9c5bcb4
3 years ago
b0e9c5bcb4
fix reset-password ( #448 )
3 years ago
1b5e723f60
Added descriptions to uploadBackup function
3 years ago
4bdada36a9
Removed if includes version
3 years ago
2955abb5d9
[status page] create incident
3 years ago
8b463e70df
Apply suggestions from @Saibamen
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
392f8275b3
Merge branch 'master' into public-dashboard
...
# Conflicts:
# server/database.js
3 years ago
54aa68ec58
Added import/export compatibility for version 1.7
3 years ago
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
3 years ago
80322cbfe7
Merge branch 'import-export'
...
# Conflicts:
# src/languages/it-IT.js
# src/languages/nl-NL.js
3 years ago
Louis Lam
Matthew Nickson
minhhn3
Justin Tisdale
Minh Hoàng
Moritz R
c0derMo
tamasmagyar
Chongyi Zheng
theS1LV3R
OidaTiftla
Karel Krýda
Christopher Pickering
Christopher Pickering
Sascha Kruse
OidaTiftla
Karel Krýda
Adam Stachowicz
Uğur Erkan
Denis
Marc Harnos
Nelson Chan
Tarun Singh
Juan Cruz Vincenti
Andreas Brett
Fluency
Andreas Brett
Calum Bird
Ivan Bratović
NeuralMiner
NeuralMiner
giacomo892
Bert Verhelst
Denis Freund
Ponkhy