Austin Miller
ef54d9e3b6
Add PagerTree Notification Provider
2023-02-06 11:33:14 -07:00
Louis Lam
68ead3414d
WIP
2023-02-06 22:26:13 +08:00
Faruk Genç
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
Louis Lam
d4752b65de
WIP
2023-02-05 18:01:54 +08:00
Louis Lam
dc4d2a77bb
WIP
2023-02-05 17:45:36 +08:00
Haytham Salama
1bfb290718
feat: add message thread id for telegram nonfiction
2023-02-04 22:53:38 +02: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
afadfe32d5
Trim
2023-02-04 17:03:00 +08:00
Louis Lam
5f2affb38c
Relocate and fix jsesc issue
2023-02-04 16:58:39 +08:00
Louis Lam
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2023-02-04 15:40:13 +08:00
Faruk Genç
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-02-04 00:03:05 +03:00
c
a823ed8ccc
Feature - Google Analytics - Removed unused import.
2023-02-03 11:49:25 +00:00
Joseph
2a6d98ff01
Feat: Expand and Simplify Badge Functionality ( #2211 )
...
* [expanding badges] added new configs
* [expanding badges] recieve ping in getPreviousHeartbeat()
* [expanding badges] re-added original new badges
* [expanding badges] recreate parity between old and new badges
* [expanding badges] fix linting
2023-02-03 12:33:48 +08:00
c
913bb611d5
Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
2023-02-02 21:52:45 +00:00
c
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2023-02-02 21:51:03 +00:00
c
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2023-02-02 21:51:03 +00:00
c
fb2999706c
Feature - Google Analytics - Added JSDoc to Google Analytics functions.
2023-02-02 21:51:03 +00:00
c
2b3a3895b3
Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895
2023-02-02 21:51:03 +00:00
c
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2023-02-02 21:51:03 +00:00
c
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2023-02-02 21:51:03 +00:00
Faruk Genç
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
Peace
9446c2d102
fix: use active instead of isActive in uploadBackup
2023-02-01 23:39:42 +01:00
Peace
2c581ade90
Merge branch 'louislam:master' into group-monitors
2023-02-01 20:44:09 +01:00
Peace
f286386f59
fix: add message for empty group pending state
2023-02-01 20:19:47 +01:00
Peace
9286dcb6ce
fix: add serverside check against endless loops
2023-02-01 20:16:56 +01:00
Louis Lam
683f446cf5
Add support for .env
2023-02-01 20:07:08 +08:00
Nelson Chan
348d0170fa
Chore: Use constants instead of int
2023-02-01 05:33:36 +08:00
Faruk Genç
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-30 13:09:16 +03:00
Louis Lam
fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge
...
Fix: Add support for pending & maintenance in badges
2023-01-30 15:32:28 +08:00
Peace
9a46b50989
docs: add comments
2023-01-28 14:22:15 +01:00
Peace
f3ac351d75
feat: set childs under maintenance if parent is too
2023-01-28 14:02:10 +01:00
Faruk Genç
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-28 15:47:42 +03:00
Peace
aba515e172
feat: disable childs if parent is disabled
2023-01-28 13:39:17 +01:00
Louis Lam
ddce8f0cb0
Fix plugin installation
2023-01-28 19:00:13 +08:00
Peace
97bd306a09
Merge branch 'louislam:master' into group-monitors
2023-01-28 03:07:42 +01:00
Peace
645fd94bba
feat: add ability to group monitors in dashboard
2023-01-28 02:58:03 +01:00
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2023-01-27 18:25:57 +08:00
Faruk Genç
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
Louis Lam
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
Louis Lam
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2023-01-25 00:22:51 +08:00
Louis Lam
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2023-01-25 00:19:54 +08:00
Nelson Chan
c4c720027c
Fix: Use correct log call format
2023-01-24 23:47:33 +08:00
Louis Lam
83e0401dd8
Show game list for GameDig monitor
2023-01-24 23:03:01 +08:00
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2023-01-24 19:44:21 +08:00
Thomas Spalinger
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2023-01-24 10:32:49 +00:00
Faruk Genç
cd017fce98
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-22 02:22:59 +03:00
alejandrohernandezrosales
fa23e7ad19
Removed superflous Message prefix
2023-01-20 23:59:11 -06:00
Faruk Genç
aef85078eb
reorder fix
2023-01-20 12:29:56 +03:00
Faruk Genç
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2023-01-20 12:27:28 +03:00
Nelson Chan
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2023-01-18 09:53:04 +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
a5ff27da7a
Drop the property monitor.maintenance
, use lastHeartBeat.status
to check status instead
2023-01-17 17:34:47 +08:00
Louis Lam
27585d0812
Fix #2618
2023-01-17 01:21:01 +08:00
Louis Lam
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
...
Fix: Allow long sms in PromoSMS
2023-01-16 13:21:56 +08:00
Louis Lam
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
Louis Lam
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
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
Faruk Genç
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
Faruk Genç
3adc9e65d6
Add only xml support to http monitors
2023-01-14 16:33:21 +03:00
Louis Lam
712a3c29d4
Fix Postgres monitor do not handle some error cases correctly
2023-01-14 21:06:10 +08:00
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2023-01-14 20:16:53 +08:00
long2ice
3b5893ea60
fix: add preserve line in redisPingAsync
2023-01-13 21:30:10 +08:00
long2ice
21cd4d64c3
fix: redisPingAsync
2023-01-13 19:10:07 +08:00
long2ice
db757123ba
refactor: reuse databaseConnectionString
2023-01-13 16:32:49 +08:00
Ruben
71f00b3690
Parse push ping parameter with parseInt.
2023-01-12 18:33:39 +01:00
Nelson Chan
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2023-01-12 21:25:33 +08:00
shyneko
b91fe9d96d
Added a more telegram options
...
such as thread id, silent notifications and forward protect
2023-01-12 15:09:05 +02:00
Sebastian Kaempfe
a21a47de93
[ #2593 ] renamed the method sendCertNotification
to better represent what id does. Evaluate certificate expiry from all certs in chain. Send a separate notification for every cert in chain, including cert type and CN.
2023-01-12 11:39:36 +01:00
Sebastian Kaempfe
f6d0f28b3a
[ #2593 ] during certificate evaluation also set the cert type for improved notifications
2023-01-12 11:34:37 +01:00
Łukasz Szczepański
8433bceb32
Trim message to maximum allowed length
2023-01-12 08:14:31 +01:00
Louis Lam
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
...
Add Splunk Notification Provider
2023-01-12 14:15:36 +08:00
Nelson Chan
0ed3dd5e4f
Fix: Add support for pending in badges
2023-01-12 04:14:46 +08:00
Louis Lam
d9f12a6376
Fallback to /bin/ping
if ping
is not found
2023-01-12 01:05:16 +08:00
Łukasz Szczepański
56ba133a1f
Missing semicolon
2023-01-11 14:36:33 +01:00
Łukasz Szczepański
ec30147a7f
Add option for allowing long sms in PromoSMS
2023-01-11 14:32:57 +01:00
Luke
2172112144
Setting for allowing long sms
2023-01-11 12:13:47 +01:00
Luke
ecd661c801
Allow long sms in PromoSMS
2023-01-11 12:06:09 +01:00
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-11 10:34:24 +01:00
Nelson Chan
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2023-01-10 19:25:31 +08:00
Matthew Nickson
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-09 20:20:09 +00:00
Joseph Irving
33355c51b7
Add Splunk Notifications
2023-01-09 13:33:10 +00:00
Sjouke de Vries
94b69935fe
chore(server): remove comments from status-page router
2023-01-09 11:16:47 +01:00
Sjouke de Vries
3f30feaefb
feat(server): add badge for overall status of status-page
2023-01-09 11:04:32 +01:00
Louis Lam
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
...
Fixed negative retention time values
2023-01-09 13:08:35 +08:00
Matthew Nickson
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-08 19:09:06 +00:00
SlothCroissant
f8658d6160
Removed redundant title in Pushover notification
2023-01-08 10:32:16 -06:00
Nelson Chan
dd82f36da3
Fix: Improve syntax & fix weird label logic
2023-01-09 00:16:18 +08:00
Adam Spurgeon
774d754b21
Add GameDig monitor
2023-01-08 21:43:30 +13:00
Matthew Nickson
5d6770c0db
Removed excess space around function
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:12:21 +00:00
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-06 20:09:40 +00:00
Louis Lam
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2023-01-06 23:04:02 +08:00
Matthew Nickson
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-05 22:19:05 +00:00
long2ice
40ebc2df79
feat: support redis monitor
2023-01-05 23:02:56 +08:00
twiggotronix
8ec240fe19
Merge branch 'louislam:master' into add-mqtt-schemes
2023-01-05 14:08:05 +01: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
0b959514f8
Fix timeout
2023-01-05 20:38:37 +08:00
Louis Lam
7d92351568
Match previous settings
2023-01-05 19:30:55 +08:00
Louis Lam
494c53971c
Convert to UTF8 on Windows only
2023-01-05 19:22:15 +08:00
David Twigger
fc1914bccd
Fix lint
2023-01-05 11:42:19 +01:00
David Twigger
c196c34840
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2023-01-05 08:57:48 +01:00
Matthew Nickson
90a2668272
Restructured condition + ensure data is UTF-8
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-04 17:32:27 +00:00
Matthew Nickson
69e1880cd3
Added not active condition to prevent false error
...
Added a check to see if the host is alive. This prevents failiures when
the user specifies a hostname of `unknown`.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2023-01-04 16:46:36 +00: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
Nelson Chan
204792dd2d
Fix: Fix incorrect handling for container down
2023-01-03 22:07:14 +08:00
Nelson Chan
942b55ca03
Fix: Add support for maintenance in badges
2023-01-03 21:45:55 +08:00
Louis Lam
0cead83705
Fix #2516
2023-01-03 14:50:41 +08:00
Arniwatt Chonkiattipoom
a8af2a418e
Slack notification block not working ( #1958 )
...
* [empty commit] pull request for slack notification
* Add attachments block for slack notification
* chore: update action button in new attachment block
* chore: loop in attachments to push blocks
* chore: missing semicolon
Co-authored-by: pruekanw <arniwatt.c@linecorp.com>
2023-01-02 15:01:50 +08:00
Louis Lam
39ac9b887e
Fix #2504
2023-01-01 22:27:14 +08:00
Louis Lam
50711391d1
Revert "Auth: Case insensitive login check on username"
2023-01-01 22:19:00 +08:00
Louis Lam
e88e10cc8e
Fix #2494
2023-01-01 21:43:54 +08:00
Louis Lam
27146ffeef
Merge pull request #2433 from mathiash98/mathias/Auth-case-insensitive-login
...
Auth: Case insensitive login check on username
2023-01-01 14:16:59 +08:00
Louis Lam
41a9f2ff8a
Merge pull request #2495 from minhhoangvn/fix/update-service-name-grpc
...
Bug fix: gRPC check throws errors when response data size > 50 chars
2023-01-01 13:57:10 +08:00
Louis Lam
cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
...
Add Kook notification provider
2023-01-01 02:53:03 +08:00
Louis Lam
8bb064c6fa
Merge pull request #2157 from Mikkel-T/fix-discord-embed
...
Improve the URL field in Discord embeds
2022-12-31 22:41:40 +08:00
Louis Lam
1006fbd873
A possible fix for #2447
2022-12-30 13:46:53 +08:00
Louis Lam
5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
...
Zoho Cliq Notification Provider
2022-12-29 19:00:50 +08:00
minhhoang
d111db0321
fix: add accurate error message when user input invalid service name or method name
2022-12-29 08:10:58 +07:00
minhhoang
4147a4c404
fix : #2480
2022-12-28 22:31:33 +07:00
Ruben
9404efd86d
Fixed the metrics for the push type.
2022-12-28 10:37:25 +01:00
401Unauthorized
c60b741406
Add kook notification provider
2022-12-27 14:12:22 +08:00
Louis Lam
e12225e595
Fix #2475 #2468 #2455 , add Accept-Encoding only if encountered the abort error
2022-12-26 21:00:46 +08:00
Louis Lam
1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
...
Fix discord notification not sending when docker container goes down
2022-12-24 14:26:53 +08:00
Louis Lam
14fffcf06b
Globally fix if heartbeatJSON["msg"] is undefined
2022-12-24 14:23:50 +08:00
Louis Lam
a4de93f976
WIP
2022-12-23 22:43:56 +08:00
Mathias Haugsbø
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
2022-12-19 12:18:33 +01:00
Mathias Haugsbø
c79b2913a2
Auth: Case insensitive login check on username
...
Allows users to add users with capital letters and then login with just lowercase letters.
We accidentally capitalized the first letter of our username so the other people using it frequently thinks they wrote the wrong password.
2022-12-18 17:16:19 +01:00
Louis Lam
df21f7da76
Check login for initServerTimezone
2022-12-16 12:56:40 +08:00
Louis Lam
b75db27658
Fix lint
2022-12-15 13:57:28 +08:00
Louis Lam
765d8e1297
Fix #2318
2022-12-15 13:39:48 +08:00
Louis Lam
9dc2cc1f0d
Copy timezone.js from dayjs
2022-12-15 13:05:04 +08:00
Louis Lam
1da00d19fd
Try to fix incorrect header check
2022-12-14 21:34:13 +08:00
Louis Lam
466b403a96
Handle unexpected error of checkCertificate
2022-12-13 02:21:12 +08:00
zImPatrick
f32441e2f6
fix discord notification not sending when docker container is down
2022-12-12 18:05:10 +01:00
Louis Lam
39987ba9ac
Init server timezone
2022-12-12 22:57:57 +08:00
Louis Lam
3b87209e26
Add configurable dns cache
2022-12-12 17:19:22 +08:00
Louis Lam
3b58fd3b3c
Cache uptime
2022-12-11 21:33:26 +08:00
Louis Lam
bc86f8bb5f
Reset busy_timeout to default
2022-12-11 20:25:15 +08:00
Louis Lam
02b5cae577
Fix #2371 by left join maintenance_timeslot
2022-12-09 21:03:12 +08:00
Louis Lam
4cd5b5563f
Fix #1145
2022-12-08 23:21:55 +08:00
panos
9da28fbbc7
zoho cliq code style
2022-12-08 13:56:02 +02:00
panos
851a04b082
zoho cliq code style
2022-12-08 13:53:02 +02:00
panos
68bc7ac421
zoho cliq code style
2022-12-08 13:41:05 +02:00
panos
73bfdb9ef9
zoho cliq notification provider
2022-12-08 13:32:10 +02:00
Louis Lam
e478084ff9
Fix Uptime Kuma cannot be stopped
2022-12-08 19:13:47 +08:00
Louis Lam
eadf2c810a
Fix check version
2022-12-05 19:17:24 +08:00
Louis Lam
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2022-12-05 18:18:19 +08:00
Louis Lam
e886df4788
Fix typo
2022-12-05 17:55:45 +08:00
Louis Lam
5196abfd36
Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919
2022-12-05 17:52:02 +08:00
Louis Lam
3e68cf2a1c
Specify Accept-Encoding
for axios request ( Fix #2253 )
2022-12-04 22:55:05 +08:00
Louis Lam
191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
...
Add socks5h support
2022-11-25 16:24:21 +08:00
Joshua Brunner
cd270bd8b5
Add socks5h support
...
Add socks5h support as an extra option to not break previous socks5 implementation.
Allows to toggle between socks5 and socks5h explicit.
Fixes #2296
2022-11-22 11:18:16 +01: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
Matthew Nickson
b053bc61ce
Fixed MySQL monitor to close connection
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-11-17 18:34:02 +00:00
rmarops
0e30843a75
fixed lint check missing semicolon
2022-11-16 22:27:18 -05:00
rmarops
2103edb604
moved client close out of finally block and fixed linting errors
2022-11-16 22:21:15 -05:00
rmarops
b059a36e66
added MongoDB ping monitor
2022-11-16 20:50:34 -05:00
Jan Hartje
258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919
2022-11-14 20:17:36 +01:00
Louis Lam
cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2022-11-15 02:37:28 +08:00
Dafnik
4042c26390
Fix 'undefined' in link preview generation
2022-11-14 18:05:52 +01: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
68862c0b3f
Fix Pushbullet do not handle general message correctly and fix name convention ( Close #1890 )
2022-11-01 20:27:40 +08:00
Louis Lam
fd15e7c2dc
Merge remote-tracking branch 'origin/master' into ntfy-icon
...
# Conflicts:
# server/notification-providers/ntfy.js
# src/components/notifications/Ntfy.vue
# src/languages/en.js
2022-10-31 17:10:20 +08:00
Louis Lam
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
...
Added support for SMSEagle device API notifications
2022-10-31 17:03:34 +08:00
minhhn3
b459408b10
fix: resolve conflict
2022-10-26 20:41:21 +07:00
Adam Stachowicz
134b3b8ac1
Fix 'dayjs' is never used warning
2022-10-25 01:27:25 +02:00
Marcin Kiszka
08763b700a
Added support for SMSEagle device API notifications
2022-10-24 12:45:56 +02:00
Matthew Nickson
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-10-22 16:22:28 +01:00
Louis Lam
24cb212a37
Fix recurring
2022-10-15 20:15:50 +08:00
Louis Lam
d8a676abb6
Implement recurring day of month and day of week
2022-10-15 18:49:09 +08:00
Louis Lam
0b8d4cdaac
Generate Next Timeslot for recurring interval
2022-10-15 17:17:26 +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
Matthew Nickson
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
Louis Lam
b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect
...
Fixed entry route not redirecting correctly.
2022-10-13 00:28:34 +08:00
Louis Lam
edacff123b
Add UTC in the serverTimezone dropdown
2022-10-12 22:13:07 +08:00
Louis Lam
2faf866e9e
Implement generateTimeslot() for recurring interval type
2022-10-12 17:02:16 +08:00
Louis Lam
7b9766091e
Revert testing
2022-10-11 22:18:09 +08:00
Louis Lam
39b6725163
Update maintenance tables
2022-10-11 21:48:43 +08:00
Louis Lam
dfb75c8afb
Update status page's maintenance message
2022-10-11 20:56:48 +08:00
Louis Lam
e07aa982c3
WIP
2022-10-11 18:23:17 +08:00
Christian Meis
1e8a16504b
Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2022-10-11 11:15:33 +02:00
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2022-10-11 14:52:47 +08:00
Louis Lam
c84de4d259
WIP: Add maintenance status
2022-10-11 01:45:30 +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
71af23cf00
Fix #2207
2022-10-10 02:47:24 +08:00
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2022-10-10 02:28:03 +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
ad1a7c255f
Drop exports.entryPage fully
2022-10-08 23:56:58 +08:00
Louis Lam
6e07ed2081
Fix #2186
2022-10-07 15:02:19 +08:00
Louis Lam
959ecc65ff
Merge remote-tracking branch 'origin/master'
2022-10-06 23:28:29 +08:00
Louis Lam
c24b64921d
Fix #2183 ntfy issue
2022-10-06 23:28:06 +08:00
janhartje
b879428a03
feat(notification): add additional Header to webhook
2022-10-05 17:48:07 +02: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
janhartje
3c5de1c889
Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919
2022-10-05 16:44:13 +02:00
CL0Pinette
528a615fb2
Add free.fr SMS notification provider ( #2159 )
2022-10-05 17:30:49 +08:00
Louis Lam
b993859926
Drop Jest e2e testing ( #2174 )
2022-10-05 14:26:30 +08:00
Sympatron GmbH
f1a9046193
Prevent terminal window from showing when using ping on Windows ( #2152 )
2022-10-04 23:30:19 +08:00
Louis Lam
c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor
...
Fix Docker container monitor not working in 1.18.1
2022-10-04 17:47:56 +08:00
Louis Lam
0686757160
[Docker Monitor] Change tcp://
to http://
2022-10-04 16:19:56 +08:00
George Tsomlektsis
3e699f8ac3
Fix linting errors.
2022-10-03 18:01:52 +03:00
George Tsomlektsis
b0d6b5b13d
Fixed entry route not redirecting correctly when the status entry page changes slug.
2022-10-03 17:48:34 +03:00
Louis Lam
3e85893bdd
Merge remote-tracking branch 'origin/master' into squadcast-notification-support
...
# Conflicts:
# src/languages/en.js
2022-10-03 16:16:50 +08:00
Louis Lam
543a74ecab
Merge pull request #1923 from rolfbachmann/ntfy-auth-support
...
Add authentication support for ntfy
2022-10-03 15:54:55 +08:00
Louis Lam
62ad2f9bb4
Merge pull request #2148 from Computroniks/bug/octopush-notifications-#2144
...
Fixed octopush legacy doesn't return error code
2022-10-03 15:53:54 +08:00
Louis Lam
0f99d49a27
Merge remote-tracking branch 'origin/master' into ntfy-auth-support
2022-10-03 15:30:00 +08:00
Louis Lam
d93f7b33be
Merge pull request #2153 from Computroniks/bug/#2009-teams-unnecessary-url-field
...
Fixed alert features unnecessary URL field #2009
2022-10-03 15:20:45 +08:00
Mikkel-T
a42f7416b5
Improve the URL field in Discord embeds
...
Instead of having two different ways of showing the URL field in Discord embeds, always show the raw address.
2022-10-02 19:29:33 +02:00
Matthew Nickson
6a3eccf6a6
Fixed alert features unnecessary URL field #2009
...
The filling of the URL field was incorrect previously. It has been
updated to handle new monitor types.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-02 02:26:38 +01: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
Matthew Nickson
97de3959cd
Updated octopush error handling to accept 000
...
The legacy octopush API includes an error code with all responses. A
code other than 000 is an error.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 19:48:00 +01:00
Matthew Nickson
63e408f4f2
Fixed octopush legacy doesn't return error code
...
The octopush legacy API does not return a HTTP error code and instead
always returns a HTTP 200. This means that no error it thrown even if
something like the parameters are incorrect.
Instead the error code is given in the json response data.
Therefore we must look at the response data and check for the presence
of the "error_code" key in the response data.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 15:42:34 +01:00
Matthew Nickson
2e54dee817
Fixed Octopush Notifier not working #2144
...
The version number was passed as a string from the frontend but was
checked against a number in the backend provider. This caused the if else
if to fall through into an error. The literal it is now being compared
has been changed to a string and the unknown version error is no longer
encountered.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-10-01 15:03:28 +01:00
Christian Meis
e12642cf21
Fix double quotes in fallback for no icon url in ntfy notification provider settings
2022-09-28 10:24:56 +02:00
Christian Meis
6f86236b63
Add support for icon to ntfy notification provider (requires minimum ntfy server version 1.28.0 and Android app 1.14.0, no iOS support as of today)
2022-09-28 10:13:18 +02:00
Louis Lam
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2022-09-28 00:48:15 +08:00
Louis Lam
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2022-09-28 00:20:17 +08:00
Louis Lam
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2022-09-27 20:44:44 +08:00
Justin Tisdale
6537f4fe74
content-type change
2022-09-26 17:09:10 -04:00
Justin Tisdale
5809088f27
Don't override a user-defined content-type header
2022-09-26 15:52:43 -04:00
Patrick
bef9cb6a5f
Linting fixes
2022-09-26 22:30:43 +13:00
Patrick
4157c7d546
Add support for Squadcast incoming webhook
2022-09-26 22:16:34 +13:00
Justin Tisdale
0814d643c1
Merge branch 'master' into feature/expand-http-payload-support
2022-09-25 10:45:32 -04:00
Louis Lam
3f63cb246b
[WIP] Handle timezone offset for timeRange
2022-09-25 19:38:28 +08:00
Louis Lam
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2022-09-24 19:18:24 +08:00
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2022-09-24 02:33:29 +08:00
MA Junyi
b03624b7e3
feat: Add ServerChan Notification support
2022-09-23 23:27:22 +08:00
Louis Lam
120e578398
Move maintenance code to maintenance-socket-handler.js
2022-09-17 16:58:08 +08:00
Louis Lam
7017c2e625
Move maintenance code to maintenance-socket-handler.js
2022-09-17 16:54:21 +08:00
Louis Lam
2f67d26702
Merge manually, as this part had been moved
2022-09-17 16:20:10 +08:00
Louis Lam
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
Louis Lam
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager
...
feat: Add support notification via SMSManager
2022-09-16 14:29:50 +08:00
Super Manito
38c45a3fe3
Fix previously PR bug about Bark Notification ( #2084 )
...
Co-authored-by: zuosc <zorro.zsc@hotmail.com>
2022-09-16 14:21:22 +08:00
jakubenglicky
2d5096317f
Fix warning at goalert.js
2022-09-15 09:11:27 +02:00
jakubenglicky
1c3da995e3
Add support notification via SMSManager
2022-09-15 09:11:05 +02:00
Matthew Nickson
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-09-10 21:20:03 +01: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
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2022-09-09 03:34:37 +08:00
Justin Tisdale
fa1fc0fb05
Merge branch 'master' into feature/expand-http-payload-support
2022-09-07 11:34:58 -04:00
Louis Lam
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2022-08-29 21:19:15 +08:00
Muhammed Hussein karimi
a8ea76e8a1
Remove extra debug log
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-26 17:05:32 +04:30
Muhammed Hussein Karimi
584d52517a
[Linter] fixing quotes with doublequote
2022-08-24 10:41:42 +04:30
Muhammed Hussein Karimi
82dd9a7c16
golaert req fix and axios update for formdata
2022-08-24 10:36:29 +04:30
Muhammed Hussein Karimi
d44663c57c
provider name fix
2022-08-24 09:37:15 +04:30
Muhammed Hussein Karimi
e557545c97
goalert needs post instead of get
2022-08-24 08:46:20 +04:30
Muhammed Hussein Karimi
40b9d9ed17
goalert provider missing semicolon fix for linter
2022-08-23 22:26:20 +04:30
Muhammed Hussein Karimi
65e6921a41
goalert notification provider added
2022-08-23 22:22:54 +04:30
minhhn3
3a90d246a4
fix: wrong type
2022-08-20 22:45:11 +07:00
Justin Tisdale
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2022-08-20 10:24:18 -04:00
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2022-08-13 21:15:16 +02:00
minhhn3
6bb79597e8
fix: resolve merge conflict
2022-08-13 13:26:05 +07:00
Louis Lam
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2022-08-13 13:24:00 +08:00
Justin Tisdale
31cc328839
fix lint
2022-08-11 21:08:13 -04:00
Justin Tisdale
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2022-08-11 21:04:11 -04:00
Justin Tisdale
2b9bf095a6
Add non-json support for http body
2022-08-11 20:57:03 -04: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
34ab6142db
fix: remove new space line
2022-08-08 19:38:43 +07:00
Louis Lam
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2022-08-08 17:04:08 +08:00
Louis Lam
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2022-08-08 17:00:06 +08:00
Louis Lam
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
2022-08-06 18:08:06 +08:00
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2022-08-05 15:40: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
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2022-08-02 19:08:46 +08:00
Joseph Benguira
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-08-01 13:18:19 +03:00
Louis Lam
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2022-08-01 15:42:58 +08:00
Joseph Benguira
71d62ee151
removed ; after the PRAGMA command
2022-07-31 19:00:19 +03:00
Joseph Benguira
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2022-07-31 18:59:02 +03:00
Joseph Benguira
f016caa513
Avoid error "SQLITE_BUSY: database is locked"
...
Avoid error "SQLITE_BUSY: database is locked" by allowing SQLITE to wait up to 5 seconds to do a write
2022-07-31 18:51:53 +03:00
Louis Lam
2389b604fe
Use Settings.get
2022-07-31 23:41:29 +08:00
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2022-07-31 23:36:33 +08:00
Louis Lam
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2022-07-31 23:27:35 +08:00
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2022-07-31 20:06:45 +08:00
rmt/src
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2022-07-31 12:41:18 +01:00
Louis Lam
8ced61697a
Fix save docker host issue
2022-07-30 19:48:12 +08:00
Louis Lam
f3322398e5
Fix and improve test docker host
2022-07-29 20:57:13 +08:00
0x01code
4575f31094
Add support for line notify providers ( #1781 )
...
* add line notify support
* add way to get line notify
* Fix duplicate key 'HTTP Basic Auth'
* Revert language files changes
* Revert language files changes
* Fix general message
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2022-07-29 15:13:50 +08:00
Moritz R
60e7824ff0
Merge branch 'master' into master
2022-07-24 14:37:22 +02:00
c0derMo
fb3b407577
Added a settings page & localization
2022-07-24 12:34:43 +00: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
c0derMo
e356d5f623
Fixing linting & adding documentation
2022-07-22 15:57:40 +00:00
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2022-07-22 15:47:04 +00:00
Louis Lam
239611a016
Do not set sendUrl if sendUrl is undefined
2022-07-22 23:27:02 +08:00
Rolf Bachmann
c4a2ce4e78
Add authentication support for ntfy
2022-07-19 12:17:15 +02:00
tamasmagyar
a382f811f4
added comment to startE2eTests function
2022-07-18 20:51:17 +02:00
tamasmagyar
986c03aecd
test cypress run
2022-07-18 20:51:17 +02:00
Jan Hartje
af07c7f050
feat(notification): add Authorization Header option to backend
2022-07-18 16:04:27 +00:00
Louis Lam
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2022-07-18 23:46:55 +08:00
Louis Lam
17ed051401
Add CacheableDnsHttpAgent.install()
2022-07-18 23:32:45 +08:00
Louis Lam
1999541802
Merge remote-tracking branch 'origin/master' into dns
2022-07-18 23:25:14 +08:00
Louis Lam
65d71e5db0
Fix mssqlQuery keep adding error listener, which causes memory leak.
...
Also it is not necessary since the error catched in the promise .catch(..).
2022-07-18 23:14:16 +08:00
Louis Lam
2073f0c284
Bind cacheable-lookup to custom http agent
2022-07-18 22:33:35 +08:00
Louis Lam
25d711e683
Fix jsdoc data type
2022-07-18 22:06:25 +08:00
Matthew Nickson
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2022-07-14 09:19:40 +01:00
Matthew Nickson
a54e58b4d6
Added Ping packet size #1891
...
This should fully implement #1891 by adding an extra field to the edit
monitor page and an extra column to the database. The user can now
set the size of the packet to send, it defaults to 56. A maximum limit
of 65500 was chosen to ensure that the total size of the packet does
not exceed the IPv4 maximum packet size and to comply with the limit
imposed by Windows.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2022-07-14 08:32:51 +01:00
Louis Lam
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2022-07-14 15:04:35 +08:00
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2022-07-12 22:59:23 -04:00
Chongyi Zheng
f33b6de157
Support X-Forwarded-Host header
2022-07-11 01:28:50 -04:00