491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
1 year ago
ce8eebc838
Fix #2880
1 year ago
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
1 year ago
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
1 year ago
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
1 year ago
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
1 year ago
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
1 year ago
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
1 year ago
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>
1 year ago
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
1 year 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>
1 year ago
43941fa2c6
feat: add mtls authen method in http/http keyword
1 year ago
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
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
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
Louis Lam
Matthew Nickson
Suriya Soutmun
Faruk Genç
Thomas Spalinger
Nelson Chan
Adam Spurgeon
minhhoang
George Tsomlektsis
Justin Tisdale