e7feca1cd6
Added API key authentication handler
...
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.
In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
4056951915
WIP: building database in knex.js
2 years ago
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2 years ago
43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
d4752b65de
WIP
2 years ago
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2 years ago
9446c2d102
fix: use active instead of isActive in uploadBackup
2 years ago
2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
9286dcb6ce
fix: add serverside check against endless loops
2 years ago
683f446cf5
Add support for `.env`
2 years ago
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
aba515e172
feat: disable childs if parent is disabled
2 years ago
97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
2 years ago
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2 years ago
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2 years 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
2 years ago
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2 years ago
774d754b21
Add GameDig monitor
2 years ago
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
4147a4c404
fix : #2480
2 years ago
765d8e1297
Fix #2318
2 years ago
39987ba9ac
Init server timezone
2 years ago
3b87209e26
Add configurable dns cache
2 years ago
4cd5b5563f
Fix #1145
2 years ago
e478084ff9
Fix Uptime Kuma cannot be stopped
2 years ago
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2 years 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
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
Matthew Nickson
Louis Lam
Suriya Soutmun
Faruk Genç
Peace
Peace
Thomas Spalinger
Nelson Chan
Adam Spurgeon
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