Commit graph

523 commits

Author SHA1 Message Date
Louis Lam 02291730fe WIP 2023-03-31 04:04:17 +08:00
Louis Lam 4ae437dd61 Update to 1.21.1 2023-03-27 20:09:24 +08:00
Louis Lam 6cb296b07a Update SQLite and Vue 2023-03-27 19:05:18 +08:00
Louis Lam 72317633d9 Update to 1.21.0 2023-03-20 18:07:54 +08:00
Louis Lam 1e80365b73 Update node-ping to 0.4.4 2023-03-12 20:44:30 +08:00
Louis Lam 0efabb4e39 Update to 1.21.0-beta.1 2023-03-10 16:16:00 +08:00
Louis Lam 0dce492226 Update to 1.21.0-beta.0 2023-03-04 21:08:39 +08:00
Louis Lam 3e60912992 Update node-ping 2023-03-04 21:08:21 +08:00
Louis Lam f17d23f5d8 A script for sorting contributors from weblate 2023-03-04 21:03:46 +08:00
Nelson Chan beb22f743d Chore: Update chart.js & improve perf. 2023-03-02 04:47:51 +08:00
Louis Lam beafbf27ad
Merge pull request #2858 from louislam/1.20.X
Merge 1.20.x to master
2023-02-28 18:13:15 +08:00
Matthew Nickson 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>
2023-02-26 19:36:50 +00:00
Louis Lam 5b0b743f81 Update to 1.20.2 2023-02-26 17:00:54 +08:00
Louis Lam 3c5f998191 Update mongodb to 4.14.0, possibly fix #2820 2023-02-26 03:23:02 +08:00
Louis Lam fdc3b2d57a Update to 1.20.1 2023-02-15 03:23:59 +08:00
Louis Lam 76bdb62a5b Update to 1.20.0 2023-02-13 17:23:55 +08:00
Louis Lam c5ff010669 Add loose dependency qs which is used by aliyun-sms.js 2023-02-13 16:48:05 +08:00
Louis Lam f1bac7ce8a Add a script that deploy to the demo server 2023-02-13 16:26:45 +08:00
Louis Lam 4056951915 WIP: building database in knex.js 2023-02-11 22:21:06 +08:00
Louis Lam d4752b65de WIP 2023-02-05 18:01:54 +08:00
Louis Lam dc4d2a77bb WIP 2023-02-05 17:45:36 +08:00
Louis Lam 27eddb7253 Update dockerfile 2023-02-04 18:37:12 +08:00
Louis Lam 0b40c65139 Merge remote-tracking branch 'origin/master' into mariadb
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/dockerfile-alpine
#	package.json
#	server/database.js
2023-02-04 18:21:34 +08:00
Louis Lam e631db89b8 Update to 1.20.0-beta.0 2023-02-03 13:21:19 +08:00
Louis Lam b0673ba9ce
Merge pull request #2570 from Computroniks/feature/#2365-allow-markdown-in-status-page-footer
Add support for markdown on status page
2023-02-03 12:36:50 +08:00
Louis Lam 683f446cf5 Add support for .env 2023-02-01 20:07:08 +08:00
Louis Lam a8f0f1d872 Merge manually and remove to devDependencies 2023-02-01 15:51:33 +08:00
Louis Lam f82d7b4007 Merge remote-tracking branch 'origin/master' into feature/#2365-allow-markdown-in-status-page-footer
# Conflicts:
#	package-lock.json
#	package.json
#	src/languages/en.js
2023-02-01 15:38:33 +08:00
Louis Lam aab04f6644 Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master 2023-01-24 19:44:21 +08:00
Louis Lam 0a58069742
Merge pull request #2641 from louislam/1.19.X
Merge 1.19.6 to 1.20.X
2023-01-19 14:27:45 +08:00
Louis Lam 2b57b3e863 Update to 1.19.6 2023-01-19 02:17:17 +08:00
Louis Lam 6cd6a2edf0 Fix ping issue on Windows #2636 2023-01-19 02:16:07 +08:00
Louis Lam 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
Louis Lam 7ef404ccc1 Update to 1.19.5 2023-01-17 20:32:44 +08:00
Louis Lam 1326761a8a Update mongodb and simplify the logic of mongodbPing 2023-01-15 01:36:49 +08:00
Louis Lam 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
Louis Lam e9497ac1ab Fix knex.js issue 2023-01-14 20:49:34 +08:00
Louis Lam 6437ef198f
Merge pull request #2541 from long2ice/master
feat: support redis monitor
2023-01-14 20:16:53 +08:00
Louis Lam d9f12a6376 Fallback to /bin/ping if ping is not found 2023-01-12 01:05:16 +08:00
Louis Lam cc4ed308b0
Merge pull request #2581 from twiggotronix/add-frontend-unit-tests
Add frontend unit tests
2023-01-11 13:36:20 +08:00
David Twigger 1565da87cf Implement cypress unit testing 2023-01-10 08:18:48 +01:00
Matthew Nickson 6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer 2023-01-09 20:03:11 +00:00
Louis Lam 5f5c2d7c46 Update to 1.19.4 2023-01-09 21:02:57 +08:00
Louis Lam c00abac834 Separate golang build layer 2023-01-09 13:43:08 +08:00
Matthew Nickson 6bc0bd84af
Allowed markdown in footer of status page
Markdown support has been added using the marked module. To secure
against XSS attacks, DOMPurify is used to sanitize the generated HTML
before it is loaded on the page.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:39:27 +00:00
Adam Spurgeon 774d754b21 Add GameDig monitor 2023-01-08 21:43:30 +13:00
long2ice 40ebc2df79 feat: support redis monitor 2023-01-05 23:02:56 +08:00
Louis Lam fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
feat: Change ping module to danielzzz/node-ping
2023-01-05 20:40:41 +08:00
Louis Lam 4239cf4255 Pin dependency of ping 2023-01-05 17:11:37 +08:00
Louis Lam 4bf23fdd1a Update jsonwebtoken from ~8 to ~9 2023-01-04 15:55:36 +08:00
Matthew Nickson 73835f3328
Changed from ping-lite to ping module
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

