Laurent Aupse
e856cb6007
Make auto refresh interval customizable ( #4260 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-05-19 21:56:55 +02:00
Louis Lam
63a380326d
Merge branch '1.23.X' into 1.23.13-to-2.0.0
...
# Conflicts:
# .github/workflows/auto-test.yml
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/monitor-types/real-browser-monitor-type.js
# server/util-server.js
# test/cypress/unit/i18n.spec.js
2024-04-25 15:42:53 +08:00
Nelson Chan
ee7f8680c1
Fix: Add missing FK for monitor-tls-info table [1.23.X] ( #4631 )
2024-03-31 12:05:38 +08:00
Nelson Chan
08f75b0b99
Fix: Add missing FK for monitor-tls-info table ( #4632 )
2024-03-31 12:04:22 +08:00
Nelson Chan
b8858f4605
Feat: Handle maintenance in UptimeCalculator ( #4406 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-03-27 10:19:25 +08:00
Nelson Chan
bf1e3a3d5e
Feat: Add stat_hourly & min. max. ping ( #4267 )
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2024-01-05 20:42:24 +08:00
Nelson Chan
46432618e1
Feat: Add json-query to MQTT monitor type ( #3857 )
...
* Feat: Add json-query MQTT monitor type
* Fix: Allow result to be null
* Fix: Remove unused parameter
* Chore: Update JSDoc
* Fix: Add default if checkType is not set
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-12-03 01:36:19 +08:00
Adam Hancock
62780001f7
Feature: remote browser support ( #3904 )
...
* [empty commit] pull request for remote browser support
* Remote browser: Added UI screens and DB tables.
* Remote browser working
* Fixing tests
* Fix tests
* Fix tests
* fix tests
* Test browser
* revert init_db.js
* Changed drop down to ActionSelect
* Fix translations
* added remote browsers toggle
* revert changes package-lock
* Fix bad english
* Set default remote browser
* Remote browsers Requested changes
* fixed description.
2023-12-01 15:29:10 +08:00
Nelson Chan
67250d6302
Feat: Retries persistence ( #3814 )
...
* Feat: Retries persistence
* Fix: Set duration for first beat of push monitor
* Feat: Update UptimeCalculator in push route
* Fix: Handle resend in push route
* Chore: Remove debug log
2023-11-24 18:11:36 +08:00
Louis Lam
9973d73dd7
Fix a merge issue
2023-11-20 14:48:20 +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
40d6a21453
Fix kafka migration script again ( #4043 )
2023-11-17 15:21:29 +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
0608881954
🐛 fix: kafka producer booleans migration null values ( #3984 )
...
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
2023-11-10 00:32:54 +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
Andreas Brett
42bf27fe5a
push monitor: increase token security ( #912 )
...
* increased pushToken security
* Merge manually
---------
Co-authored-by: Andreas Brett <github@abrett.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2023-10-11 19:28:06 +08:00
Louis Lam
45b6fab313
Merge conflicts
2023-10-09 21:32:40 +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
Adam Stachowicz
04b8681cfb
Fix few markdownlint warnings ( #3825 )
2023-10-03 05:48:21 +08:00
Louis Lam
de7bc487ed
Sync the column order
2023-09-21 20:41:16 +08:00
Louis Lam
16a396debb
Similar to #3763 , but for 1.23.3
2023-09-21 20:38:54 +08:00
Floris-Jan
2266f31100
changed notification.config from varchar to text. ( #3763 )
2023-09-21 20:22:37 +08:00
Frank Elsinga
7711679e1a
made shure that all databse patches have the db-patch warning ( #3624 )
2023-09-10 00:28:53 +08:00
Louis Lam
076331bf00
Uptime calculation improvement and 1-year uptime ( #2750 )
2023-09-01 05:19:21 +08:00
Louis Lam
d33b4f46e4
Disable e2e test temporarily and update some docs
2023-08-11 22:17:31 +08:00
Louis Lam
dd62bd3d91
Move patch files
2023-08-11 22:08:45 +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
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
Tarun Singh
4ea5771f97
Status page certificate expiry
2023-07-04 19:37:45 -04: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
Louis Lam
2e2747fb52
Handling DATE_ADD
2023-06-27 20:57:34 +08:00
Louis Lam
b2a1bd5214
WIP
2023-06-27 20:57:34 +08:00
Peace
9bd76c2795
Merge branch 'master' into group-monitors
2023-05-31 20:51:33 +02:00
Miles Steele
171aff1226
add invert keyword feature
2023-04-06 15:25:25 -05:00
Louis Lam
227cec86a8
WIP
2023-03-31 20:25:37 +08:00
Louis Lam
02291730fe
WIP
2023-03-31 04:04:17 +08:00
