9dd1b1ca0f
Merge remote-tracking branch 'origin/master' into show-tags-in-status-page-monitor-select-list
...
# Conflicts:
# src/pages/StatusPage.vue
2023-04-04 15:35:20 +08:00
22f730499f
Improve the database connection string input
2023-04-03 02:57:14 +08:00
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
2023-04-03 02:38:30 +08:00
97c7ad9cc7
Fix: Remove invalid gRPC url regex
2023-04-02 00:07:07 +08:00
e8d48561fc
Change `Retries` from `0` to `1`
2023-04-01 01:45:16 +08:00
524cf7c607
WIP
2023-03-31 21:34:05 +08:00
a6acd065bb
WIP
2023-03-31 20:58:45 +08:00
227cec86a8
WIP
2023-03-31 20:25:37 +08:00
02291730fe
WIP
2023-03-31 04:04:17 +08:00
70572af1af
Fix #2969
2023-03-24 18:40:05 +08:00
097567e5f0
Merge pull request #2878 from chakflying/feat/status-page-countdown
...
Feat: Add status page countdown to refresh
2023-03-23 17:18:57 +08:00
35f300c8eb
Improve and reuse language keys
2023-03-23 17:17:53 +08:00
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-03-12 18:38:19 +08:00
193a273557
Feat: Add status page countdown to refresh
2023-03-03 08:25:41 +08:00
150607cc93
Feat: Support auto theme in status pages
2023-03-02 07:26:26 +08:00
ad26f0e817
Fix: assign tags when cloning monitor
2023-03-02 06:44:16 +08:00
6fc34e44d9
Resolved issue with using IP Address as GRPC URL
...
I've been having an issue with trying to use an IPAddress Host:Port combination in monitoring my GRPC instances.
This was because the input type was set to url instead of text.
Even if the pattern passes the match test, the url would block as it requires a fully qualified domain name with HTTP and this would fail to submit
2023-03-01 19:45:31 +02:00
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2023-02-28 16:55:50 +08:00
11fa690e09
Updated API Keys UI
...
The UI has now been moved to the settings page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-26 18:07:57 +00:00
db6b863445
show tags in monitor select list under status page : change select UI from normal select to vue-multiselect
2023-02-26 16:26:09 +05:30
ea3b3abe36
Fine tune
2023-02-25 20:13:46 +08:00
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
2023-02-25 19:14:44 +08:00
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2023-02-25 17:57:25 +08:00
8a115670cd
Fix label and id
...
Co-authored-by: AlexKraus <alex.b.kraus@googlemail.com>
2023-02-25 17:55:40 +08:00
4fed0c152e
Show `Copy of` in front of the cloned monitor name
2023-02-25 17:05:03 +08:00
4a5a424198
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
2023-02-25 15:43:07 +08:00
f47f2d5c87
Better save button for edit/add monitor page
2023-02-25 15:40:24 +08:00
f0ae67f89a
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
...
# Conflicts:
# src/languages/en.js
# src/pages/EditMonitor.vue
2023-02-25 14:56:51 +08:00
46894793fc
Update Learn More url
2023-02-25 00:44:12 +08:00
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2023-02-25 00:06:25 +08:00
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2023-02-24 17:26:47 +08:00
7c8cff7708
Fix: Add null check for injected HTML
2023-02-23 17:02:16 +08:00
372c6b9078
add markdown support for description
2023-02-20 16:09:17 +01:00
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-18 22:38:40 +03:00
3ab0faee91
Add update query for old monitors and save new data correctly
2023-02-18 22:18:48 +03:00
9e3a77f419
Customize body placeholder for body encoding
2023-02-18 17:02:56 +03:00
cef0a0faf4
Merge branch 'master' into group-monitors
2023-02-16 21:38:53 +01:00
01c71a0242
Fixed logic errors, removed dev leftovers
...
Fixed a logic error where a comma was used instead of an or, also
removed leftover console.logs from testing.
Date picker is now dissabled when don't expire is checked.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-15 11:15:15 +00:00
05443f9bb7
Added language keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 22:16:41 +00:00
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2023-02-14 19:53:33 +00:00
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-02-14 19:49:04 +00:00
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-11 23:56:38 +03:00
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2023-02-11 14:41:02 +08:00
36d160ad02
Rename "consequently" to "consecutively" as suggested by @skylarv
...
https://github.com/louislam/uptime-kuma/pull/1212#issuecomment-1423373045
2023-02-09 09:04:47 +01:00
43941fa2c6
feat: add mtls authen method in http/http keyword
2023-02-07 09:40:47 +07:00
0197778af1
Fix change language issue in the setup page
2023-02-06 22:35:56 +08:00
39c99b0ec4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# src/lang/en.json
2023-02-05 18:19:46 +03:00
5fff63cd59
add keys for translation
2023-02-05 01:07:20 +01:00
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2023-02-04 15:40:13 +08:00
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-04 00:03:05 +03:00
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2023-02-02 21:51:03 +00:00
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2023-02-02 21:51:03 +00:00
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2023-02-02 19:43:17 +03:00
2c581ade90
Merge branch 'louislam:master' into group-monitors
2023-02-01 20:44:09 +01:00
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
95c934e08b
Fix: Do not allow white space around IP
...
Feat: Trim input on submit
Test: Add test for whitespace regex match
2023-02-01 08:25:16 +08:00
7dacc6a002
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-30 18:00:42 +03:00
a6894d36f2
[ #2501 ] Dashboard: Details Page
...
- enable clickable URL on Dashboard Details if monitor is of type `mp-health`
2023-01-30 15:55:12 +01:00
664da4a317
Merge pull request #2684 from gitstart/UPTM-3
...
Save button can't be found while edit and add in Mobile version
2023-01-30 21:20:39 +08:00
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-30 13:09:16 +03:00
6828d337ae
Disable HTTP(s) - Browser Engine
...
Reason: Unfortunately, after some test, I found that Playwright requires a lot of libraries to be installed on the Linux host in order to start Chrome or Firefox. It will be hard to install, so I hide this feature for now.
2023-01-30 00:00:41 +08:00
661fa87134
feat: make parent link clickable
2023-01-28 14:53:40 +01:00
d48eb24046
docs: more comments
2023-01-28 14:28:53 +01:00
aee4c22dee
perf: only do one filter instead of 3 in editMonitor
2023-01-28 14:28:34 +01:00
9a46b50989
docs: add comments
2023-01-28 14:22:15 +01:00
f3ac351d75
feat: set childs under maintenance if parent is too
2023-01-28 14:02:10 +01:00
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
aba515e172
feat: disable childs if parent is disabled
2023-01-28 13:39:17 +01:00
97bd306a09
Merge branch 'louislam:master' into group-monitors
2023-01-28 03:07:42 +01:00
645fd94bba
feat: add ability to group monitors in dashboard
2023-01-28 02:58:03 +01:00
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
54e63f3e25
Save button can't be found while edit and add in Mobile version
2023-01-26 12:47:33 +00:00
9329ec9234
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
2023-01-25 20:20:11 +03:00
5050ebc249
Merge remote-tracking branch 'origin/master' into feature/#1891-set-ping-packet-size
...
# Conflicts:
# server/util-server.js
# src/languages/en.js
2023-01-25 16:12:33 +08:00
83e0401dd8
Show game list for GameDig monitor
2023-01-24 23:03:01 +08:00
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-20 12:27:28 +03:00
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
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-15 20:14:11 +08:00
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
2023-01-15 13:10:17 +08:00
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
cf21aa3737
Fix lint
2023-01-14 16:51:07 +03:00
9890a0754b
Fix lint
2023-01-14 16:48:26 +03:00
15c64d458b
Fix lint
2023-01-14 16:48:12 +03:00
be850dd596
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/languages/en.js
2023-01-14 16:40:13 +03:00
3adc9e65d6
Add only xml support to http monitors
2023-01-14 16:33:21 +03:00
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2023-01-14 20:16:53 +08:00
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +08:00
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2023-01-12 21:25:33 +08:00
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-11 10:34:24 +01:00
6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer
2023-01-09 20:03:11 +00:00
80f2d6e2a7
Added markdown support for maintenance
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:54:16 +00:00
852a088529
Added mardown support for incident
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 20:46:18 +00:00
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
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 19:09:06 +00:00
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
e490ec6d29
move hostname regex pattern function to frontend-utils
2023-01-06 11:00:20 +01:00
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:55:51 +00:00
fc5ec5f492
Fixed styling of clear data dropdown
...
Fixed #2419
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 19:24:29 +00:00
40ebc2df79
feat: support redis monitor
2023-01-05 23:02:56 +08:00
abf5e435fe
move to utility function
2023-01-05 14:48:12 +01:00
8a372201f1
clean up
2023-01-05 14:23:05 +01:00
5362aab0e5
specify scheme for mqtt monitor type only
2023-01-05 14:06:13 +01:00
fc1914bccd
Fix lint
2023-01-05 11:42:19 +01:00
c196c34840
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-05 08:57:48 +01:00
239910a27c
Change clone icon from plus to clone
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2023-01-02 13:17:38 +01:00
608e3f5582
Feature: Clone existing monitor
...
Closes #565
Closes #2319
Adds the feature of cloning existing monitor, I have briefly tested it with ping and https and ensured that all properties was cloned including notifications.
2022-12-27 23:26:05 +01:00
4862bec965
Update Fr language + added variable for missing translation ( #2395 )
...
* Update FR language
2022-12-13 22:00:54 +08:00
3b87209e26
Add configurable dns cache
2022-12-12 17:19:22 +08:00
e6dc0a0293
Slightly improve maintenance page's css on mobile
2022-12-12 16:06:17 +08:00
5c5a339a36
Add links for status pages and maintenance for mobile ( Fix #2257 )
2022-12-12 15:54:46 +08:00
4cd5b5563f
Fix #1145
2022-12-08 23:21:55 +08:00
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
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
b059a36e66
added MongoDB ping monitor
2022-11-16 20:50:34 -05:00
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-10-22 16:22:28 +01:00
a774b37369
Update FR language + fixed daytime error ( #2226 )
...
* Update FR language
* fix a daytime error + add for translation
* Update language file FR + fixed daytime error
2022-10-16 01:42:28 +08:00
64f84eb118
Update Details.vue's button styles
2022-10-15 21:01:48 +08:00
d8a676abb6
Implement recurring day of month and day of week
2022-10-15 18:49:09 +08:00
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
f459ea845c
Added #2182 Add support for custom radius ports ( #2197 )
...
This commit adds support for the port to be specified when using the
radius monitor type. A check has been implemented to ensure that a null
value is not passed to the radius check function as could occur with
monitors that were created before this change was introduced. The
default port of 1812 is displayed when the user selects the radius
monitor in much the same way as the DNS port is handled. The port was
not included in the hostname in the form hostname:port in order to avoid
issues with IPv6 addresses and monitors that had been created before
this change was implemented.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-13 00:32:05 +08:00
2faf866e9e
Implement generateTimeslot() for recurring interval type
2022-10-12 17:02:16 +08:00
dfb75c8afb
Update status page's maintenance message
2022-10-11 20:56:48 +08:00
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
d5c02fc627
Update Maintenance list order by status
2022-10-11 01:59:47 +08:00
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +08:00
c1ccaa7a9f
WIP
2022-10-10 20:48:11 +08:00
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +08:00
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
314ae38f91
Changed name of SQL Server to avoid confusion
...
It appears that SQL Server causes some confusion among users as they
believe that it means any SQL database, not the Microsoft product SQL
Server. To avoid this issue, the display value has been changed to
Microsoft SQL Server. No backend changes have been made and it is still
stored as sqlserver in the database. This is only a frontent change.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 21:35:33 +01:00
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2022-09-28 00:48:15 +08:00
f6919aef1d
remove TODO
2022-09-26 17:10:56 -04:00
0814d643c1
Merge branch 'master' into feature/expand-http-payload-support
2022-09-25 10:45:32 -04:00
3f63cb246b
[WIP] Handle timezone offset for timeRange
2022-09-25 19:38:28 +08:00
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2022-09-24 19:18:24 +08:00
9d99c39f30
Update Maintenance UI for recurring
2022-09-24 02:33:29 +08:00
617ba49e6c
Fix race condition of `selectedStatusPagesOptions`
2022-09-18 22:40:53 +08:00
7853c2cc38
Update Maintenance UI
2022-09-18 22:34:05 +08:00
f61c1c47aa
Update Maintenance UI
2022-09-18 02:13:29 +08:00
9fe07742ea
Linting
2022-09-18 02:07:32 +08:00
a29eae3213
Update Maintenance UI
2022-09-18 02:02:18 +08:00
80698a58b8
Tidy up
2022-09-17 22:09:09 +08:00
bb883e6fa0
Move maintenance under `/maintenance`
2022-09-17 22:00:11 +08:00
90761cf831
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/HeartbeatBar.vue
# src/components/MonitorList.vue
# src/icon.js
# src/layouts/Layout.vue
# src/mixins/datetime.js
# src/mixins/socket.js
# src/router.js
# src/util.js
2022-09-17 16:12:57 +08:00
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-09-10 21:20:03 +01:00
7577477ae8
Add rel="noopener noreferrer" to html link
2022-09-10 21:35:22 +02:00
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
Nelson Chan
Godwin Gabriel Ndlovu
Matthew Nickson
titanventura
Andreas Brett
Faruk Genç
Peace
OidaTiftla
Suriya Soutmun
cyril59310
c
Sebastian Kaempfe
Peace
gitstart
long2ice
twiggotronix
Adam Spurgeon
David Twigger
Mathias Haugsbø
Cyril59310
rmarops
minhhn3
Justin Tisdale
d3vyce