Justin Tisdale
2b9bf095a6
Add non-json support for http body
2 years ago
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
2 years ago
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2 years ago
Louis Lam
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2 years ago
Moritz R
60e7824ff0
Merge branch 'master' into master
2 years ago
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
tamasmagyar
986c03aecd
test cypress run
2 years ago
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>
2 years ago
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
theS1LV3R
c4125a8334
style: fix linter error
2 years ago
Zoe
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
theS1LV3R
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
Louis Lam
c36d9a4b8b
Fix port data type #1802
2 years ago
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
Moritz R
ac449ec1c2
Merge branch 'master' into master
2 years ago
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
3 years ago
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 years ago
Louis Lam
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
Louis Lam
e4ad8cbfc8
Remove unused variables
3 years ago
Karel Krýda
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
c095767f4a
[Status Page] SSR
3 years ago
Moritz R
a9f3142cee
Merge branch 'master' into master
3 years ago
Christopher Pickering
ef73af391f
added option for ntlm authorization
3 years ago
Christopher Pickering
87f933df4f
added sqlserver monitor
3 years ago
Sascha Kruse
398ecb7666
add radius check
3 years ago
Louis Lam
59be9bb971
working
3 years ago
Karel Krýda
9a35386841
Merge branch 'master' into master
3 years ago
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
Karel Krýda
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
Karel Krýda
b4ffcc5555
Added JSDoc
3 years ago
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
3 years ago
Louis Lam
023db1450d
Fix #1577
3 years ago
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
Adam Stachowicz
1e595eaa76
Update linters
3 years ago
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
3 years ago
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
OidaTiftla
19933bbd99
Improve backwards compatibility
3 years ago
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
200fdfb808
Merge code manually since some code moved to another file
3 years ago
Louis Lam
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
Louis Lam
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
Louis Lam
addf75daa7
Fix MQTT password do not save
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
e6a8a84278
Include only nessacary data in webhook
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
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
3 years ago
Louis Lam
0a5db0cecb
Fix #1478
3 years ago
Louis Lam
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
3 years ago
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
Louis Lam
4053b9db1f
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
3 years ago
Louis Lam
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
3 years ago
Louis Lam
94770cf865
Resolve log message null reference
3 years ago
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
3 years ago
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
3 years ago
Louis Lam
5027fcd320
Export server using an object class
3 years ago
Louis Lam
d5e68f8453
Export monitor list
3 years ago
Louis Lam
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
3 years ago
Louis Lam
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
Louis Lam
48d679234a
Stop bree and cloudflared while the server shutting down
3 years ago
Moritz R
af44b0beab
Merge branch 'master' into master
3 years ago
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
3 years ago
Louis Lam
b72a2d350f
Set cloudflared token from env var or arg
3 years ago
Louis Lam
82ea896bbc
Improve the workflow of cloudflared
3 years ago
Louis Lam
a6b52b7ba6
Merge branch 'master' into cloudflared
3 years ago
Louis Lam
b8dea3a823
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
0da6e6b1fb
Some improvements
3 years ago
Louis Lam
44fb2a88f2
Add cloudflared socket handler
3 years ago
OidaTiftla
d8013f31e8
Update version after merging new master branch
3 years ago
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
Louis Lam
3adda48f3a
Load the status page list earlier
3 years ago
Louis Lam
719a136d1e
[Status Page] Improved entry page
3 years ago
Louis Lam
50d6e888c2
[new status page] wip
3 years ago
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
3 years ago
OidaTiftla
b69a8b8493
Fix formatting
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
OidaTiftla
1ac904d6d6
Introduce resend interval if down
3 years ago
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
c0derMo
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
Louis
d1a99b0a22
Check Node.js version, better error message
3 years ago
c0derMo
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
Louis Lam
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
Louis Lam
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Louis
ed64853125
Keep FBSD, BSD for ping only
3 years ago
Denis
0f822d3b2a
FBSD does not exists anymore
3 years ago
Denis
6bda5c6329
update comment
3 years ago
Louis
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
3 years ago
Marc Harnos
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
Marc Harnos
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
Marc Harnos
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
3 years ago