Louis Lam
67ad0f79b3
wip
2024-09-28 01:22:45 +08:00
Louis Lam
7046a2e0f6
Merge branch 'master' into 2.0-last-part
...
# Conflicts:
# server/jobs/clear-old-data.js
2024-09-27 21:45:49 +08:00
Louis Lam
59e7607e1a
wip
2024-09-27 21:42:20 +08:00
Cassandra
b287a25de7
feat: structured logging (JSON) ( #5118 )
2024-09-24 17:51:21 +08:00
Louis Lam
0f3c727aa4
wip and fix sqlite migration because of foreign_keys
2024-09-22 18:39:46 +08:00
Louis Lam
2dfa6886b4
Preparing
2024-09-01 17:19:18 +08:00
Louis Lam
85c67b6866
Revert "Switch back to TryGhost/node-sqlite3 from louislam/node-sqlite3" ( #4879 )
2024-06-24 15:52:07 +08:00
Louis Lam
88b7c047a8
Switch back to TryGhost/node-sqlite3 from louislam/node-sqlite3 ( #4773 )
2024-05-20 10:42:37 +08:00
Louis Lam
6bfb1be71a
Improve MariaDB's connection ( #4728 )
2024-05-19 22:46:22 +08:00
Nelson Chan
08f75b0b99
Fix: Add missing FK for monitor-tls-info table ( #4632 )
2024-03-31 12:04:22 +08:00
Frank Elsinga
0e3b3a9ab8
Made sure that more of the async usages are awaited ( #4574 )
2024-03-15 15:02:55 +01:00
Nelson Chan
35479c7690
Fix: Disable timezone conversion for mariadb ( #3756 )
2023-12-03 01:34:26 +08:00
Louis Lam
2aa15ea635
Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# server/database.js
2023-11-18 01:37:30 +08:00
Louis Lam
f0975cd929
Should be a final ulitmate fix for request timeout issue ( #4045 )
...
* Try to fix timeout again
* Ops
2023-11-18 01:17:54 +08:00
Louis Lam
65cbc7b318
Migrate kafka_producer patch
2023-11-13 21:19:43 +08:00
Louis Lam
ace1fe00c2
Merge branch 'master' into 1.23.X-merge-to-2.X.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/uptime-kuma-server.js
# server/util-server.js
2023-11-13 21:15:51 +08:00
Muhammed Hussein karimi
9f170a68d7
🐛 fix: boolean fields in kafka producer monitor ( #3949 )
...
* 🐛 fix: boolean fields in kafka producer monitor
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: boolean fields db patch table modify
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ✏️ typo: remove `_old` COLUMNs in patch-fix-kafka-producer-booleans
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
2023-10-28 14:42:55 +08:00
Louis Lam
e11aad2d60
Add some comments
2023-10-18 21:54:48 +08:00
Louis Lam
03e43ab364
Log color and simplify startup log for production ( #3889 )
2023-10-14 03:00:34 +08:00
Louis Lam
852b3fa61b
Merge branch '1.23.X'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/server.js
# server/util-server.js
2023-10-09 21:28:01 +08:00
Louis Lam
16a396debb
Similar to #3763 , but for 1.23.3
2023-09-21 20:38:54 +08:00
Louis Lam
2ef759a362
Allow missing patch files for downgrade or testing pr.
2023-09-21 20:12:10 +08:00
Louis Lam
83d91dbb1b
Set mariadb timezone to UTC using +00:00 ( #3723 )
2023-09-10 18:33:09 +08:00
Frank Elsinga
d6302198f3
chore(jsdoc):Linting fixes ( #3703 )
...
* fixed the lockfile having a different version
* jsdoc
2023-09-07 15:42:44 +08:00
Nelson Chan
f3e1a9c61a
Fix: Incorrect database check in sqlHourOffset ( #3706 )
2023-09-07 14:00:49 +08:00
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
2023-09-01 05:19:21 +08:00
Louis Lam
db3a7d69fe
Change some jsdoc rule to warn instead of error
2023-08-11 22:29:45 +08:00
Matthew Nickson
8a92054c2b
Added JSDoc to ESLint ( #3529 )
...
* Added JSDoc to eslint rules
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Fixed JSDoc eslint errors
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
* Update the check-linters workflow to Node.js 20
---------
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-08-11 15:46:41 +08:00
Louis Lam
da4f4e3d76
Update migrations
2023-08-09 21:07:23 +08:00
Louis Lam
3e0f5f4231
Merge branch 'master' into 2.0.X
...
# Conflicts:
# package-lock.json
# server/database.js
# server/util-server.js
2023-08-09 20:09:56 +08:00
Nelson Chan
2921f33c24
Feat: add givenPortOnly as gamedig option ( #3532 )
2023-08-08 03:14:21 +08:00
Jinhyeok Lee
439b6517d1
Feat: Add http/http keyword timeout option ( #2142 )
...
* feat: Add timeoutMs field
* chore: Update Languages (incl. ko-KR)
* Revert "chore: Update Languages (incl. ko-KR)"
This reverts commit 349331a00b
2023-08-07 00:14:56 +08:00
Louis Lam
c6e68fac97
Follow up #2852 ( #3527 )
2023-08-04 23:08:44 +08:00
Louis Lam
67b1974718
Allow specifying DATA_DIR without a tailing slash
2023-08-03 20:54:11 +08:00
Henrik Gerdes
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
Louis Lam
a0bd4b248b
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# package.json
# server/database.js
# src/router.js
2023-07-30 19:15:09 +08:00
Tarun Singh
50d4091ded
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-18 22:57:48 -04:00
Muhammed Hussein karimi
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
Tarun Singh
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
2023-07-13 20:02:50 -04:00
Muhammed Hussein karimi
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
Louis Lam
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
2023-07-08 16:19:44 +08:00
Louis Lam
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
2023-07-05 11:35:36 +08:00
Tarun Singh
4ea5771f97
Status page certificate expiry
2023-07-04 19:37:45 -04:00
DevMirza
1774bb86dc
🐛 fix lint warning ( #3355 )
2023-07-04 23:46:36 +08:00
Louis Lam
df8fcffb19
Drop unused code
2023-07-03 14:50:30 +08:00
Louis Lam
ccc39b9516
Move all old db patch files to db/old_migrations/
2023-07-01 20:54:47 +08:00
Louis Lam
e26abc3156
Improve the setup database
2023-07-01 02:48:42 +08:00
Louis Lam
7975caf29e
Update db migration and dockerfile
2023-06-30 17:26:37 +08:00
Louis Lam
16a1a66e09
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/debian-base.dockerfile
# docker/dockerfile
# package.json
# server/database.js
# server/jobs/util-worker.js
# server/model/maintenance.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/uptime-kuma-server.js
2023-06-30 13:38:56 +08:00
Nelson Chan
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
