Commit graph

261 commits

Author SHA1 Message Date
Louis Lam 370d522920 Pin dependency of axios-ntlm to 1.3.0. As 1.3.1 causes error 2022-11-25 14:00:33 +08:00
Louis Lam e0a1ad8a1c Update dependencies and drop start-server-watch-dev as it is unstable 2022-11-25 01:32:33 +08:00
Matthew Nickson 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
Matthew Nickson 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
Louis Lam cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
Feat/add gRPC protocol
2022-11-11 12:34:35 +08:00
Louis Lam 54efde8185 Update socket.io and remove an useless event listener 2022-10-29 23:29:33 +08:00
minhhn3 3d1237ed53 fix: resolve conflict 2022-10-26 20:50:34 +07:00
minhhn3 b459408b10 fix: resolve conflict 2022-10-26 20:41:21 +07:00
Louis Lam 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
Louis Lam b60dde0b2d Update SQLite 2022-10-15 15:18:54 +08:00
Louis Lam 2271ac4a5a Add info.serverTimezoneOffset and improve some styles 2022-10-11 14:52:47 +08:00
Louis Lam c1ccaa7a9f WIP 2022-10-10 20:48:11 +08:00
Louis Lam 539683f8e9 Merge remote-tracking branch 'origin/master' into maintenance 2022-10-10 16:50:25 +08:00
Louis Lam 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 2022-10-10 16:23:32 +08:00
Louis Lam a36f24d827 Add configurable server timezone 2022-10-09 20:59:58 +08:00
Louis Lam b007681e67 Merge remote-tracking branch 'origin/master' into karelkryda_master
# Conflicts:
#	server/model/monitor.js
#	server/model/status_page.js
#	src/languages/en.js
2022-10-09 19:26:00 +08:00
Louis Lam 1c8631af8d
Pin dependencies (#2205) 2022-10-09 16:02:47 +08:00
Louis Lam 6e07ed2081 Fix #2186 2022-10-07 15:02:19 +08:00
Louis Lam b993859926
Drop Jest e2e testing (#2174) 2022-10-05 14:26:30 +08:00
Matthew Nickson 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>
2022-10-02 01:52:53 +01:00
Louis Lam 9d99c39f30 Update Maintenance UI for recurring 2022-09-24 02:33:29 +08:00
Louis Lam 68875c3091 Fix merging issue 2022-09-13 22:22:01 +08:00
Louis Lam d63022676a Fix build issue after updated vite 2022-09-13 15:17:39 +08:00
Louis Lam 104d521633 Update vite from 2.9.9 to 3.1.0 2022-09-12 18:33:46 +08:00
Muhammed Hussein Karimi 626accedee change node version 2022-09-01 16:47:25 +04:30
Muhammed Hussein Karimi b890812411 use npm 7 2022-09-01 16:36:24 +04:30
Muhammed Hussein Karimi b9b00050dd fix package lock version 2022-08-28 21:37:19 +04:30
Muhammed Hussein Karimi 82dd9a7c16 golaert req fix and axios update for formdata 2022-08-24 10:36:29 +04:30
minhhn3 6bb79597e8 fix: resolve merge conflict 2022-08-13 13:26:05 +07:00
Louis Lam 2af754b5e8 Update package-lock.json 2022-08-11 21:09:16 +08:00
minhhn3 2232236a7a [empty commit] pull request for add gRPC protocol 2022-08-03 13:39:31 +07:00
Minh Hoàng dcecd10c88
Feat/add gRPC protocol (#1)
* feat: added monitor with gRPC

Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2022-08-03 12:00:39 +07:00
Louis Lam f1bcecb0c6 Merge package-lock.json 2022-07-24 14:08:03 +08:00
Louis Lam 239611a016 Do not set sendUrl if sendUrl is undefined 2022-07-22 23:27:02 +08:00
Louis Lam 8f7b7e74c9 socks-proxy-agent 6.2.X is a breaking change, freeze to 6.1.1. 2022-07-18 23:28:19 +08:00
Louis Lam 1999541802 Merge remote-tracking branch 'origin/master' into dns 2022-07-18 23:25:14 +08:00
Louis Lam 624678826d Move all frontend dependencies to devDependencies, as it is not used in the production environment 2022-07-04 03:59:20 +08:00
Louis Lam e8c3807594 Move all frontend dependencies to devDependencies, as it is not used in the production environment 2022-07-04 03:54:56 +08:00
Louis Lam e5e8db6c38 Add cacheable-lookup 2022-06-29 22:17:47 +08:00
Louis Lam 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
2022-06-27 10:50:38 +08:00
Louis Lam 9650418ef7 Fix dependencies warning 2022-06-25 20:55:14 +08:00
Louis Lam 1f5466a3e8 Revert #1598 2022-06-23 15:54:33 +08:00
Louis Lam d5da5af174 Update to 1.17.0 2022-06-22 20:13:39 +08:00
Christopher Pickering 660005b143
cleaned up code 2022-06-14 08:49:36 -05:00
Louis Lam f25ca96308 Update package-lock.json 2022-06-14 10:37:15 +08:00
Louis Lam b72a279361 Update package-lock.json 2022-06-13 18:54:02 +08:00
Louis Lam 7f432bd916 Remove axios-cached-dns-resolve-test 2022-06-13 18:52:08 +08:00
Louis Lam 04e22f17a9 Merge remote-tracking branch 'origin/master' into christopherpickering_master
# Conflicts:
#	package-lock.json
#	src/languages/en.js
2022-06-11 20:59:58 +08:00
Louis Lam a707b51053
Page Loading Speed Optimization (#1711)
* Update Vite.js to 2.9.9 and add Rollup Plugin Visualizer
* Prebuild gzip and brotli for assets

Original: ~1.2MB
Optimized: ~370KB
2022-06-05 23:43:25 +08:00
Louis Lam c095767f4a [Status Page] SSR 2022-05-30 15:45:44 +08:00
Louis Lam ffb7ba176c Merge remote-tracking branch 'origin/master' into status-page-inject-html 2022-05-30 14:00:39 +08:00
Louis Lam df4ce811d9 Merge remote-tracking branch 'origin/master' into kaysond_master
# Conflicts:
#	server/model/monitor.js
2022-05-28 23:19:58 +08:00
Christopher Pickering 87f933df4f
added sqlserver monitor 2022-05-12 12:48:03 -05:00
Louis Lam 59be9bb971 working 2022-05-11 00:51:11 +08:00
Louis Lam 4e3258579d Merge branch 'master' into uptime-badges
# Conflicts:
#	server/util-server.js
2022-05-07 13:26:47 +08:00
Louis Lam 96536ae391 Rebuild package-lock.json 2022-05-02 12:36:12 +08:00
Louis Lam 15820c6937 Update SQLite 2022-05-01 19:45:00 +08:00
Louis Lam d962ab7a1c Merge branch 'master' into uptime-badges
# Conflicts:
#	package-lock.json
#	server/routers/api-router.js
2022-05-01 17:03:11 +08:00
Louis Lam 023db1450d Fix #1577 2022-04-28 23:12:16 +08:00
Aram Akhavan 39df4eea92 Ssynchronize push monitor heartbeats to api calls
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
2022-04-26 13:48:44 -07:00
Louis Lam 4114f43b48 Start both dev servers in one command 2022-04-26 02:18:14 +08:00
Jens Neuber e103ac8335 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-04-20 10:10:14 +02:00
Louis Lam f712fe85e5 Update node-sqlite, sqlite from 3.36 to 3.38 2022-04-18 12:44:32 +08:00
Louis Lam 5fa62a888c Merge branch 'master' into mqtt2
# Conflicts:
#	server/database.js
#	server/util-server.js
2022-04-17 19:46:33 +08:00
Louis Lam 46e1a628a7 Update package-lock.json 2022-04-17 15:04:59 +08:00
Louis Lam 03bcf5c766 Add a simple mqtt server for testing 2022-04-17 01:07:54 +08:00
Louis Lam 64a0e1aa9b Update package-lock.json 2022-04-16 13:31:40 +08:00
Louis Lam 2b0c184a88 Update package-lock 2022-04-14 01:21:43 +08:00
Louis Lam 4738581c66 Update dependencies 2022-04-02 11:34:00 +08:00
Uğur Erkan 9e27acb511 Add socks proxy agent 2022-03-06 19:34:51 +03:00
Uğur Erkan 2cc7a990ff Add http and https agents 2022-03-06 19:29:28 +03:00
Louis Lam 3a5b413af4 Update axios to 0.26.0 due to vulnerability 2022-02-26 14:36:38 +08:00
Jens Neuber 454c1687cf Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-02-13 11:12:22 +01:00
Louis Lam 742ad083e5 Fix security vulnerabilities 2022-02-03 12:26:50 +08:00
Louis Lam 41f1686147 Fix security vulnerabilities 2022-02-03 12:20:15 +08:00
Jens Neuber 28be32fc68 Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges 2022-01-28 08:36:05 +01:00
Louis a0d51a15cf Fix security vulnerabilities 2022-01-18 01:24:07 +08:00
Louis Lam 9462646ad3 Fix vulnerabilities 2022-01-13 11:22:58 +08:00
Louis Lam 6014ed1156 Fix conflict 2022-01-13 11:19:26 +08:00
Jens Neuber 35360e2069 add badges 2022-01-03 15:48:52 +01:00
Louis Lam 5ee5ea909d Add Github Action: close-incorrect-issue.yml 2021-12-11 20:59:31 +08:00
Louis b62f1475ee 🐍 2021-12-05 16:28:59 +08:00
Louis Lam 9f0c66d775 fix node-sqlite3 security issues 2021-11-24 14:53:15 +08:00
Louis Lam 94ffeeeab6 update dependencies 2021-11-23 13:32:24 +08:00
Tarun Singh 6828e8ef6d Merge branch 'master' of https://github.com/tarun7singh/uptime-kuma 2021-11-03 21:47:44 -04:00
Tarun Singh 670754b697 added MQTT monitor type 2021-11-03 21:46:43 -04:00
Louis Lam 61135e8500 update package-lock.json 2021-10-31 13:18:06 +08:00
Louis 3e5ae00d25 update dependencies 2021-10-29 18:04:58 +08:00
Andreas Brett 8fb8cbdaf3 use auth0/jwt-decode 2021-10-26 13:15:31 +02:00
Louis Lam ff5f2e8dfb add limiter 2021-10-21 23:03:40 +08:00
Louis Lam 56094a43d7 add passwordStrength 2021-10-21 22:54:04 +08:00
Louis Lam 176fa6b60d merge package-lock.json 2021-10-16 16:32:28 +08:00
Nelson Chan 656a4d6270 WIP: Enable background jobs
WIP: Remove better-sqlite3
2021-10-09 21:46:59 +08:00
LouisLam 01812cc446 [test] add test for i18n currentLocale 2021-10-08 15:11:50 +08:00
LouisLam c0846124c2 update vite to 1.6.4, since it fixed the issue 2021-10-07 21:23:28 +08:00
Louis Lam 8c63536eb8
Merge pull request #451 from zsxeee/notification_form_i18n
Notification form i18n
2021-10-07 14:13:08 +08:00
LouisLam a8badb027d update modded node-sqlite3 to 6.0.0 2021-10-07 14:09:50 +08:00
zsxeee 7f1edb49bc
Fix i18n
Upgrade vue-i18n to 9.1.9.
Fix wrong tag name.
2021-10-07 00:04:13 +08:00
zsxeee 7002a778f0
Rollback vue-i18n version to 9.1.7 2021-10-06 19:12:23 +08:00
LouisLam e71f5bf314 update dependencies 2021-10-05 17:53:17 +08:00
LouisLam 79e0c9e1f1 setup unit test for setup 2021-10-05 17:39:44 +08:00
LouisLam 259bcf9426 [SMTP] "To Email" is not required if CC/BCC is set. (#461) 2021-10-05 15:57:13 +08:00
LouisLam a2a4c70cf5 setup jest-puppeteer 2021-10-03 18:16:55 +08:00
LouisLam 6513c3e75f allow update minor version only, to prevent the breaking change in the future like vite 2.6 2021-10-01 16:48:23 +08:00
LouisLam 1fa90bffaa freeze vite version to 2.5.* (2.6.* is broken when build the project) 2021-09-30 14:43:29 +08:00
LouisLam aaddfa1786 update package-lock.json 2021-09-29 13:30:28 +08:00
MrEddX 0f66e5cfc5 Added Bulgarian Language 2021-09-28 23:21:59 +03:00
LouisLam 51512b6f5f update dependencies 2021-09-24 19:00:06 +08:00
LouisLam 266b03fbf7 language key from "Status Page Nothing" to "statusPageNothing" 2021-09-24 14:42:54 +08:00
LouisLam fe0fc63843 [status page] send uptime 2021-09-22 15:10:08 +08:00
LouisLam 61c737c53c fix alert text color in dark mode 2021-09-21 17:24:46 +08:00
LouisLam 8230cfe13f use "next" tag to keep vue3 up-to-update 2021-09-16 20:07:26 +08:00
LouisLam 34abff4724 manual merge master 2021-09-14 14:19:23 +08:00
LouisLam ab6b97d77a update dependencies, fix axios security problem 2021-09-13 20:14:50 +08:00
LouisLam 59ff9fa293 update missing timezone console msg 2021-09-13 19:53:29 +08:00
Bert Verhelst ddcd3c2a19 Merge remote-tracking branch 'origin/master' into feature/timezones-package 2021-09-12 19:03:05 +02:00
Bert Verhelst 471333ad03 fix(util-frontend): revert typescript conversion 2021-09-12 18:56:39 +02:00
Bert Verhelst a7674755ba Move timezones to npm package and convert util-frontend.js to typescript 2021-09-12 13:27:41 +02:00
LouisLam 400fc13cf2 add npm install script for npm7 2021-09-12 12:39:22 +08:00
LouisLam 0d87a6dfea update vue to 3.2.8 2021-09-04 14:41:45 +08:00
LouisLam cd1a3a2fb9 revert back to node-sqlite3, as better-sqlite3 causes a lot of installation problems 2021-09-01 14:33:00 +08:00
LouisLam fa549cb80e fix npm7 broken dependencies 2021-08-31 20:36:17 +08:00
LouisLam ec731d174d Merge branch 'MichelBaie_master' 2021-08-31 20:02:39 +08:00
LouisLam 0d65918a6a change bcrypt to bcryptjs, use my own prebuilt better-sqlite3, supports more prebuilt 2021-08-31 19:56:44 +08:00
LouisLam 8318c2e8ff add a simple dns server for testing, and disable ipRegex for dev only (need to input port) 2021-08-26 01:50:27 +08:00
LouisLam 393c4fb1a7 update stylelint 2021-08-24 23:22:04 +08:00
LouisLam dd4c00eed3 add vue i18n 2021-08-24 16:44:58 +08:00
LouisLam 2f50fc4c00 plan to switch to better-sqlite3, drop node-sqlite3 2021-08-23 17:27:03 +08:00
LouisLam 4571a9b8c1 check update 2021-08-21 19:50:22 +08:00
LouisLam 61944d642e wip: implementing install script 2021-08-19 02:04:49 +08:00
LouisLam 0b45694f2f update all dependencies 2021-08-16 01:42:39 +08:00
Nelson Chan 48c6d8f19f Feat: Display recent ping chart 2021-08-11 23:40:51 +08:00
LouisLam 24b87fcd5a update vue to 3.2.1 2021-08-11 22:41:33 +08:00
LouisLam adcd251076 Merge branch 'master' into redirects&status 2021-08-06 19:26:44 +08:00
LouisLam d3e24df225 fix high severity vulnerabilities by using my fork sqlite3 package 2021-08-06 18:22:30 +08:00
LouisLam 8350bff629 update dependencies 2021-08-05 22:46:48 +08:00
Nelson Chan 8f7885e58a Feat: Implement MaxRedirects & StatusCodes 2021-08-05 19:04:38 +08:00
Nelson Chan cdaa0a54a4 Fix: use new version of babel-eslint-parser 2021-07-30 12:35:33 +08:00
Nelson Chan b91e9ddb7a Fix: Add babel-eslint 2021-07-30 12:33:01 +08:00
LouisLam 081abcb6a1 add util.ts for sharing common functions between frontend and backend 2021-07-30 11:23:04 +08:00
LouisLam 71af902a4e add fields to EditMonitor.vue 2021-07-30 01:09:14 +08:00
LouisLam 4b86c84c36 fix icon for "Resume" 2021-07-30 01:02:41 +08:00
LouisLam 6bce270f42 cleanup code 2021-07-28 20:35:55 +08:00
LouisLam 209fa83cff Add Basic Auth for /metrics 2021-07-28 00:52:31 +08:00
LouisLam 934b797623 Merge branch 'master' into feature/add_prometheus_metrics
# Conflicts:
#	server/model/monitor.js
2021-07-27 23:13:03 +08:00
LouisLam cafd2c7388 add vue-fontawesone 2021-07-27 16:52:44 +08:00
Matthew Macdonald-Wallace 7acb265559 Remove bcryptjs and node-gyp, they should not be here... 2021-07-22 09:01:51 +01:00
Matthew Macdonald-Wallace 582fb2fe29 Export general metrics via the /metrics endpoint 2021-07-22 08:43:04 +01:00
LouisLam a64ce81457 update package-lock.json 2021-07-22 10:55:55 +08:00
LouisLam 05fdaf0c96 update package-lock.json 2021-07-19 00:43:25 +08:00