#Fixes 2126
2023-01-03 20:03:36 +00:00
Louis Lam b8e8c1b9db Update to 1.19.3 2023-01-03 18:05:19 +08:00
Louis Lam aec80b53d5 Update to 1.19.2 2022-12-27 00:22:52 +08:00
Louis Lam 056d957c1e Update to 1.19.1 2022-12-26 23:49:20 +08:00
Louis Lam 6962e056ce Update to 1.19.0 2022-12-23 22:44:49 +08:00
Louis Lam 5e976afb27 Merge remote-tracking branch 'origin/master' into mariadb
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/dockerfile
#	package-lock.json
2022-12-18 21:03:06 +08:00
Louis Lam 2532becf61 Update to 1.19.0-beta.2 2022-12-14 23:37:00 +08:00
Louis Lam 3040bd41d9 Speed up armv7 build time of healthcheck by using go compiler cross-build feature in the host 2022-12-12 15:42:00 +08:00
Louis Lam b1170211b7 Update to 1.19.0-beta.1 2022-12-05 19:24:04 +08:00
Louis Lam 8cdbe37f6f Update core-js 2022-12-04 21:41:08 +08:00
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
rmarops b059a36e66 added MongoDB ping monitor 2022-11-16 20:50:34 -05: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 214ddc264d Fix mistake 2022-10-29 23:40:09 +08:00
Louis Lam 2ea71839d1 Add npm run start-server-watch-dev for watching server code changes and restart (Node.js 19 only) 2022-10-29 23:37:05 +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 06755f249d Update to 1.19.0-beta.0 2022-10-15 21:02:56 +08: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 f6bbd1ca67 Merge remote-tracking branch 'origin/master' into maintenance 2022-10-11 14:13:08 +08:00
Louis Lam 2ee8378814 Update to 1.18.5 2022-10-11 02:32:57 +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 07f9aafd7b Update to 1.18.4 2022-10-09 16:50:47 +08:00
Louis Lam 1c8631af8d
Pin dependencies (#2205) 2022-10-09 16:02:47 +08:00
Matthew Nickson f67d7cdf3f
Make update-language-files command more useful (#2198)
* [empty commit] pull request for Fix language update script

* Avoid mass changes with update-language-files

This commit updates the update-language-files script to prevent mass
changes as seen on a number of recent PRs where the contributer has
ran the script and comitted the results.
The script has been updated to now require the --language argument to
specify which language file to update. This ensures that only that file
is updated instead of all files. If the provided language code does not
already exist, a new file with that code is created. This should make
it easier to add new languages as you only need to pass the language
code to the script.
The base lang code is now also passed as an optional argument to negate
the need for a seperate script entry in package.json.
The script has been restructures into a couple of functions to make it
easier to understand.
ESlint now only checks the changed file instead of
them all in order to improve performance.

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* Updated translation docs for new command

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>

* [update-language-files] Add cross-env-shell

Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-08 15:01:47 +08:00
Louis Lam 6e07ed2081 Fix #2186 2022-10-07 15:02:19 +08:00
Louis Lam 60460442f8 Update to 1.18.3 2022-10-07 00:25:34 +08:00
Ben Scobie c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For (#2177)
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-10-05 23:45:21 +08:00
Louis Lam b993859926
Drop Jest e2e testing (#2174) 2022-10-05 14:26:30 +08:00
Louis Lam afbc283423
Move Cypress directory and convert it to JavaScript (#2170) 2022-10-04 22:23:57 +08:00
Louis Lam 16b2cf0e89 Update to 1.18.2 2022-10-04 17:50:11 +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 f35d7c0a1a Merge remote-tracking branch 'origin/master' into feat/add-gRPC-protocol
# Conflicts:
#	package-lock.json
2022-09-13 22:19:41 +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
Louis Lam 197d44981f Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
# Conflicts:
#	package.json
2022-09-09 16:32:23 +08:00
Louis Lam e90a4f1f34
Merge pull request #2023 from louislam/pr-test
A special docker image for testing pull requests
2022-09-09 03:35:01 +08:00
Louis Lam 1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
Adding GoAlert Notification
2022-09-09 03:34:37 +08:00
Louis Lam 676e64c77d Merge branch 'goalert-notification' of https://github.com/mhkarimi1383/uptime-kuma into pr-test 2022-09-09 01:57:00 +08:00
Louis Lam cf10e26aff Update to 1.18.0 2022-09-05 17:43:42 +08:00
Louis Lam fd2df562b1 Add checkout pr logic 2022-09-03 18:37:31 +08:00
Louis Lam e0cdc3e7c5 Update dockerfile for pr-test 2022-08-29 22:06:47 +08:00
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 af94424283 Update to 1.18.0-beta.0 2022-08-13 14:04:17 +08:00
Louis Lam a6007adce3 Update to 1.18.0-beta.1 2022-08-13 13:32:16 +08:00
Louis Lam 3b3763351b Merge remote-tracking branch 'origin/master' into radius-check
# Conflicts:
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
#	src/pages/EditMonitor.vue
2022-08-11 21:08:06 +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 88afd662db Merge remote-tracking branch 'origin/master' into postgres
# Conflicts:
#	package-lock.json
#	package.json
2022-07-24 14:07:30 +08:00
Louis Lam b0d39b44ce Testing 2022-07-22 23:15:55 +08:00
Louis Lam 301b2007a0 Drop Alpine support 2022-07-19 20:53:19 +08:00
tamasmagyar 986c03aecd test cypress run 2022-07-18 20:51:17 +02:00
tamasmagyar 31c388a6e3 added cypress framework and tests for setup page 2022-07-18 20:51:13 +02:00
Louis Lam 17ed051401 Add CacheableDnsHttpAgent.install() 2022-07-18 23:32:45 +08:00
Louis Lam 9cd060c6c3 socks-proxy-agent 6.2.X is a breaking change, freeze to 6.1.1. 2022-07-18 23:27:05 +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 0ecaa2cbd7 Update to 1.17.1 2022-06-23 16:05:42 +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
Louis Lam dd09351c8e Update to 1.17.0-beta.1 2022-06-16 19:34:47 +08:00
Christopher Pickering edcdedcaae
Added check for blank password. 2022-06-15 13:00:14 -05:00
Christopher Pickering 945288f0c0
Added postgres monitor 2022-06-15 12:12:47 -05:00
Louis Lam 8abbc9fd15 Update to 1.17.0-beta.0 2022-06-14 11:00:55 +08:00
Louis Lam 6682839ec8 Merge remote-tracking branch 'origin/master' into ntml-auth
# Conflicts:
#	package-lock.json
#	package.json
#	server/database.js
#	server/model/monitor.js
#	server/server.js
#	server/util-server.js
2022-06-14 10:36:29 +08:00
Louis Lam a28ef56553 Merge remote-tracking branch 'gregdev/feature/axios-cached-dns-resolve' into feature/axios-cached-dns-resolve
# Conflicts:
#	package-lock.json
#	package.json
2022-06-13 18:53:19 +08:00
Louis Lam 7f432bd916 Remove axios-cached-dns-resolve-test 2022-06-13 18:52:08 +08:00
Louis Lam f570d41142 Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
# Conflicts:
#	package-lock.json
#	package.json
2022-06-13 18:50:43 +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 ffb7ba176c Merge remote-tracking branch 'origin/master' into status-page-inject-html 2022-05-30 14:00:39 +08:00
Louis Lam 857e88b27e Update to 1.16.1 2022-05-29 12:47:07 +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
Louis Lam 334cb57fed Update to 1.16.0 2022-05-26 19:32:52 +08:00
Sascha Kruse 019d638767 Merge remote-tracking branch 'ghupstream/master' into radius-check 2022-05-18 15:54:10 +02:00
Louis Lam 398219f847 Update to 1.16.0-beta.0 2022-05-17 01:03:51 +08:00
Christopher Pickering ef73af391f
added option for ntlm authorization 2022-05-13 12:58:23 -05:00
Christopher Pickering 87f933df4f
added sqlserver monitor 2022-05-12 12:48:03 -05:00
Sascha Kruse 398ecb7666 add radius check 2022-05-12 15:21:13 +02: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
Greg Smith cbfecab850 switch to the more-up-to-date esm-wallaby
https://github.com/wallabyjs/esm
2022-05-04 15:45:18 +09:30
Louis Lam 25cc54bf72 Try to give more time for axios-cached-dns-resolve test 2022-05-04 13:24:18 +08:00
Louis Lam 3700b16c5b Copy and add axios-cached-dns-resolve test 2022-05-04 13:16:22 +08:00
Louis Lam 15820c6937 Update SQLite 2022-05-01 19:45:00 +08:00