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
0a59fef7d8
Merge pull request #3490 from chakflying/fix/radius-retry
...
Fix: Incorrect radius error & retry handling
2023-07-31 17:47:26 +08:00
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
573f158f7f
Fix: incorrect radius error handling
2023-07-27 17:42:22 +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
f6c1b92fc6
Added http type check and tags based design
2023-07-17 02:01:10 -04:00
80927332cb
Merge remote-tracking branch 'origin/master' into feat/monitor-list-improved-filtering
2023-07-16 21:04:46 +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
b1f266ceb1
Added expiry changes to status page and fixes
2023-07-13 20:00:23 -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
e7d1b4e14a
Merge pull request #3174 from chakflying/fix/push-monitor-safe-restart
...
Fix: Use safeBeat in push monitor
2023-07-13 23:14:28 +08:00
d825dbf828
Merge pull request #3188 from chakflying/fix/radius-timeout
...
Fix: Set radius connection timeout to monitor default
2023-07-09 22:47:39 +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
4ea5771f97
Status page certificate expiry
2023-07-04 19:37:45 -04:00
de74efb2e6
Merge pull request #3169 from janow25/docker-health-check
...
Added Docker Health Status Support
2023-07-01 02:55:05 +08:00
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
2e2747fb52
Handling DATE_ADD
2023-06-27 20:57:34 +08:00
4f6035899d
Real browser monitor type ( #3308 )
2023-06-27 15:54:33 +08:00
7cc9783436
Fix: Active needs to return bool instead of 0
2023-06-26 13:21:51 +08:00
7a34103da6
Added fix to remove children when type changed
2023-06-25 22:44:15 -04:00
56f448bfe5
fix: maintenance heredity
2023-05-31 21:29:20 +02:00
2b46da0f47
style: fix linting
2023-05-31 21:19:46 +02:00
9bd76c2795
Merge branch 'master' into group-monitors
2023-05-31 20:51:33 +02:00
8ed2b59410
Resolve conflict
2023-05-26 21:38:51 +08:00
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
2023-05-26 21:32:58 +08:00
f1a396b0f7
Fix: Align radius timeout to default
2023-05-23 18:18:54 +08:00
317024ed72
Fix: Use safebeat for push monitor
2023-05-19 18:52:00 +08:00
f604d96c5b
splited if to inner if
2023-05-18 09:55:33 +02:00
f30f00655f
small fix for down containers
2023-05-17 23:18:29 +02:00
891f09def7
removed log
2023-05-17 19:15:10 +02:00
6b5e179bb0
linting
2023-05-17 19:02:34 +02:00
f653aba735
added docker health status
2023-05-17 18:52:28 +02:00
8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
2023-05-13 18:36:04 +08:00
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2023-05-09 00:42:11 +08:00
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2023-05-08 22:14:58 +08:00
d23cb0b382
Fix maintenance do not start after 1.21.2
2023-05-08 04:08:30 +08:00
0e516a42e5
Trim before truncating "keword not found" message
2023-04-11 16:57:30 +01:00
9e320dc5fb
Expose timezone and local datetime to notification providers
2023-04-09 16:01:27 +08:00
682f8e52a8
lint
2023-04-06 15:30:38 -05:00
171aff1226
add invert keyword feature
2023-04-06 15:25:25 -05:00
45ef7b2f69
Fix Effective Date Range cannot be removed
2023-04-03 21:01:58 +08:00
dbfaddafca
Validate cron before submit
2023-04-01 16:30:55 +08:00
524cf7c607
WIP
2023-03-31 21:34:05 +08:00
227cec86a8
WIP
2023-03-31 20:25:37 +08:00
02291730fe
WIP
2023-03-31 04:04:17 +08:00
3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
...
Fix: Check for TLS expiry notified days smaller than target
2023-03-26 15:34:26 +08:00
7330db3563
Improve error handling of mysqlQuery and return row count as result
2023-03-24 16:08:30 +08:00
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
2023-03-15 15:00:28 +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
533bc1505b
Prevent generating duplicated timeslots
2023-03-09 22:03:23 +08:00
f32fcb204f
Fix: Check for notified days smaller than target
2023-03-08 22:26:19 +08:00
2dedc1cfbd
Fix #2776
2023-03-07 20:48:11 +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
ea3b3abe36
Fine tune
2023-02-25 20:13:46 +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
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-02-25 17:57:25 +08:00
a7b49fcd98
Fix json body after xml body added
2023-02-25 17:28:32 +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
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2023-02-24 17:26:47 +08:00
2fa233ae7f
Fix prometheus null issues
2023-02-24 17:12:57 +08:00
7f88aacbe7
make monitor start() and stop() async
2023-02-23 16:16:49 +00:00
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
2023-02-23 20:43:05 +08:00
0be8b111e2
chore: better up message
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-20 13:48:16 +01:00
cef0a0faf4
Merge branch 'master' into group-monitors
2023-02-16 21:38:53 +01:00
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-15 19:31:22 +00:00
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
2023-02-15 14:06:29 -05:00
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 22:41:06 +00:00
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
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>
2023-02-14 19:49:04 +00:00
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-11 23:56:38 +03:00
4056951915
WIP: building database in knex.js
2023-02-11 22:21:06 +08:00
c12b06348b
Fix parsing issues of status page's og tags
2023-02-10 17:29:32 +08:00
43941fa2c6
feat: add mtls authen method in http/http keyword
2023-02-07 09:40:47 +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
5f2affb38c
Relocate and fix jsesc issue
2023-02-04 16:58:39 +08:00
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2023-02-04 15:40:13 +08:00
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-04 00:03:05 +03:00
2a6d98ff01
Feat: Expand and Simplify Badge Functionality ( #2211 )
...
* [expanding badges] added new configs
* [expanding badges] recieve ping in getPreviousHeartbeat()
* [expanding badges] re-added original new badges
* [expanding badges] recreate parity between old and new badges
* [expanding badges] fix linting
2023-02-03 12:33:48 +08:00
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2023-02-02 21:51:03 +00:00
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2023-02-02 21:51:03 +00: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
f286386f59
fix: add message for empty group pending state
2023-02-01 20:19:47 +01:00
9a46b50989
docs: add comments
2023-01-28 14:22:15 +01:00
f3ac351d75
feat: set childs under maintenance if parent is too
2023-01-28 14:02:10 +01:00
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
aba515e172
feat: disable childs if parent is disabled
2023-01-28 13:39:17 +01: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
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2023-01-25 00:22:51 +08:00
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2023-01-25 00:19:54 +08:00
c4c720027c
Fix: Use correct log call format
2023-01-24 23:47:33 +08:00
83e0401dd8
Show game list for GameDig monitor
2023-01-24 23:03:01 +08:00
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2023-01-24 10:32:49 +00:00
aef85078eb
reorder fix
2023-01-20 12:29:56 +03:00
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-20 12:27:28 +03:00
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2023-01-18 09:53:04 +08:00
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2023-01-17 21:17:04 +08:00
a5ff27da7a
Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2023-01-17 17:34:47 +08:00
e48a987b9c
Merge remote-tracking branch 'origin/master' into mongodb-ping
...
# Conflicts:
# server/model/monitor.js
# server/util-server.js
# src/pages/EditMonitor.vue
2023-01-15 01:13:11 +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
3adc9e65d6
Add only xml support to http monitors
2023-01-14 16:33:21 +03:00
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +08:00
a21a47de93
[ #2593 ] renamed the method `sendCertNotification` to better represent what id does. Evaluate certificate expiry from all certs in chain. Send a separate notification for every cert in chain, including cert type and CN.
2023-01-12 11:39:36 +01: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
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:19:05 +00:00
40ebc2df79
feat: support redis monitor
2023-01-05 23:02:56 +08:00
204792dd2d
Fix: Fix incorrect handling for container down
2023-01-03 22:07:14 +08:00
0cead83705
Fix #2516
2023-01-03 14:50:41 +08:00
41a9f2ff8a
Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc
...
Bug fix: gRPC check throws errors when response data size > 50 chars
2023-01-01 13:57:10 +08:00
1006fbd873
A possible fix for #2447
2022-12-30 13:46:53 +08:00
4147a4c404
fix : #2480
2022-12-28 22:31:33 +07:00
e12225e595
Fix #2475 #2468 #2455 , add Accept-Encoding only if encountered the abort error
2022-12-26 21:00:46 +08:00
1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
...
Fix discord notification not sending when docker container goes down
2022-12-24 14:26:53 +08:00
14fffcf06b
Globally fix if heartbeatJSON["msg"] is undefined
2022-12-24 14:23:50 +08:00
b75db27658
Fix lint
2022-12-15 13:57:28 +08:00
1da00d19fd
Try to fix `incorrect header check`
2022-12-14 21:34:13 +08:00
3b58fd3b3c
Cache uptime
2022-12-11 21:33:26 +08:00
02b5cae577
Fix #2371 by left join maintenance_timeslot
2022-12-09 21:03:12 +08:00
4cd5b5563f
Fix #1145
2022-12-08 23:21:55 +08:00
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2022-12-05 18:18:19 +08:00
3e68cf2a1c
Specify `Accept-Encoding` for axios request ( Fix #2253 )
2022-12-04 22:55:05 +08:00
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 19:04:14 +00:00
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:46:58 +00:00
b059a36e66
added MongoDB ping monitor
2022-11-16 20:50:34 -05:00
cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2022-11-15 02:37:28 +08:00
4042c26390
Fix 'undefined' in link preview generation
2022-11-14 18:05:52 +01:00
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
134b3b8ac1
Fix 'dayjs' is never used warning
2022-10-25 01:27:25 +02:00
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-10-22 16:22:28 +01:00
24cb212a37
Fix recurring
2022-10-15 20:15:50 +08:00
d8a676abb6
Implement recurring day of month and day of week
2022-10-15 18:49:09 +08:00
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2022-10-15 15:57:39 +08:00
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-13 00:32:05 +08:00
edacff123b
Add UTC in the serverTimezone dropdown
2022-10-12 22:13:07 +08:00
2faf866e9e
Implement generateTimeslot() for recurring interval type
2022-10-12 17:02:16 +08:00
39b6725163
Update maintenance tables
2022-10-11 21:48:43 +08:00
dfb75c8afb
Update status page's maintenance message
2022-10-11 20:56:48 +08:00
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +08:00
c1ccaa7a9f
WIP
2022-10-10 20:48:11 +08:00
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2022-10-10 16:50:25 +08:00
71af23cf00
Fix #2207
2022-10-10 02:47:24 +08:00
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +08:00
Henrik Gerdes
Louis Lam
Nelson Chan
Tarun Singh
Muhammed Hussein karimi
Peace
Peace
Janne Nowak
Christopher Wilkinson
Miles Steele
tombii
Thomas Spalinger
Matthew Nickson
Luke Hamburg
Faruk Genç
Suriya Soutmun
Joseph
c
long2ice
Sebastian Kaempfe
Adam Spurgeon
minhhoang
rmarops
Dafnik
Adam Stachowicz