a3b94aa532
Merge pull request #1550 from Computroniks/jsdoc-for-src
...
JSDoc for src/*/*
2022-06-15 19:29:51 +08:00
ac449ec1c2
Merge branch 'master' into master
2022-06-15 11:33:00 +02:00
7d63b700e1
Merge pull request #1767 from christopherpickering/patch-2
...
[beta] workstation field should be text, not password
2022-06-15 15:31:24 +08:00
483cbfb636
added default value for sql server connection string
2022-06-14 09:00:23 -05:00
6995a29980
workstation field should be text, not password
2022-06-14 07:45:04 -05:00
d16be6fb7d
Fix and use null as authMethod None instead of empty string
2022-06-14 10:49:30 +08:00
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
817f6db4fd
Remove SQL Server code (which in another pr already)
2022-06-14 10:32:38 +08:00
d4485fe62f
Make the monitor type list a bit clear
2022-06-13 18:14:47 +08:00
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
b0476cfb5b
Added JSDoc for src/pages/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-06-02 13:46:44 +01:00
e9e78c26e5
Merge branch 'master' into master
2022-05-27 13:59:58 +02:00
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
2022-05-25 14:59:14 +08:00
32cfd411f8
Fixed style & code errors
2022-05-19 12:35:55 +00:00
a9f3142cee
Merge branch 'master' into master
2022-05-19 14:24:02 +02:00
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
2022-05-18 15:54:10 +02:00
7a50f0e3f3
Merge pull request #1589 from AnnAngela/1.15.1_zh-CN
...
Improve translation work
2022-05-17 00:03:25 +08:00
ef73af391f
added option for ntlm authorization
2022-05-13 12:58:23 -05:00
b7dc8e3ef8
started ui update
2022-05-13 07:22:52 -05:00
87f933df4f
added sqlserver monitor
2022-05-12 12:48:03 -05:00
398ecb7666
add radius check
2022-05-12 15:21:13 +02:00
8e99cbf426
Merge branch 'master' into introduce-resend-interval
2022-05-04 22:58:40 +02:00
db50ba91cc
Fix #1593
2022-04-30 21:44:03 +08:00
45da7c5431
Improve translation work
2022-04-29 20:17:15 +08:00
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
2022-04-28 23:34:51 +08:00
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-27 18:26:11 +01:00
1e595eaa76
Update linters
2022-04-26 01:26:57 +02:00
db3ef3805b
correct wordings for Certificate Expiry Notification ( #1554 )
2022-04-25 08:25:06 +08:00
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-24 01:06:45 +01:00
052fde5a24
Fix casing of text label
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-21 17:56:38 +02:00
b7e2489d22
Merge branch 'master' into introduce-resend-interval
2022-04-21 11:58:04 +02:00
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
2022-04-18 13:04:55 +08:00
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
2022-04-17 19:46:33 +08:00
d71c086447
Standardize array bracket spacing
2022-04-17 15:27:35 +08:00
136fdf3768
MQTT password field to password type
2022-04-17 01:07:36 +08:00
566133e350
Domain Name Expiry Notification for https monitor only
2022-04-16 15:01:53 +08:00
b1c7915bc1
Merge branch 'master' into mqtt2
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# server/model/monitor.js
# server/server.js
# src/pages/EditMonitor.vue
2022-04-16 13:28:39 +08:00
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
2022-04-13 21:24:04 +01:00
b893d50e45
Implement specify Port for DNS Monitor #1059
...
This commit should fully implement #1059 . When the user selects the DNS
monitor option, a new input box has been added below the resolver
address allowing the user to implement the port to access the resolver
on. This uses the same `monitor.port` as the TCP monitor but a monitor
has been added to prefill the port value to the default of `53` if the
value in this field has not already been set. This is then cleared if
the user selects a different monitor type and has not changed the port
value. A translation has also been added explaining what this field
does in order to reduce any confusion. JSDoc documentation has also been
added to the `dnsResolve` function in `util-server.js`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-04-13 21:02:19 +01:00
361e44ad6a
Merge branch 'louislam:master' into master
2022-04-13 15:58:17 +02:00
fcb577097b
[Proxy] Change to radio button
2022-04-07 15:26:00 +08:00
e89356b283
Show proxy option for http monitor only
2022-04-07 14:37:33 +08:00
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
2022-04-05 21:27:50 +08:00
af44b0beab
Merge branch 'master' into master
2022-04-03 17:19:29 +02:00
91366ff565
Merge branch 'master' into introduce-resend-interval
2022-03-27 21:19:57 +02:00
8078d0618d
Add socks proxy support to proxy feature
...
- Socks proxy support implemented.
- Monitor proxy agent create flow refactored
and moved under proxy class.
Thanks for suggestion @thomasleveil
2022-03-06 19:34:51 +03:00
78d76512ba
Add http and https proxy feature
...
Added new proxy feature based on http and https proxy agents.
Proxy feature works like notifications, there is many proxy
could be related one proxy entry.
Supported features
- Proxies can activate and disable in bulk
- Proxies auto enabled by default for new monitors
- Proxies could be applied in bulk to current monitors
- Both authenticated and anonymous proxies supported
- Export and import support for proxies
2022-03-06 19:34:49 +03:00
855b12f435
Add text for resend disabled
2022-01-24 22:20:38 +01:00
30ce53f57c
Fix min value of resend interval
2022-01-24 09:18:38 +01:00
11e9eee09d
Change seconds to minutes
2022-01-23 17:48:09 +01:00
1ac904d6d6
Introduce resend interval if down
2022-01-23 15:22:57 +01:00
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
2022-01-22 01:57:37 +00:00
c679613f7e
Updates some DE translations, fix typo in resolverserverDescription, removes some duplicates in languages
2022-01-14 19:06:21 +01:00
4818bb67d6
Added trailing comma, fixed spelling & translation
2022-01-14 09:09:37 +00:00
b0259b5592
Added docker container monitor
2022-01-13 16:17:07 +00:00
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
2022-01-13 11:53:08 +08:00
1c8407a433
[MQTT] Use existing fields instead of creating new ones (UI)
2022-01-13 11:36:55 +08:00
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
2022-01-13 11:09:16 +08:00
3d002b3ce9
add status boolean parameter to push monitor
2021-12-25 20:25:21 +01:00
d3c90df8a8
fixed edit monitor fields empty issues
2021-12-18 16:35:18 -05:00
475a466c7e
Add attribute to basicauth-pass to prevent browsers from autocompleting ( #1063 )
2021-12-15 18:18:30 +08:00
934d633d4d
Add description to monitor
...
* Add description to monitor model
* Add description field to database
* Add english and spanish translation for description
* Closes : #482
2021-12-14 19:11:32 -03:00
5afc6a41e3
removed https requirement for url
2021-12-06 11:28:23 -05:00
c1b118a0f6
Use existing Example translation for HTTP headers and body placeholders
2021-11-29 12:49:08 +01:00
9c5466890e
Revert "Replace body and header placeholder functions with translations"
...
This reverts commit 2c85491ee0
2021-11-29 12:40:53 +01:00
2ca7a5b962
Merge branch 'master' into improve-translatables
2021-11-24 10:03:30 +01:00
92a5f18bf5
Merge pull request #864 from ivanbratovic/http-basicauth
...
Implement explicit HTTP "basic" authentication support
2021-11-23 22:48:54 +08:00
4155f84eec
improve basic auth style
2021-11-23 19:20:55 +08:00
07742799ed
Test: Fix tests
...
Test: Add clear stats test
Test: Attempt to fix tests
Test: Add test for disable auth
Update README
2021-11-17 10:45:19 +08:00
3f5133d1ba
Added authentication logic
2021-11-16 20:44:10 -05:00
567ea346fe
Add missing translations for placeholders in EditMonitor page
2021-11-12 15:30:31 +01:00
265cca9ed1
Replace "Default" notification badge with translation
2021-11-11 10:54:09 +01:00
2c85491ee0
Replace body and header placeholder functions with translations
2021-11-11 10:52:22 +01:00
3721d11259
changed table column names for more specifity
2021-11-09 18:53:00 -05:00
149015556b
server url changes
2021-11-04 22:25:29 -04:00
2bcbeba384
update review suggestions
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-11-04 22:23:02 -04:00
0481a241f3
Add translated placeholders for editing basic auth
2021-11-04 10:22:42 +01:00
179ca232bc
Minor refactor - change variable names and add commas to object definitions
2021-11-04 10:14:17 +01:00
0dcb7aed21
Delinting
2021-11-04 09:50:10 +01:00
23736549f9
Implement HTTP basic auth feature
2021-11-04 09:50:10 +01:00
670754b697
added MQTT monitor type
2021-11-03 21:46:43 -04:00
c9549c0de2
change body and header placeholders, less misleading.
2021-10-23 22:14:05 +08:00
e1f1d4a959
Merge branch 'louislam:master' into textchanges
2021-10-18 12:57:28 -06:00
20d59e5a13
fix and move the steam api key to settings page
2021-10-18 17:02:05 +08:00
ae31eb6ba9
Merge branch 'master' into Revyn112_master
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
# src/pages/EditMonitor.vue
2021-10-18 15:50:35 +08:00
6944b35ea7
Merge pull request #667 from zsxeee/i18n
...
Missing i18n and zh-CN translation
2021-10-16 22:47:58 +08:00
61627545a5
fix(edit-monitor): no need to escape placeholder {} if not translated
2021-10-16 11:26:32 +02:00
8cb26d2b31
Text update
2021-10-15 19:12:09 -06:00
f4b8da0a5c
Merge branch 'feature/add-support-for-method-body-and-headers'
2021-10-15 19:02:49 +08:00
4178983df3
Merge remote-tracking branch 'origin/master'
2021-10-15 19:01:04 +08:00
7ac0ab2e34
[http options] beautify the json format when clicked the save button
2021-10-15 18:57:27 +08:00
cd211a6be7
[http options] fine tune
2021-10-15 18:36:40 +08:00
4e71ab7406
Merge branch 'master' into feature/add-support-for-method-body-and-headers
2021-10-15 16:07:05 +08:00
c593a962c2
Merge pull request #627 from NixNotCastey/smtp-subject
...
Add support for custom subject in emails
2021-10-15 00:54:31 +08:00
3b74b727f2
[Push Type] fix missing important flag and missing up notification
2021-10-14 22:32:15 +08:00
8338881927
[SMTP] change {{HOSTNAME}} to {{HOSTNAME_OR_URL}}, support for http montior type, some UI improvements
2021-10-14 16:07:25 +08:00
33f773fcd0
Move param out of the translation file
2021-10-13 15:36:07 +08:00
3fe91c52cb
Fix i18n
...
Missing webhook json description
Ajust Telegram context-based sentence, (also changed translated language files)
Missing primary base url label
Wrong PromoSMS i18n
Missing Octopush legacy hint
Missing Matrix i18n
Missing push url i18n
2021-10-12 16:29:18 +08:00
d71d27220b
fix(edit-monitor): store headers as JSON
2021-10-09 12:42:32 +02:00
b8093e909b
fix(edit-monitor): fix minification of translations containing { }
2021-10-09 11:38:12 +02:00
c3c273f9df
fix(edit-monitor): fix regex to allow a single header
2021-10-09 11:20:33 +02:00
daab2a05f5
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-09 11:13:16 +02:00
fc8d1e78b6
[push type] hide upside down mode, apply primary base url
2021-10-08 20:03:52 +08:00
8be4bf0e16
Merge remote-tracking branch 'louislam/master' into feature/add-support-for-method-body-and-headers
2021-10-07 08:56:29 +02:00
a87595a849
Fix: Allow underscore in hostname
2021-10-07 03:29:42 +08:00
afeb424dc0
fix(edit-monitor): add translations to en.js
2021-10-05 09:20:24 +02:00
7ee89fab5c
fix(edit-monitor): Make json capitalised
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-10-04 11:29:43 +02:00
3f0b85e5a8
feat(http-requests): add support for methods, body and headers for http
2021-10-02 16:48:27 +02:00
7fa1cb83af
[push type] add ping parameter
2021-10-01 16:43:11 +08:00
1ed4ac9494
add Push-based monitoring ( #279 )
2021-10-01 00:09:43 +08:00
ba4a4aaf1c
Chore: Move multiselect css to own file
2021-09-30 00:08:37 +08:00
efbadd0737
only allow ip address for hostname when monitor type is steam
2021-09-28 13:38:46 +02:00
b67b4d5afd
add steam gameserver for monitoring
2021-09-27 11:17:57 +02:00
45a6f364e1
Chore: Fix backslash in IP regex
2021-09-22 23:05:46 +08:00
95391be2ab
Revert Regex update
2021-09-22 22:36:27 +08:00
5b2e1f6086
Fix: Allow number ending TLD
2021-09-22 05:29:56 +08:00
d2b34f9285
Chore: make eslint happy
2021-09-21 18:53:45 +08:00
a96a515087
Fix: Fix hostname with dash
2021-09-21 18:44:32 +08:00
2eab919ae0
Fix: Fix typo
2021-09-21 18:41:19 +08:00
c09b67b94d
Fix: Fix TCP Ping hostname Regex
2021-09-21 18:27:40 +08:00
6aaf984f29
fix retryInterval = 0 if it is an old monitor. ( #380 https://github.com/louislam/uptime-kuma/pull/380#issuecomment-922618356 )
2021-09-20 18:23:53 +08:00
3a0bc80016
Added regex to hostname input
2021-09-17 16:02:20 +02:00
72783fd94c
Merge pull request #380 from No0Vad/retry-heartbeat-interval
...
Added support for a retry interval to monitors
2021-09-16 00:21:53 +08:00
1300448bed
Adjustments to the retry interval
...
The monitor logic for when to use "retryInterval" is updated. Also removed some texts when they are no longer needed.
2021-09-15 00:59:06 +02:00
fc9b4617ca
link interval and retryInterval
2021-09-14 15:48:25 +08:00
9b5abf9bb1
Fix: reset editMonitor after save
2021-09-13 14:12:17 +08:00
6e3a904aaa
WIP: Add tags functionality
...
WIP: add color column, show tags
WIP: Improve TagsManager styling & workflow
WIP: Improve styling & validation, use translation
WIP: Complete TagsManager functionality
WIP: Add tags display in monitorList & Details
Fix: update tags list after edit
Fix: slightly improve tags styling
Fix: Improve mobile UI
Fix: Fix tags not showing on create monitor
Fix: bring existingTags inside tagsManager
Fix: remove unused tags prop
Fix: Fix formatting, bump db version
2021-09-13 14:12:11 +08:00
91ee39ec60
Merge branch 'master' into retry-heartbeat-interval
2021-09-13 00:19:51 +02:00
7df9698e5d
eslint: comma-dangle for language files
2021-09-13 00:58:45 +08:00
f8f9f59464
Added support for a retry interval to monitors
...
If a check fails and retries are used you can now specify a specific value for that. So you can check faster if the site goes back up again.
2021-09-11 18:54:55 +02:00
573c7faddd
switch on the notification, if it is added in EditMonitor.vue
2021-09-09 21:24:29 +08:00
b95404b6e0
Fixed suggestions
2021-09-06 09:45:52 +02:00
58240aceef
Added the option for default notifications
2021-09-05 23:23:06 +02:00
91e82bd12c
set default value for dns resolve type and code refactor
2021-08-28 11:46:26 +08:00
d4dd650bfe
translate for zh-hk
2021-08-28 11:20:02 +08:00
6464207f4b
Added German language for DNS Monitor
2021-08-27 18:41:58 +02:00
7652b4849a
Merge pull request #238 from Ponkhy/dns-monitor
...
Added DNS Monitor Type
2021-08-28 00:21:10 +08:00
2b8c5e2e65
Added German Language
2021-08-26 02:43:26 +02:00
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
46ac753c46
Merge branch 'master' into dns-monitor
2021-08-26 01:05:46 +08:00
28a51d806b
translate to Traditional Chinese (Hong Kong)
2021-08-24 18:26:44 +08:00
054186370e
add source of ipRegex
2021-08-24 15:00:30 +08:00
b2041cb36b
Fixed ESLint Errors
2021-08-23 16:30:11 +02:00
c79be19ec3
Added DNS Monitor Type
2021-08-23 00:05:48 +02:00
f21937b197
add animation for page change
2021-08-20 02:37:59 +08:00
6f489e7e0f
Accepted Status Codes / Max Redirects for http/keyword only
2021-08-09 02:01:08 +08:00
6ca7ca4e7e
improve alignment and font size
2021-08-08 21:42:37 +08:00
9fa8d5c1fa
improve multiselect
2021-08-08 21:14:29 +08:00
3265c3cbc3
improve multiselect
2021-08-08 21:03:10 +08:00
5a6e5b7948
change multiselect color
2021-08-06 19:48:51 +08:00
93ea2c277a
Update src/pages/EditMonitor.vue
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-08-05 21:06:47 +08:00
8f7885e58a
Feat: Implement MaxRedirects & StatusCodes
2021-08-05 19:04:38 +08:00
60aa67892d
store ignoreTls and upsideDown into db
2021-07-30 19:18:26 +08:00
71af902a4e
add fields to EditMonitor.vue
2021-07-30 01:09:14 +08:00
9648d700d7
Autofix on save
2021-07-27 19:47:13 +02:00
5a219554b3
grammar
2021-07-22 19:49:46 +08:00
70b1f197c1
rename "Retry Pings" to "Retries"
2021-07-22 19:02:44 +08:00
32a5e838ba
add patch3.sql and fix duplicate id in EditMonitor.vue
2021-07-22 17:44:59 +08:00
86e18ac11d
Merge branch 'master' into Spiritreader_master
...
# Conflicts:
# src/pages/EditMonitor.vue
2021-07-22 17:34:41 +08:00
8b905b6b12
Indentation fix in editor
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2021-07-20 17:38:21 +02:00
a8b102ad4a
add retries for pinging function
...
backend:
- new field for monitor: maxretries
- new pending status while service is retrying: 2
- pending status event is not marked important
- pending pings however register as downtime in the calculation
frontend:
- added pending status while service is retrying
- added color for new pending status
- added field to configure amount of retries
database:
- IMPORTANT: THIS REQUIRES MIGRATION!!!!
- added field: maxretries with default value 0
2021-07-19 18:23:06 +02:00
d94894b7e0
Fix `require-v-for-key`, remove unused declarations and double spaces
2021-07-18 03:10:15 +02:00
a9d19ae06a
support json for keyword type
2021-07-12 10:52:41 +08:00
f9800a087e
optimize for mobile
2021-07-11 15:23:28 +08:00
ae07cd9c35
prepare for docker
2021-07-11 14:20:31 +08:00
d24a15410e
send notification for important heartbeat
2021-07-09 17:55:48 +08:00
3bdf174e90
add telegram notification
2021-07-09 14:14:03 +08:00
1d64f643b1
implement keyword monitor
2021-07-01 17:19:28 +08:00
a6b5986dd6
add ping and fix uptime
2021-07-01 17:00:23 +08:00
9c653c3d05
implement tcping
2021-07-01 14:03:06 +08:00
9fa84a0a2b
many update
2021-06-29 16:06:20 +08:00
d02401b1c2
many update
2021-06-27 16:10:55 +08:00
0a4fb45a8c
init
2021-06-25 21:55:49 +08:00
Louis Lam
Moritz R
Christopher Pickering
Matthew Nickson
c0derMo
Sascha Kruse
Christopher Pickering
OidaTiftla
AnnAngela-work
Adam Stachowicz
Dick Tang
OidaTiftla
Nelson Chan
Uğur Erkan
Hans Mayer
Jakub Blažej
Tarun Singh
Ivan Bratović
Juan Cruz Vincenti
NeuralMiner
Bert Verhelst
NeuralMiner
zsxeee
Denis Freund
Ponkhy
No0Vad
Ponkhy
Sam