5c4180fb45
Merge conflicts
1 year ago
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>
1 year ago
18d8b3a8e0
Merge remote-tracking branch 'origin/master' into feat/webhook-custom-body
1 year ago
771d21c4ad
Update dependencies ( #3384 )
1 year ago
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
1 year ago
8223121cd8
Update to 1.22.1
1 year ago
ff22010330
Update dependencies
1 year ago
a9d691a6a8
Update dependencies
1 year ago
df8fcffb19
Drop unused code
1 year ago
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
1 year ago
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
4b913c8b4c
Update to 1.22.0
1 year ago
d01c7c3faa
Update package-lock.json
1 year ago
97d38ee1a8
Feat: Add custom body for Webhook Notif.
1 year ago
149f8c3646
Update required node version and update dependencies
1 year ago
c06b929529
Update dependencies
1 year ago
71c34694b7
Update to 1.22.0-beta.0
1 year ago
2128ed5ce3
Update dependencies
1 year ago
771ca09331
npm update (mainly for socket.io)
2 years ago
83a59bd984
Fix: Add password filtering
2 years ago
0d1b5321ad
🚀 Update legacy deps
2 years ago
a27386bb92
Fix: Use croner for clear-old-data
2 years ago
33de7bdb1c
Merge conflict
2 years ago
8a3bce44ef
Update dependenices
2 years ago
8c9423f4de
Merge conflicts manually
2 years ago
beb22f743d
Chore: Update chart.js & improve perf.
2 years ago
beafbf27ad
Merge pull request #2858 from louislam/1.20.X
...
Merge 1.20.x to master
2 years ago
669f8700b2
Switched to nanoid for key generation
...
To try and prevent any security issues, use an external package to
generate key instead of doing it ourselves. Note: we have to use nanoid
version 3 as nanoid version 4 requires ESM. Currently, nanoid v3 is
still supported.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
5b0b743f81
Update to 1.20.2
2 years ago
3c5f998191
Update mongodb to 4.14.0, possibly fix #2820
2 years ago
fdc3b2d57a
Update to 1.20.1
2 years ago
c5ff010669
Add loose dependency `qs` which is used by `aliyun-sms.js`
2 years ago
f1bac7ce8a
Add a script that deploy to the demo server
2 years ago
4056951915
WIP: building database in knex.js
2 years ago
c30e88ece2
Update dependencies
2 years ago
b0673ba9ce
Merge pull request #2570 from Computroniks/feature/#2365-allow-markdown-in-status-page-footer
...
Add support for markdown on status page
2 years ago
683f446cf5
Add support for `.env`
2 years ago
a8f0f1d872
Merge manually and remove to devDependencies
2 years ago
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
0a58069742
Merge pull request #2641 from louislam/1.19.X
...
Merge 1.19.6 to 1.20.X
2 years ago
6cd6a2edf0
Fix ping issue on Windows #2636
2 years ago
54d4c4d3f7
Merge package-lock.json
2 years ago
e9497ac1ab
Fix knex.js issue
2 years ago
d9f12a6376
Fallback to `/bin/ping` if `ping` is not found
2 years ago
774d754b21
Add GameDig monitor
2 years ago
fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
...
feat: Change ping module to danielzzz/node-ping
2 years ago
4239cf4255
Pin dependency of `ping`
2 years ago
4bf23fdd1a
Update jsonwebtoken from ~8 to ~9
2 years ago
f99a64da67
Run `npm update`
2 years ago
73835f3328
Changed from ping-lite to ping module
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
#Fixes 2126
2 years ago
f6ea1fe9a5
he-IL ( #2460 )
2 years ago
92caec95fe
Added new language German (Switzerland)
2 years ago
8cdbe37f6f
Update core-js
2 years ago
370d522920
Pin dependency of axios-ntlm to 1.3.0. As 1.3.1 causes error
2 years ago
e0a1ad8a1c
Update dependencies and drop `start-server-watch-dev` as it is unstable
2 years ago
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2 years ago
54efde8185
Update socket.io and remove an useless event listener
2 years ago
3d1237ed53
fix: resolve conflict
2 years ago
b459408b10
fix: resolve conflict
2 years ago
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
b60dde0b2d
Update SQLite
2 years ago
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2 years ago
c1ccaa7a9f
WIP
2 years ago
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
bd42450e55
Update vue-i18n from 9.1.9 to 9.2.2, force to use production version of vue-i18n in order to improve the performance
2 years ago
a36f24d827
Add configurable server timezone
2 years ago
b007681e67
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/model/monitor.js
# server/model/status_page.js
# src/languages/en.js
2 years ago
1c8631af8d
Pin dependencies ( #2205 )
2 years ago
6e07ed2081
Fix #2186
2 years ago
b993859926
Drop Jest e2e testing ( #2174 )
2 years ago
f9be918246
Add support for MySQL/MariaDB databases #1817
...
This commit adds support for monitoring MySQL and MariaDB database
servers. The mysql2 package was choosen over mysql as it provides a
promise wrapper and is reportedly faster than the original mysql package
whilst still maintaining the same API.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
9d99c39f30
Update Maintenance UI for recurring
2 years ago
68875c3091
Fix merging issue
2 years ago
d63022676a
Fix build issue after updated vite
2 years ago
104d521633
Update vite from 2.9.9 to 3.1.0
2 years ago
626accedee
change node version
2 years ago
b890812411
use npm 7
2 years ago
b9b00050dd
fix package lock version
2 years ago
82dd9a7c16
golaert req fix and axios update for formdata
2 years ago
6bb79597e8
fix: resolve merge conflict
2 years ago
2af754b5e8
Update package-lock.json
2 years ago
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
f1bcecb0c6
Merge package-lock.json
2 years ago
239611a016
Do not set sendUrl if sendUrl is undefined
2 years ago
8f7b7e74c9
socks-proxy-agent 6.2.X is a breaking change, freeze to 6.1.1.
2 years ago
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
624678826d
Move all frontend dependencies to devDependencies, as it is not used in the production environment
2 years ago
e8c3807594
Move all frontend dependencies to devDependencies, as it is not used in the production environment
2 years ago
e5e8db6c38
Add cacheable-lookup
2 years ago
8542e6cbb9
Drop npm-check-updates due to security vulnerability of `got`, and it is unlikely to be fixed shortly
...
Read more:
https://github.com/raineorshine/npm-check-updates/pull/1147#event-6880466174
2 years ago
9650418ef7
Fix dependencies warning
2 years ago
1f5466a3e8
Revert #1598
2 years ago
d5da5af174
Update to 1.17.0
2 years ago
660005b143
cleaned up code
2 years ago
f25ca96308
Update package-lock.json
2 years ago
b72a279361
Update package-lock.json
2 years ago
7f432bd916
Remove axios-cached-dns-resolve-test
2 years ago
Louis Lam
Muhammed Hussein karimi
Nelson Chan
Zaid-maker
Matthew Nickson
Adam Spurgeon
thefourCraft
Silvio Wangler
minhhn3
Minh Hoàng
Christopher Pickering