ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-30 18:24:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
5590 commits 30 branches 115 tags 68 MiB
Commit graph

1732 commits

Author SHA1 Message Date
Frank Elsinga
132f68a370
Merge branch 'master' into 4864-slack-button-broken 2024-06-28 01:14:46 +02:00
Brodie Davis
6eaf6b409c fix not utilizing fetched address 2024-06-27 14:04:03 -04:00
Brodie Davis
4b3ad53512 revert using url getter in monitor json 2024-06-27 14:03:34 -04:00
Louis Lam
85c67b6866
Revert "Switch back to TryGhost/node-sqlite3 from louislam/node-sqlite3" (#4879) 2024-06-24 15:52:07 +08:00
Brodie Davis
a19f417896 utilize extractAdress helper 2024-06-23 21:18:42 -04:00
Brodie Davis
0325c14d42 remove unneeded validation 2024-06-23 21:16:27 -04:00
Louis Lam
83969d2112
Update dependencies and embed axios-ntlm 1.3.0 into the project (#4877) 2024-06-24 02:08:39 +08:00
Louis Lam
dc15443716
Revert "Fix: Use retryInterval when a monitor is DOWN" (#4875) 2024-06-23 23:46:52 +08:00
Brodie Davis
2c8cefc784 use string url in json, not url object 2024-06-20 12:10:49 -04:00
Brodie Davis
94f75b2fbc invalidate url field for irrelevant monitor types 2024-06-20 12:05:15 -04:00
Brodie Davis
1488b1f17b prevent invalid url strings in monitorJSON 2024-06-20 11:54:20 -04:00
Qi Zhao
4941b17a46 perf: ⚡️ revert some overengineer code 2024-06-20 10:50:35 +08:00
Qi Zhao
58533e8f06 Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
3f425dc160 Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
f63d36478d Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
7270caccae Update server/routers/api-router.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-20 10:50:35 +08:00
Qi Zhao
53c4bba387 fix: 🐛 badge requestedDuration 2024-06-20 10:50:35 +08:00
Qi Zhao
e5ff86e6ac fix: 🐛 status & ping badge duration 2024-06-20 10:50:35 +08:00
booooza
39b0c62c1d
Refactor error handling to improve clarity and maintainability 2024-06-17 08:34:53 +02:00
Matt Visnovsky
a0374487ce C&P typo from review 2024-06-14 16:44:36 -06:00
booooza
2e5e103434
New notification provider: Threema Gateway 2024-06-14 12:25:19 +02:00
Matt Visnovsky
092688a5c8 ES Lint 2024-06-13 12:15:13 -06:00
Matt Visnovsky
6fc0cbf415 ES Lint 2024-06-13 12:12:17 -06:00
Frank Elsinga
9f563adc1a
fixed formatting mistakes 2024-06-13 17:04:38 +02:00
Frank Elsinga
c9132adfc7
made sure that the address extraction is extracted into its own method 2024-06-13 17:00:11 +02:00
Frank Elsinga
c124f3a43e
Formtting fix 2024-06-12 23:24:10 +02: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
Francesco M
bd95ccdc64
Update server/notification-providers/zoho-cliq.js 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-06-12 18:14:05 +02:00
Francesco M
82fb7b2816
improved zoho-cliq message format: 
- show PORT (cloned switchcase from discord,squadcast,servenio)
- show monitorName in the first row to get on point also from messagge preview notification
- avoid duplication of monitorName and monitorName in the message content
 2024-06-12 08:46:48 +02:00
Frank Elsinga
b6cd21c71a
Removed where I was wrong about imports 2024-06-07 15:54:28 +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
2d2c1866df Fix: a typo 2024-06-05 15:40:07 -06:00
Matt Visnovsky
b2d76bc60a Refactor line for conciseness 2024-06-05 15:39:55 -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
d74facded6 removed some monitor drift in terms of imports and documentation 2024-06-04 05:01:53 +02:00
Frank Elsinga
10ebdcacaa
Fix: Use retryInterval when a monitor is DOWN (#4476) 2024-06-03 21:47:43 +02:00
nino
30bf7a5e23 fix: update Feishu notification provider configuration 2024-05-29 22:22:05 +08:00
nino
4e63d00007 feat: update feishu notification template 2024-05-29 18:20:33 +08:00
Stefan Ottosson
9c7aa13190
fix: remove check that method is correct 2024-05-24 08:29:09 +02:00
Stefan Ottosson
1ac5696463
Merge branch 'master' into feature/http-method-push-monitor 
# Conflicts:
#	src/pages/EditMonitor.vue
 2024-05-23 17:34:45 +02:00
Nicolas Verlhiac
b1e95968c0
New notification provider: SMS Partner API (#4769) 
Co-authored-by: Nicolas Verlhiac <nicolas@novariom.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-22 22:53:49 +02:00
Louis Lam
88b7c047a8
Switch back to TryGhost/node-sqlite3 from louislam/node-sqlite3 (#4773) 2024-05-20 10:42:37 +08: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
Furkan İ
55b2d4b907
Add Bitrix24 Webhook notification (#3620) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
 2024-05-19 23:33:32 +02:00
Damon
168d1ca24f
refactor: upload check label when monitor empty (#3661) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-19 23:17:09 +02:00
Nelson Chan
a581a85633
Feat: Use UptimeCalculator for PingChart (#4264) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-19 22:03:32 +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
TheDanniCraft
4e24e96dab
[discord] thread/forum channel support (#4099) 2024-05-19 21:14:13 +02:00
Louis Lam
6bfb1be71a
Improve MariaDB's connection (#4728) 2024-05-19 22:46:22 +08:00
jmolnar-comparative
237a6e8da9
chore: fixed a typo for internal, unused part of the file upload icon for status page (#4750) 2024-05-10 20:35:36 +02:00
Matt Visnovsky
d25ee8f128 Using JSON Query Expressions 
Equivalent functionality as before, but we're now building json-query expressions for the user.
 2024-05-10 10:56:38 -06:00
Matt Visnovsky
1c4740748c Re-use monitor.radiusPassword for community string 2024-05-08 11:00:10 -06:00
Matt Visnovsky
da8f0d1c31
Apply suggestions from code review 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-05-08 10:06:20 -06:00
Matt Visnovsky
2b5d100cd3 Ensure SNMP session is closed properly 
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589858252

Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
 2024-05-06 15:56:41 -06:00
Matt Visnovsky
e9b52eb0e7 Separate error cases for SNMP varbind returns 2024-05-06 14:06:40 -06:00
Matt Visnovsky
c68b1c6274 Remove unnecessary func getKey 2024-05-06 12:05:12 -06:00
Matt Visnovsky
433e317eee Simplify error catch 
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
 2024-05-06 09:57:13 -06:00
Matt Visnovsky
1fe1bb5864 Given that above throws, the else case is not nessesary 
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
 2024-05-06 09:53:14 -06:00
Matt Visnovsky
997791bc78 Default: invalid condition error 
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
 2024-05-06 09:51:37 -06:00
Matt Visnovsky
0384b34007 Remove unnecessary func getKey 
Addresses:
- https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589856311
- https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589862733
 2024-05-06 09:49:36 -06:00
Matt Visnovsky
0280b2ad3f A comment about varbinds[0] for clarification 
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589855126
 2024-05-06 09:21:49 -06:00
Matt Visnovsky
4386d0afad Apply suggestions from code review 
Addresses:
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589805237
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589806199
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589853470
-https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1589854032
 2024-05-05 15:47:43 -06:00
Matt Visnovsky
09fd816aae Updated code comments 2024-05-03 11:52:02 -06:00
Matt Visnovsky
c87ac2f043 Move getKey() to util.ts 2024-05-03 11:39:14 -06:00
Matt Visnovsky
8e56a81ef1 Refactor how strings/numerics are parsed 
Fixes issue `toString() radix argument must be between 2 and 36` due to `.toString("ascii")` conversion. This issue was introduced in 704ffd3f4b.
 2024-05-02 15:11:03 -06:00
Matt Visnovsky
f059d54349 Use frontend timeout 
Addresses https://github.com/louislam/uptime-kuma/pull/4717#discussion_r1585616669
 2024-05-02 15:07:22 -06:00
Matt Visnovsky
9ba0f68a86 Remove supurfluous log.debug 
Co-Authored-By: Frank Elsinga <frank.elsinga@tum.de>
 2024-04-30 18:19:18 -06:00
Matt Visnovsky
7459654e11 ES Lint Compliant 2024-04-30 18:04:59 -06:00
Matt Visnovsky
ba47aca51f
Apply suggestions from code review 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-04-30 17:54:29 -06:00
Frank Elsinga
b4bd003626
Merge branch 'master' into snmp-monitor 2024-05-01 00:01:03 +02:00
Matt Visnovsky
704ffd3f4b Finalized SNMP monitor 2024-04-30 15:18:25 -06: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
Ezhil Shanmugham
988ba79679
feat: keephq notification provider (#4722) 2024-04-30 16:17:34 +02:00
Matt Visnovsky
99dc4cfb46 Wrong variable used 
Thanks for pointing it out @CommanderStorm!
 2024-04-29 22:24:51 -06:00
Matt Visnovsky
4a882be6ba Further SNMP monitor development 
Further testing of SNMP feat, however I'm running into the issue `Error in SNMP check: RequestTimedOutError: Request timed out` when the check function is called. I am unsure as to why since my local SNMP script works great with very similar code.
 2024-04-29 15:59:59 -06:00
Matt Visnovsky
a3cdd69995 Use net-snmp instead of snmp-native 
net-snmp over snmp-native is:
-more robust
-more popular
-better documented
-supports v3
 2024-04-29 13:58:43 -06:00
Joschua Becker
19e8c75c3b
SevenIO Notification Provider (#4219) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-04-27 23:40:59 +02:00
凯观生活
126d6cd912
Add the ability to notify @everyone in DingTalk notifications (#4718) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-04-27 17:16:39 +02:00
Matt Visnovsky
d92003e172 SNMP Initial Commits 
This commit introduces a new SNMP monitor feature to the application, allowing users to monitor devices using SNMP (Simple Network Management Protocol).
 2024-04-26 19:05:56 -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
27bcc968ec
Update server/util-server.js 
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
 2024-04-25 23:45:30 +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
BigBoot
bab427f715
Add loginRequired SocketIO event (#4636) 2024-04-21 20:39:44 +02:00
Louis Lam
7a9e2f5de6
Merge pull request from GHSA-23q2-5gf8-gjpp 2024-04-19 01:08:31 +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
Edoardo Ridolfi
822ce5384b
Add support for Whapi notification provider (#4323) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-04-03 02:22:01 +02:00
Merlin
937c8a9a7b
New notification provider: CallMeBot API (#4605) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-04-02 21:39:45 +02:00
Daan Meijer
effd0197ac
[Slack] restructure alert actions, add 'visit site' button (#3886) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Nelson Chan <3271800+chakflying@users.noreply.github.com>
 2024-04-02 02:43:54 +02: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
Simon Nilsson
0923d05317
Cellsynt mobile services (#4625) 
Co-authored-by: Frank Elsinga <frank@elsinga.de>
 2024-03-29 16:27:54 +01: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