9286dcb6ce
fix: add serverside check against endless loops
1 year ago
683f446cf5
Add support for `.env`
1 year ago
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
1 year ago
aba515e172
feat: disable childs if parent is disabled
1 year ago
97bd306a09
Merge branch 'louislam:master' into group-monitors
1 year ago
645fd94bba
feat: add ability to group monitors in dashboard
1 year ago
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
1 year ago
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
1 year ago
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
1 year ago
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
1 year ago
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
1 year ago
be850dd596
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
1 year ago
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
1 year ago
774d754b21
Add GameDig monitor
1 year ago
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
1 year ago
4147a4c404
fix : #2480
1 year ago
765d8e1297
Fix #2318
1 year ago
39987ba9ac
Init server timezone
1 year ago
3b87209e26
Add configurable dns cache
1 year ago
4cd5b5563f
Fix #1145
1 year ago
e478084ff9
Fix Uptime Kuma cannot be stopped
1 year ago
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
1 year ago
b459408b10
fix: resolve conflict
2 years ago
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
0b8d4cdaac
Generate Next Timeslot for recurring interval
2 years ago
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
2faf866e9e
Implement generateTimeslot() for recurring interval type
2 years ago
7b9766091e
Revert testing
2 years ago
a36f24d827
Add configurable server timezone
2 years ago
ad1a7c255f
Drop exports.entryPage fully
2 years ago
3e699f8ac3
Fix linting errors.
2 years ago
b0d6b5b13d
Fixed entry route not redirecting correctly when the status entry page changes slug.
2 years ago
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
0814d643c1
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
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
2 years ago
e4ad8cbfc8
Remove unused variables
2 years ago
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
c095767f4a
[Status Page] SSR
2 years ago
a9f3142cee
Merge branch 'master' into master
2 years ago
ef73af391f
added option for ntlm authorization
2 years ago
87f933df4f
added sqlserver monitor
2 years ago
398ecb7666
add radius check
2 years ago
59be9bb971
working
2 years ago
9a35386841
Merge branch 'master' into master
2 years ago
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
2 years ago
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2 years ago
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
2 years ago
b4ffcc5555
Added JSDoc
2 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
2 years ago
023db1450d
Fix #1577
2 years ago
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
2 years ago
1e595eaa76
Update linters
2 years ago
5fbfacf5ce
Fix ESlint warnings
2 years ago
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
2 years ago
19933bbd99
Improve backwards compatibility
2 years ago
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2 years ago
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
200fdfb808
Merge code manually since some code moved to another file
2 years ago
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
2 years ago
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
2 years ago
addf75daa7
Fix MQTT password do not save
2 years ago
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2 years ago
e6a8a84278
Include only nessacary data in webhook
2 years ago
d71c086447
Standardize array bracket spacing
2 years ago
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
2 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
2 years ago
0a5db0cecb
Fix #1478
2 years ago
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
2 years ago
e9ce1433cd
Change log_info to log.info by making it into an object
2 years ago
361e44ad6a
Merge branch 'louislam:master' into master
2 years ago
4053b9db1f
Merge remote-tracking branch 'origin/master'
2 years ago
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
2 years ago
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
2 years ago
94770cf865
Resolve log message null reference
2 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
2 years ago
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
2 years ago
5027fcd320
Export server using an object class
2 years ago
d5e68f8453
Export monitor list
2 years ago
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
2 years ago
c4e74c9943
Render <StatusPage> if domain matched
2 years ago
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2 years ago
48d679234a
Stop bree and cloudflared while the server shutting down
2 years ago
af44b0beab
Merge branch 'master' into master
2 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
2 years ago
b72a2d350f
Set cloudflared token from env var or arg
2 years ago
82ea896bbc
Improve the workflow of cloudflared
2 years ago
a6b52b7ba6
Merge branch 'master' into cloudflared
2 years ago
b8dea3a823
Merge remote-tracking branch 'origin/master'
2 years ago
0da6e6b1fb
Some improvements
2 years ago
44fb2a88f2
Add cloudflared socket handler
2 years ago
d8013f31e8
Update version after merging new master branch
2 years ago
91366ff565
Merge branch 'master' into introduce-resend-interval
2 years ago
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
2 years ago
3adda48f3a
Load the status page list earlier
2 years ago
719a136d1e
[Status Page] Improved entry page
2 years ago
50d6e888c2
[new status page] wip
2 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
2 years ago
b69a8b8493
Fix formatting
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
1ac904d6d6
Introduce resend interval if down
2 years ago
0d3414c6d6
A complete maintenance planning system has been created
2 years ago
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
2 years ago
d1a99b0a22
Check Node.js version, better error message
2 years ago
c5cc42272f
Fixing the editing of docker container & adding english translation
2 years ago
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
2 years ago
32ec4beda0
Merge branch 'master' into mqtt
2 years ago
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2 years ago
ed64853125
Keep FBSD, BSD for ping only
2 years ago
0f822d3b2a
FBSD does not exists anymore
2 years ago
6bda5c6329
update comment
2 years ago
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
2 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
2 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
2 years ago
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
2 years ago
1bbd744d02
Chore: Improve syntax
2 years ago
2e0e35a1ee
Fix: Fix typo
2 years ago
1e92487f30
Chore: Remove onDelete as unused
2 years ago
edd2534a1b
Fix: Clear metrics also on stop and edit
2 years ago
f6ef390c76
Fix: Remove Prom. metrics on delete monitor
2 years ago
Peace
Louis Lam
Faruk Genç
Peace
Thomas Spalinger
Nelson Chan
Adam Spurgeon
Matthew Nickson
minhhoang
George Tsomlektsis
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