Andrey/uptime-kuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,711 Commits 20 Branches 128 Tags 54 MiB
751fe1bbf5
Commit Graph

637 Commits

Author SHA1 Message Date
Louis Lam
6e49601eed
Enforce UP status for non-custom status monitors (#6433) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
 2025-11-28 20:25:06 +08:00
PoleTransformer
5d1b372072
Add Websocket Upgrade Test (#5613) 
Co-authored-by: Your Name <you@example.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2025-11-27 21:05:44 +01:00
broodroosterdev
5c83b17992
feat: Add toggle to hide the uptime percentage on a statuspage (#4587) 
Co-authored-by: Bas Wieringa <bas.wieringa@waterplatformcompany.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-11-25 00:28:42 +00:00
Shaan
0eebe86f81
feat: add SSL/STARTTLS option and certificate monitoring to TCP Port monitor (#6401) 
Co-authored-by: Jacques ROUSSEL <jacques.roussel@rouaje.com>
Co-authored-by: rouja <jacques0roussel@gmail.com>
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-11-24 18:30:13 +13:00
RickVdrongelen
5701a97ad9
feat(prometheus): add tags to prometheus metrics (#5845) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-11-18 22:38:31 +13:00
Frank Elsinga
dda1a3f442
Chore:extracted the redis monitor to a different monitoring type (#4393) 
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2025-11-16 04:55:38 +08:00
Frank Elsinga
c4c747407e
Merge branch 'master' into feature/umami-analytics-status-page 2025-11-11 16:52:25 +01:00
Dorian Grasset
2d8918a1b8
feat: enhance monitor deletion functionality by adding child deletion… (#6314) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-11-11 03:52:13 +01:00
Frank Elsinga
fd07cf7f7b
Merge branch 'master' into feature/umami-analytics-status-page 2025-10-27 22:29:44 +01:00
Louis Lam
a3672a6afb
Fix: disable eqeqeq for UPTIME_KUMA_LOG_RESPONSE_BODY_MONITOR_ID (#6271) 2025-10-28 04:01:24 +08:00
Frank Elsinga
79611aca3c
Merge branch 'master' into feature/umami-analytics-status-page 2025-10-27 13:16:29 +01:00
Louis Lam
2d50d68da0
Fix: Maintenance: Handle optional startDateTime to prevent errors when null (#6189) 2025-10-16 07:30:00 +08:00
Mário Garrido
f525b54825
Merge branch 'master' into feature/5934 2025-07-26 09:47:07 +01:00
Paulus Lucas
2a6d9b4acd
Add Websocket path to mqtt monitor for WebSocket connection (#6009) 
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: lupaulus <20111917+lupaulus@users.noreply.github.com>
 2025-07-24 22:04:43 +02:00
Mário Garrido
38037f5673
Merge branch 'master' into feature/5934 2025-07-18 09:15:11 +01:00
Ionys
7c88a38df3
Fixing recurring maintenance start (again) (#5914) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-07-16 17:28:29 +02:00
yumeiyin
d490285a44
chore: fix some minor issues in comments (#5984) 
Signed-off-by: yumeiyin <yin.yumei@qq.com>
 2025-07-14 10:08:53 +02:00
Mario Garrido
d9fa67ae03 Monitor GameDig: Resolve domain to IP before request 2025-07-01 05:36:58 +01:00
Ryan Hartje
9506b3a16b
feat: Add optional audience for http-monitors via the oauth2 client credentials flow (#5950) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-30 02:37:41 +02:00
Louis Lam
10fd6ede1e
[Eliminate Blocking] Docker monitor (#5927) 2025-06-25 13:39:00 +08:00
Louis Lam
4962817795
[Eliminate Blocking] User related (#5928) 2025-06-19 14:29:43 +08:00
Fabian Triebsch
f282422b22
added option to force ipv4 or ipv6 for http(s) monitor type (#5880) 
Co-authored-by: Ionys <9364594+Ionys320@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-13 08:14:55 +02:00
grvwy
8909cd008c
feat: add multiple tags in bulk for a monitor (#5846) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-12 03:52:35 +02:00
Ionys
c7bacbb7fe
Ensure maintenance are always runned at the right moment (#5903) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-06-12 01:42:25 +02:00
Ionys
4d51aaa6f8
Fix invalid maintenance date (#5901) 2025-06-12 00:28:04 +02:00
Filippo
839ead80cc
Enhanced ping monitor with advanced options (count, timeout, numeric) (#5588) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-05-24 02:57:39 +02:00
Brad Koehn
c67f6efe29
added SMTP monitor (#5489) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-05-18 22:35:55 +02:00
Ionys
2b3f49a266
Add a public URL field for monitors and uses it on the status page (#5435) 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2025-05-10 19:05:37 +02:00
Angelo Al Yacoub
acb0968fe5
Merge branch 'master' into feature/umami-analytics-status-page 2025-04-29 21:12:10 +02:00
II-EMC
b3a11a4d9d
fix: Add name to preparePreloadData call in sendNotification as a better fix for #5760 (#5769) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-04-27 18:30:18 +02:00
Frank Elsinga
0876b1cbf5
chore:extracted the group monitor to a different monitoring type (#4395) 2025-04-22 13:14:12 +02:00
hadestructhor
28e288db2c fix(analytics): fixed issues with db init and refactor of code and names 2025-04-10 23:48:46 +02:00
Angelo Al Yacoub
0588acb40a
Merge branch 'master' into feature/umami-analytics-status-page 2025-04-10 22:48:30 +02:00
Fred Nnaji
230832c382
Update TLS expiration warning (#5659) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2025-03-07 21:49:38 +01:00
hadestructhor
6bade1fe81 feat: add support for plausible, cleanup and refactor code 2025-02-19 00:08:30 +01:00
hadestructhor
e44ec55eda chore: cleanup and refactoring 2025-02-18 00:45:53 +01:00
hadestructhor
afae736972 feat: add support for umami tracking 2025-02-09 14:06:25 +01:00
Ionys
595b35fb15
fix(tags): Fix the tag deletion (#5298) 2024-11-02 13:09:23 +01:00
Suven-p
c01494ec33
feat: add RabbitMQ monitor (#5199) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-10-20 15:57:03 +02:00
Peace
85dfe1f5d1
fix: some errors from the performance optimization (#5196) 2024-10-16 13:25:35 +02:00
Louis Lam
eca90a2b00
Revert "feat: structured logging (JSON)" (#5175) 2024-10-09 07:43:44 +08:00
Louis Lam
4829ad8c5d
Revert "Extend Prometheus Labels to include tags (requires restart for NEW labels on the monitor to be visible)" (#5174) 2024-10-09 07:17:11 +08:00
vishalsabhaya
d0067a0a12
improve page load performance of large amount urls (#5025) 
Co-authored-by: vishal sabhaya <vishals@vebuin.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-10-06 03:36:54 +02:00
Cassandra
b287a25de7
feat: structured logging (JSON) (#5118) 2024-09-24 17:51:21 +08:00
Jakob Lindskog
935194bca3
feat: implement very crude and bare-bones RSS feed (#5047) 2024-09-03 13:51:34 +02:00
Shaun
36f8be040d
Monitor Conditions (#5048) 2024-08-30 21:48:13 +02:00
Dan Sullivan
dc3ad88fe1
Add option to pass cache bust param (#3525) 
Co-authored-by: Dan Sullivan <dan@symbiosgroup.co.uk>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-08-24 22:57:31 +02:00
Thomas Spalinger
643d28cebc
Extend Prometheus Labels to include tags (requires restart for NEW labels on the monitor to be visible) (#4704) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-08-24 18:02:57 +02:00
taisei
cd5644d6d2
Remove markdown with meta tags (#4968) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-07-31 17:58:13 +02:00
Frank Elsinga
1822b55846
Merge branch 'master' into master 2024-07-16 00:30:48 +02:00
buzzinJohnnyBoi
30f7b48987 updated comments and ran linter on inferDuration 2024-07-15 17:04:16 -04:00
buzzinJohnnyBoi
4836f72cb8 added inferDuration to calculate cron duration 2024-07-15 16:56:41 -04:00
Frank Elsinga
71f9384c09
Merge branch 'master' into snmp-monitor 2024-07-15 21:57:12 +02:00
John Campbell
7f64badb06
Update comment on recurring-interval type maintenance 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-07-13 22:03:13 -04:00
buzzinJohnnyBoi
4750bd1e36 Fixed "recurring-interval" type maintenance - added comments 2024-07-13 14:08:53 -04:00
buzzinJohnnyBoi
d61688315d Updated croner to 8.1.0 and fixed "recurring-interval" type maintenance 2024-07-13 13:58:36 -04:00
Louis Lam
dc15443716
Revert "Fix: Use retryInterval when a monitor is DOWN" (#4875) 2024-06-23 23:46:52 +08:00
Frank Elsinga
248aec8803
Formtting fix 2024-06-12 23:24:01 +02:00
Matt Visnovsky
b5a73e5ad7
Apply suggestions from code review 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-12 14:25:25 -06:00
Frank Elsinga
5dc4bb64d5
Merge branch 'master' into snmp-monitor 2024-06-12 19:55:31 +02:00
Matt Visnovsky
fdc145bffd Added Robustness 
There are a lot of changes here:
-Fixed a lot of issues encountered during my testing
-JSON path is evaluated BEFORE making comparisons (this was the true intended behavior by @chakflying)
-Variable name changes (cosmetic)
-Added != operator
-Changed jsonQueryDescription (again)
 2024-06-06 18:52:33 -06:00
Matt Visnovsky
eaa935cba0 Also return result of the evaluation 
-Maximum compatibility with @chakflying's existing json-query monitor code.
 2024-06-06 10:09:35 -06:00
Matt Visnovsky
efb1642e3c Blend json-query and snmp monitors 
Utilizes the JSON Query library to handle comparison logic.
 2024-06-05 16:09:53 -06:00
Matt Visnovsky
7eee5db4d2 Variable changes 
-Reuse expected_value for snmpControlValue
-Create jsonPathOperator for snmpCondition
 2024-06-05 15:37:47 -06:00
Frank Elsinga
10ebdcacaa
Fix: Use retryInterval when a monitor is DOWN (#4476) 2024-06-03 21:47:43 +02:00
HdroguettA
daca38a554
Ignore TLS/SSL error for Redis (#3878) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-19 23:34:01 +02:00
Sebastian Lang
a3ac954140
Add support for custom mongodb commands (#4445) 
Co-authored-by: Sebastian Lang <sebastian.lang@damovo.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-19 21:59:57 +02:00
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
Matt Visnovsky
1c4740748c Re-use monitor.radiusPassword for community string 2024-05-08 11:00:10 -06:00
Frank Elsinga
b4bd003626
Merge branch 'master' into snmp-monitor 2024-05-01 00:01:03 +02:00
Matt Visnovsky
9d28fcff1a Update bean model backend 
Updates appropriate values async when editing the SNMP monitor
 2024-04-30 15:13:16 -06:00
Louis Lam
1d091739c8
Update server/model/monitor.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2024-04-26 15:01:03 +08:00
Louis Lam
c0db036187
Update server/model/monitor.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2024-04-25 23:45:24 +08: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
1490443618
Fix: Getting TLS certificate through proxy & prometheus update (#4700) 2024-04-24 14:37:17 +08:00
CoolCu
b25ac55a2f
chore: fix some typos in comments (#4679) 
Signed-off-by: CoolCu <coolcui@qq.com>
 2024-04-16 16:59:07 +02:00
Nelson Chan
893278bd3d
Feat: Use keylog event to obtain TLS certificate for better reliability [1.23.X] (#4630) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-04-06 18:43:08 +08:00
Frank Elsinga
0e3b3a9ab8
Made sure that more of the async usages are awaited (#4574) 2024-03-15 15:02:55 +01:00
Frank Elsinga
2a3a2201e6
make monitor start() and stop() async (#2830) 2024-03-09 23:36:00 +01:00
Andi Pätzold
a0c62d8ab0
Fix: handle monitor names with slashes (#4472) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-03-03 17:59:38 +08:00
Frank Elsinga
81e465f418
Removed debug statement 2024-02-11 20:02:09 +01:00
Neel Bhanushali
a5d0f7a7db console added with double quotes and semicolons. console added with username so i can remove later 2024-02-11 21:42:20 +05:30
Neel Bhanushali
a16b42f98c poc done 2024-02-11 21:33:58 +05:30
Frank Elsinga
dc3abc68f0
Fixed type anotation 2024-01-30 17:54:04 +01:00
Frank Elsinga
89158be7de
Merge branch 'master' into monitor_async_start_stop 2024-01-30 17:53:21 +01:00
Nelson Chan
2b8f55194f
Fix: [JSON-Query] Prevent parsing string-only JSON (#4425) 2024-01-28 03:18:24 +08:00
Adam Stachowicz
458cdf9f9b
Fix encodeBase64 for empty password or user in HTTP Basic Authentication (#4326) 2024-01-07 02:06:06 +08:00
Nelson Chan
c9fe6b5d01
Feat: Refresh login token for the client initiating password change (#4214) 2023-12-18 19:52:49 +08:00
HdroguettA
f24c3583fb
Attempt an OAuth2 Refresh on 401 (#3903) 2023-12-17 17:21:07 +08:00
Nelson Chan
89beb5f264
Fix: Handle trailing slash for status page routing (#4185) 
* Fix: Handle trailing slash

* Chore: Add desc for default slug

* Chore: Use margin instead of space

* Minor
 2023-12-11 03:05:13 +08:00
Louis Lam
530c8e5328
Drop cacheable-lookup (#4178) 
* WIP

* WIP
 2023-12-11 02:01:56 +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
dakriy
80efe9b831
Handle cookies on redirection (#3589) 
* feat: Set and send cookies on redirection (louislam#3587).

* feat: Make proxy agents handle cookies

* Merge package-lock.json

* Merge package-lock.json

* Fix lint

---------

Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
 2023-11-29 17:25:33 +08:00
Louis Lam
5bc8c0c66f
Merge 1.23.7 (#4102) 
1.23.x merge to 2.x.x
 2023-11-25 03:32:12 +08:00
Louis Lam
e9bf02fc2c Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2 
# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js
 2023-11-25 03:25:03 +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
121d1a11af
Revert "Restart running monitors if no heartbeat (#3952)" (#4088) 
This reverts commit c43223a16d.
 2023-11-24 02:23:38 +08:00
Louis Lam
bf58838b89
+10 seconds for Abort signal (#4053) 
* Debug only

* Remove debug
 2023-11-22 16:03:03 +08:00
Nelson Chan
33ce0ef02c
Fix: Improve error message on timeout (#4054) 
* Fix: Improve error message on timeout

* Chore: Format
 2023-11-21 23:56:17 +08:00