67b1974718
Allow specifying `DATA_DIR` without a tailing slash
2023-08-03 20:54:11 +08:00
42b5d30a33
feat: Implement oauth2 monitors ( #3119 )
...
* [empty commit] pull request for implement oauth2 monitor
* feat: implement oauth2 client credentials flow
* fix: auth methods clarification & error handling
* docs: fix JSdocs types and clarifications
2023-08-02 15:40:19 +08:00
50d4091ded
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-18 22:57:48 -04:00
278b88a9d9
✨ feat: added kafka producer ( #3268 )
...
* ✨ feat: added kafka producer
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: eslint warn
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typings and auth problems
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better variable name to trrack disconnection
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: grouping Kafka Producer special settings into one template
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ✨ feat: add kafka producer translations into `en.json`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: disable close-on-select on kafka broker picker
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: `en.json` invalid json (conflict resolve)
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Minor
* Fix a bug of clone
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-07-17 16:15:44 +08:00
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-13 20:02:50 -04:00
6bece8796e
✨ feat: json-query monitor added ( #3253 )
...
* ✨ feat: json-query monitor added
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: import warning error
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: br tag and remove comment
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: supporting compare string with other types
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: switch to a better lib for json query
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: result variable in error message
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typos in json query description
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: needed white space in `README.md`
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Rebuild package-lock.json
* Lint
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: zappityzap <128872140+zappityzap@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-07-13 23:37:26 +08:00
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
2023-07-08 16:19:44 +08:00
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
2023-07-05 11:35:36 +08:00
4ea5771f97
Status page certificate expiry
2023-07-04 19:37:45 -04:00
1774bb86dc
🐛 fix lint warning ( #3355 )
2023-07-04 23:46:36 +08:00
df8fcffb19
Drop unused code
2023-07-03 14:50:30 +08:00
a386f1fc9e
[Experiment] Use incremental vacuum to speed up delete? ( #2800 )
...
* DB: Use incremental vacuum
* Chore: Add log for delete monitor exec. time
* WIP: Test synchronous NORMAL
2023-06-29 22:41:01 +08:00
4f6035899d
Real browser monitor type ( #3308 )
2023-06-27 15:54:33 +08:00
9bd76c2795
Merge branch 'master' into group-monitors
2023-05-31 20:51:33 +02:00
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2023-05-09 00:42:11 +08:00
72c16c3aa2
Fix eslint warnings
2023-05-08 04:26:11 +08:00
6356b1e50a
Merge pull request #2961 from chakflying/feat/flush-wal
...
Chore: Flush WAL on shutdown
2023-04-11 18:53:58 +08:00
171aff1226
add invert keyword feature
2023-04-06 15:25:25 -05:00
511038b45a
Remove unused code
2023-04-01 04:22:10 +08:00
17ae47d091
Drop database backup logic, because duplicating a relative large database likely causes a disk space issue, users should take backup manually instead.
2023-04-01 00:58:23 +08:00
02291730fe
WIP
2023-03-31 04:04:17 +08:00
ca52047bf5
Feat: Flush WAL on shutdown
2023-03-22 14:46:58 +08:00
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-03-12 18:38:19 +08:00
958354e4db
Minor
2023-02-28 16:58:36 +08:00
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2023-02-28 16:55:50 +08:00
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
2023-02-25 19:14:44 +08:00
d668812df1
Fix merge issue
2023-02-25 17:59:25 +08:00
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-02-25 17:57:25 +08:00
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2023-02-25 00:06:25 +08:00
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-18 22:38:40 +03:00
cef0a0faf4
Merge branch 'master' into group-monitors
2023-02-16 21:38:53 +01:00
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
cd18b96f69
Added check to ensure backup exists when restoring ( #2779 )
...
A check to ensure that the backup database exists before deleting the
current database.
Fixes #2778
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-15 00:43:40 +08:00
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
2023-02-07 09:40:44 +07:00
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
2023-02-05 18:19:46 +03:00
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2023-02-02 21:51:03 +00:00
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2023-02-02 21:51:03 +00:00
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
97bd306a09
Merge branch 'louislam:master' into group-monitors
2023-01-28 03:07:42 +01:00
645fd94bba
feat: add ability to group monitors in dashboard
2023-01-28 02:58:03 +01:00
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
2023-01-25 20:20:11 +03:00
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2023-01-25 16:12:33 +08:00
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
2023-01-14 16:40:13 +03:00
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-09 20:20:09 +00:00
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
50711391d1
Revert "Auth: Case insensitive login check on username"
2023-01-01 22:19:00 +08:00
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
2022-12-19 12:18:33 +01:00
bc86f8bb5f
Reset busy_timeout to default
2022-12-11 20:25:15 +08:00
Louis Lam
Henrik Gerdes
Tarun Singh
Muhammed Hussein karimi
DevMirza
Nelson Chan
Peace
Miles Steele
Nelson Chan
Faruk Genç
Matthew Nickson
Suriya Soutmun
c
Peace
Adam Spurgeon
Mathias Haugsbø