Louis Lam
1326761a8a
Update mongodb and simplify the logic of mongodbPing
2 years ago
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
2 years ago
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
2 years ago
Faruk Genç
3adc9e65d6
Add only xml support to http monitors
2 years ago
Louis Lam
712a3c29d4
Fix Postgres monitor do not handle some error cases correctly
2 years ago
Louis Lam
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2 years ago
long2ice
3b5893ea60
fix: add preserve line in redisPingAsync
2 years ago
long2ice
21cd4d64c3
fix: redisPingAsync
2 years ago
long2ice
db757123ba
refactor: reuse databaseConnectionString
2 years ago
Ruben
71f00b3690
Parse push ping parameter with parseInt.
2 years ago
Nelson Chan
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2 years ago
shyneko
b91fe9d96d
Added a more telegram options
...
such as thread id, silent notifications and forward protect
2 years ago
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.
2 years ago
Sebastian Kaempfe
f6d0f28b3a
[ #2593 ] during certificate evaluation also set the cert type for improved notifications
2 years ago
Łukasz Szczepański
8433bceb32
Trim message to maximum allowed length
2 years ago
Louis Lam
98d001b38b
Merge pull request #2575 from Joseph-Irving/victorops_notifications
...
Add Splunk Notification Provider
2 years ago
Nelson Chan
0ed3dd5e4f
Fix: Add support for pending in badges
2 years ago
Louis Lam
d9f12a6376
Fallback to `/bin/ping` if `ping` is not found
2 years ago
Łukasz Szczepański
56ba133a1f
Missing semicolon
2 years ago
Łukasz Szczepański
ec30147a7f
Add option for allowing long sms in PromoSMS
2 years ago
Luke
2172112144
Setting for allowing long sms
2 years ago
Luke
ecd661c801
Allow long sms in PromoSMS
2 years ago
twiggotronix
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
Nelson Chan
21b418230c
Chore: reorder cases
...
Co-authored-by: Frank Elsinga <frank@elsinga.de>
2 years ago
Matthew Nickson
66d5408aad
Added DB schema for api keys
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Joseph Irving
33355c51b7
Add Splunk Notifications
2 years ago
Sjouke de Vries
94b69935fe
chore(server): remove comments from status-page router
2 years ago
Sjouke de Vries
3f30feaefb
feat(server): add badge for overall status of status-page
2 years ago
Louis Lam
439f963749
Merge pull request #2569 from Computroniks/bug/2565-negative-retention-value
...
Fixed negative retention time values
2 years ago
Matthew Nickson
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
SlothCroissant
f8658d6160
Removed redundant title in Pushover notification
2 years ago
Nelson Chan
dd82f36da3
Fix: Improve syntax & fix weird label logic
2 years ago
Adam Spurgeon
774d754b21
Add GameDig monitor
2 years ago
Matthew Nickson
5d6770c0db
Removed excess space around function
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
21c1921867
Update server/uptime-kuma-server.js
...
Co-authored-by: 琚致远 / Zhiyuan Ju <juzhiyuan@apache.org>
2 years ago
Matthew Nickson
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
long2ice
40ebc2df79
feat: support redis monitor
2 years ago
twiggotronix
8ec240fe19
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
Louis Lam
fbceefec36
Merge pull request #2223 from Computroniks/feature/remove-hardcoded-ping-path
...
feat: Change ping module to danielzzz/node-ping
2 years ago
Louis Lam
0b959514f8
Fix timeout
2 years ago
Louis Lam
7d92351568
Match previous settings
2 years ago
Louis Lam
494c53971c
Convert to UTF8 on Windows only
2 years ago
David Twigger
fc1914bccd
Fix lint
2 years ago
David Twigger
c196c34840
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
Matthew Nickson
90a2668272
Restructured condition + ensure data is UTF-8
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
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>
2 years ago
Matthew Nickson
73835f3328
Changed from ping-lite to ping module
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
#Fixes 2126
2 years ago
Nelson Chan
204792dd2d
Fix: Fix incorrect handling for container down
2 years ago
Nelson Chan
942b55ca03
Fix: Add support for maintenance in badges
2 years ago
Louis Lam
0cead83705
Fix #2516
2 years ago
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>
2 years ago
Louis Lam
39ac9b887e
Fix #2504
2 years ago
Louis Lam
50711391d1
Revert "Auth: Case insensitive login check on username"
2 years ago
Louis Lam
e88e10cc8e
Fix #2494
2 years ago
Louis Lam
27146ffeef
Merge pull request #2433 from mathiash98/mathias/Auth-case-insensitive-login
...
Auth: Case insensitive login check on username
2 years ago
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
2 years ago
Louis Lam
cd7a6e4019
Merge pull request #2478 from YehowahLiu/master
...
Add Kook notification provider
2 years ago
Louis Lam
8bb064c6fa
Merge pull request #2157 from Mikkel-T/fix-discord-embed
...
Improve the URL field in Discord embeds
2 years ago
Louis Lam
1006fbd873
A possible fix for #2447
2 years ago
Louis Lam
5554432b31
Merge pull request #2377 (Zoho Cliq Notification Provider)
...
Zoho Cliq Notification Provider
2 years ago
minhhoang
d111db0321
fix: add accurate error message when user input invalid service name or method name
2 years ago
minhhoang
4147a4c404
fix : #2480
2 years ago
Ruben
9404efd86d
Fixed the metrics for the push type.
2 years ago
401Unauthorized
c60b741406
Add kook notification provider
2 years ago
Louis Lam
e12225e595
Fix #2475 #2468 #2455 , add Accept-Encoding only if encountered the abort error
2 years ago
Louis Lam
1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
...
Fix discord notification not sending when docker container goes down
2 years ago
Louis Lam
14fffcf06b
Globally fix if heartbeatJSON["msg"] is undefined
2 years ago
Louis Lam
a4de93f976
WIP
2 years ago
Mathias Haugsbø
b3ac7c3d43
Username case insensitive, patch db instead of using LIKE
2 years ago
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.
2 years ago
Louis Lam
df21f7da76
Check login for initServerTimezone
2 years ago
Louis Lam
b75db27658
Fix lint
2 years ago
Louis Lam
765d8e1297
Fix #2318
2 years ago
Louis Lam
9dc2cc1f0d
Copy timezone.js from dayjs
2 years ago
Louis Lam
1da00d19fd
Try to fix `incorrect header check`
2 years ago
Louis Lam
466b403a96
Handle unexpected error of checkCertificate
2 years ago
zImPatrick
f32441e2f6
fix discord notification not sending when docker container is down
2 years ago
Louis Lam
39987ba9ac
Init server timezone
2 years ago
Louis Lam
3b87209e26
Add configurable dns cache
2 years ago
Louis Lam
3b58fd3b3c
Cache uptime
2 years ago
Louis Lam
bc86f8bb5f
Reset busy_timeout to default
2 years ago
Louis Lam
02b5cae577
Fix #2371 by left join maintenance_timeslot
2 years ago
Louis Lam
4cd5b5563f
Fix #1145
2 years ago
panos
9da28fbbc7
zoho cliq code style
2 years ago
panos
851a04b082
zoho cliq code style
2 years ago
panos
68bc7ac421
zoho cliq code style
2 years ago
panos
73bfdb9ef9
zoho cliq notification provider
2 years ago
Louis Lam
e478084ff9
Fix Uptime Kuma cannot be stopped
2 years ago
Louis Lam
eadf2c810a
Fix check version
2 years ago
Louis Lam
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2 years ago
Louis Lam
e886df4788
Fix typo
2 years ago
Louis Lam
5196abfd36
Merge remote-tracking branch 'origin/master' into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
Louis Lam
3e68cf2a1c
Specify `Accept-Encoding` for axios request ( Fix #2253 )
2 years ago
Louis Lam
191f3ad53b
Merge pull request #2339 from jbrunner/fix-2296
...
Add socks5h support
2 years ago
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
2 years ago
Matthew Nickson
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
b053bc61ce
Fixed MySQL monitor to close connection
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
rmarops
0e30843a75
fixed lint check missing semicolon
2 years ago
rmarops
2103edb604
moved client close out of finally block and fixed linting errors
2 years ago
rmarops
b059a36e66
added MongoDB ping monitor
2 years ago
Jan Hartje
258ff56962
Merge branch 'louislam:master' into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
Louis Lam
cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2 years ago
Dafnik
4042c26390
Fix 'undefined' in link preview generation
2 years ago
Louis Lam
cc6d17d2e0
Merge pull request #1964 from minhhoangvn/feat/add-gRPC-protocol
...
Feat/add gRPC protocol
2 years ago
Louis Lam
68862c0b3f
Fix Pushbullet do not handle general message correctly and fix name convention ( Close #1890 )
2 years ago
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
2 years ago
Louis Lam
5c4cf68937
Merge pull request #2260 from m-kiszka/smseagle
...
Added support for SMSEagle device API notifications
2 years ago
minhhn3
b459408b10
fix: resolve conflict
2 years ago
Adam Stachowicz
134b3b8ac1
Fix 'dayjs' is never used warning
2 years ago
Marcin Kiszka
08763b700a
Added support for SMSEagle device API notifications
2 years ago
Matthew Nickson
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam
24cb212a37
Fix recurring
2 years ago
Louis Lam
d8a676abb6
Implement recurring day of month and day of week
2 years ago
Louis Lam
0b8d4cdaac
Generate Next Timeslot for recurring interval
2 years ago
Louis Lam
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
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>
2 years ago
Louis Lam
b24c75eec5
Merge pull request #2162 from UltraWelfare/fix-entry-page-redirect
...
Fixed entry route not redirecting correctly.
2 years ago
Louis Lam
edacff123b
Add UTC in the serverTimezone dropdown
2 years ago
Louis Lam
2faf866e9e
Implement generateTimeslot() for recurring interval type
2 years ago
Louis Lam
7b9766091e
Revert testing
2 years ago
Louis Lam
39b6725163
Update maintenance tables
2 years ago
Louis Lam
dfb75c8afb
Update status page's maintenance message
2 years ago
Louis Lam
e07aa982c3
WIP
2 years ago
Christian Meis
1e8a16504b
Make icon optional for ntfy notificaation provider. Add Icon header to ntfy request only, if icon is actually defined.
2 years ago
Louis Lam
2271ac4a5a
Add info.serverTimezoneOffset and improve some styles
2 years ago
Louis Lam
c84de4d259
WIP: Add maintenance status
2 years ago
Louis Lam
c1ccaa7a9f
WIP
2 years ago
Louis Lam
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
Louis Lam
71af23cf00
Fix #2207
2 years ago
Louis Lam
a577fba848
Change DateTime Range using serverTimezone
2 years ago
Louis Lam
a36f24d827
Add configurable server timezone
2 years ago
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
2 years ago
Louis Lam
ad1a7c255f
Drop exports.entryPage fully
2 years ago
Louis Lam
6e07ed2081
Fix #2186
2 years ago
Louis Lam
959ecc65ff
Merge remote-tracking branch 'origin/master'
2 years ago
Louis Lam
c24b64921d
Fix #2183 ntfy issue
2 years ago
janhartje
b879428a03
feat(notification): add additional Header to webhook
2 years ago
Ben Scobie
c28d8ddff9
Correctly handle multiple IPs in X-Forwarded-For ( #2177 )
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
janhartje
3c5de1c889
Merge branch 'master' of https://github.com/louislam/uptime-kuma into feat/add-auth-header-to-webhook-notification-#1919
2 years ago
CL0Pinette
528a615fb2
Add free.fr SMS notification provider ( #2159 )
2 years ago
Louis Lam
b993859926
Drop Jest e2e testing ( #2174 )
2 years ago
Sympatron GmbH
f1a9046193
Prevent terminal window from showing when using ping on Windows ( #2152 )
2 years ago
Louis Lam
c538983b87
Merge pull request #2169 from louislam/fix-docker-monitor
...
Fix Docker container monitor not working in 1.18.1
2 years ago
Louis Lam
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2 years ago
George Tsomlektsis
3e699f8ac3
Fix linting errors.
2 years ago
George Tsomlektsis
b0d6b5b13d
Fixed entry route not redirecting correctly when the status entry page changes slug.
2 years ago
Louis Lam
3e85893bdd
Merge remote-tracking branch 'origin/master' into squadcast-notification-support
...
# Conflicts:
# src/languages/en.js
2 years ago
Louis Lam
543a74ecab
Merge pull request #1923 from rolfbachmann/ntfy-auth-support
...
Add authentication support for ntfy
2 years ago
Louis Lam
62ad2f9bb4
Merge pull request #2148 from Computroniks/bug/octopush-notifications-#2144
...
Fixed octopush legacy doesn't return error code
2 years ago
Louis Lam
0f99d49a27
Merge remote-tracking branch 'origin/master' into ntfy-auth-support
2 years ago
Louis Lam
d93f7b33be
Merge pull request #2153 from Computroniks/bug/#2009-teams-unnecessary-url-field
...
Fixed alert features unnecessary URL field #2009
2 years ago
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.
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
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>
2 years ago
Christian Meis
e12642cf21
Fix double quotes in fallback for no icon url in ntfy notification provider settings
2 years ago
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)
2 years ago
Louis Lam
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2 years ago
Louis Lam
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
Louis Lam
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2 years ago
Justin Tisdale
6537f4fe74
content-type change
2 years ago
Justin Tisdale
5809088f27
Don't override a user-defined content-type header
2 years ago
Patrick
bef9cb6a5f
Linting fixes
2 years ago
Patrick
4157c7d546
Add support for Squadcast incoming webhook
2 years ago
Justin Tisdale
0814d643c1
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Louis Lam
3f63cb246b
[WIP] Handle timezone offset for timeRange
2 years ago
Louis Lam
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2 years ago
Louis Lam
9d99c39f30
Update Maintenance UI for recurring
2 years ago
MA Junyi
b03624b7e3
feat: Add ServerChan Notification support
2 years ago
Louis Lam
120e578398
Move maintenance code to `maintenance-socket-handler.js`
2 years ago
Louis Lam
7017c2e625
Move maintenance code to `maintenance-socket-handler.js`
2 years ago
Louis Lam
2f67d26702
Merge manually, as this part had been moved
2 years ago
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
2 years ago
Louis Lam
f96bad1629
Merge pull request #2089 from jakubenglicky/smsmanager
...
feat: Add support notification via SMSManager
2 years ago
Super Manito
38c45a3fe3
Fix previously PR bug about Bark Notification ( #2084 )
...
Co-authored-by: zuosc <zorro.zsc@hotmail.com>
2 years ago
jakubenglicky
2d5096317f
Fix warning at goalert.js
2 years ago
jakubenglicky
1c3da995e3
Add support notification via SMSManager
2 years ago
Matthew Nickson
742b1337be
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
Louis Lam
197d44981f
Merge remote-tracking branch 'origin/master' into test/add-cypress-tests
...
# Conflicts:
# package.json
2 years ago
Louis Lam
1e5376d80b
Merge pull request #2011 from mhkarimi1383/goalert-notification
...
Adding GoAlert Notification
2 years ago
Justin Tisdale
fa1fc0fb05
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Louis Lam
84fad93555
Merge pull request #1735 from woooferz/patch-1
...
Added label to status badge
2 years ago
Muhammed Hussein karimi
a8ea76e8a1
Remove extra debug log
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
Muhammed Hussein Karimi
584d52517a
[Linter] fixing quotes with doublequote
2 years ago
Muhammed Hussein Karimi
82dd9a7c16
golaert req fix and axios update for formdata
2 years ago
Muhammed Hussein Karimi
d44663c57c
provider name fix
2 years ago
Muhammed Hussein Karimi
e557545c97
goalert needs post instead of get
2 years ago
Muhammed Hussein Karimi
40b9d9ed17
goalert provider missing semicolon fix for linter
2 years ago
Muhammed Hussein Karimi
65e6921a41
goalert notification provider added
2 years ago
minhhn3
3a90d246a4
fix: wrong type
2 years ago
Justin Tisdale
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Matthew Nickson
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
minhhn3
6bb79597e8
fix: resolve merge conflict
2 years ago
Louis Lam
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
Justin Tisdale
31cc328839
fix lint
2 years ago
Justin Tisdale
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
Justin Tisdale
2b9bf095a6
Add non-json support for http body
2 years ago
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
2 years ago
minhhn3
34ab6142db
fix: remove new space line
2 years ago
Louis Lam
9a488d6968
Merge pull request #1752 from SuperManito/master
...
Add Bark Notification Parameters
2 years ago
Louis Lam
aca395cea1
Merge pull request #1957 from jbenguira/patch-2
...
Avoid error "SQLITE_BUSY: database is locked"
2 years ago
Louis Lam
a49faf09b9
Merge pull request #1836 from rmtsrc/add-home-assistant-notification
...
feat: added Home Assistant notification integration
2 years ago
Louis Lam
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
minhhn3
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
Minh Hoàng
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
Louis Lam
70aa8fe453
Merge pull request #1183 from c0derMo/master
...
Adding option to monitor other docker containers
2 years ago
Joseph Benguira
d6a113396a
Update server/database.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
Louis Lam
fb3fe17c28
Fix getClientIP
...
Co-authored-by: Mateusz Hajder <6783135+mhajder@users.noreply.github.com>
2 years ago
Joseph Benguira
71d62ee151
removed ; after the PRAGMA command
2 years ago
Joseph Benguira
82b9bfc5a0
fixed Trailing spaces not allowed lint issue
2 years ago
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
2 years ago
Louis Lam
2389b604fe
Use Settings.get
2 years ago
Louis Lam
a3b1612938
getClientIP respect trustProxy setting
2 years ago
Louis Lam
a07f54f35b
Merge remote-tracking branch 'origin/master' into theS1LV3R_master
2 years ago
Louis Lam
bea8679788
Merge branch 'master' into issue-1861
2 years ago
rmt/src
f091e92c70
Merge branch 'master' of github.com:rmtsrc/uptime-kuma into add-home-assistant-notification
2 years ago
Louis Lam
8ced61697a
Fix save docker host issue
2 years ago
Louis Lam
f3322398e5
Fix and improve test docker host
2 years ago
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>
2 years ago
Moritz R
60e7824ff0
Merge branch 'master' into master
2 years ago
c0derMo
fb3b407577
Added a settings page & localization
2 years ago
Louis Lam
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
c0derMo
e356d5f623
Fixing linting & adding documentation
2 years ago
c0derMo
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
Louis Lam
239611a016
Do not set sendUrl if sendUrl is undefined
2 years ago
Rolf Bachmann
c4a2ce4e78
Add authentication support for ntfy
2 years ago
tamasmagyar
a382f811f4
added comment to startE2eTests function
2 years ago
tamasmagyar
986c03aecd
test cypress run
2 years ago
Jan Hartje
af07c7f050
feat(notification): add Authorization Header option to backend
2 years ago
Louis Lam
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2 years ago
Louis Lam
17ed051401
Add CacheableDnsHttpAgent.install()
2 years ago
Louis Lam
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
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(..).
2 years ago
Louis Lam
2073f0c284
Bind cacheable-lookup to custom http agent
2 years ago
Louis Lam
25d711e683
Fix jsdoc data type
2 years ago
Matthew Nickson
b5f04573f2
Added formatting to ping options
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
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>
2 years ago
Louis Lam
d362372b05
Merge pull request #1749 from daeho-ro/feature/alertnow
...
Feat: New Notification Type for AlertNow
2 years ago
Chongyi Zheng
3fa5dfc873
Use x-forwarded-host only when trustProxy is true
2 years ago
Chongyi Zheng
f33b6de157
Support X-Forwarded-Host header
2 years ago
Louis Lam
d29955f3ba
Merge pull request #1741 from Computroniks/feature/#1221-clickable-hostaname-on-status-page
...
Added #1221 clickable hostname in status page
2 years ago
theS1LV3R
c4125a8334
style: fix linter error
2 years ago
Zoe
0a368ff553
feat: add x-real-ip as a secondary header for client ip
...
Now allows both x-forwarded-for as well as x-real-ip to be used for the client ip, preferring x-forwarded-for
2 years ago
Louis Lam
27dbc021b4
Add standalone manifest.json for each status page. Close #1668
2 years ago
Louis Lam
baa592bce3
Merge remote-tracking branch 'origin/master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
Louis Lam
e5e8db6c38
Add cacheable-lookup
2 years ago
Louis Lam
dddd2c0042
Cache settings, reduce the database / disk usage
2 years ago
Louis Lam
515095ecfb
Move all settings code from `util-server.js` into `settings.js`
2 years ago
Louis Lam
1af6d33fcd
Make sure the backup database process is actually created backup files. Improve https://github.com/louislam/uptime-kuma/issues/1412#issuecomment-1166576395
2 years ago
rmt/src
f84ae82983
feat: added Home Assistant notification integration
2 years ago
theS1LV3R
6f01a448ad
feat: get client ip from x-forwarded-for header if available
...
Useful for use-cases where Uptime Kuma is running behind a reverse proxy
2 years ago
Louis Lam
1f5466a3e8
Revert #1598
2 years ago
Louis Lam
c36d9a4b8b
Fix port data type #1802
2 years ago
Louis Lam
7ba717ee55
Fix Lunasea do not handle general message correctly #1790
2 years ago
Matthew Nickson
f1d24782f8
Merge branch 'master' into feature/#1221-clickable-hostaname-on-status-page
2 years ago
Louis Lam
b97019eea8
Fix cloudflared cannot be stopped in No Auth mode due to password checking
2 years ago
sur.la.route
47e82ed83a
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
sur.la.route
e1f766756f
Removed blank line
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Christopher Pickering
edcdedcaae
Added check for blank password.
2 years ago
Christopher Pickering
945288f0c0
Added postgres monitor
2 years ago
OidaTiftla
ac27e6e2af
Rename feature to: Resend Notification if Down X times consequently
...
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
2 years ago
OidaTiftla
869a040011
Merge branch 'master' into introduce-resend-interval
2 years ago
Louis Lam
fdbdf83a0d
Fix data type of `notification.isDefault` and `notification.active` ( #1765 )
2 years ago
Moritz R
ac449ec1c2
Merge branch 'master' into master
2 years ago
Christopher Pickering
660005b143
cleaned up code
2 years ago
Christopher Pickering
98f3c126e5
passed lint
2 years ago
sur.la.route
cf2ca71dee
prevent null workstation #'s from passing..
...
to axios-ntlm
2 years ago
Aram Akhavan
c690d1c3a1
fix timeout bypass for upside down push monitor
2 years ago
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
2 years ago
Super Manito
54b9698a05
Update
2 years ago
Louis Lam
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
2 years ago
Louis Lam
6e43ef1dd3
Merge remote-tracking branch 'origin/master' into feat/cert-exp-settings
...
# Conflicts:
# server/model/monitor.js
# src/languages/en.js
2 years ago
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
2 years ago
Louis Lam
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
Super Manito
1c4ddaeddf
Update
2 years ago
Super Manito
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
Super Manito
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
2 years ago
Super Manito
404923b7c8
bugfix
2 years ago
Super Manito
a41023ca2a
Update
2 years ago
Super Manito
817c941489
Add Bark Notification Parameters
2 years ago
Daeho Ro
5f6347d277
pull request for adding alertnow notification
2 years ago
Matthew Nickson
fbfa5a33ed
Added Clickable hostname on status page. #1221
...
This should fully implement #1221 by modifying the API and adding two
new properties to the result. The `sendUrl` property denotes if the URL
is sent and `url` is included when required.
Client side checks have been implemented in order to only show a link
when the URL is vaugely correct. I.e not "" or "https://". This prevents
the link from being included if the monitor type is not HTTP without
having to publicly expose the monitor type.
The exposure of the URL is configuarable for each monitor on each
status page by clicking on the link icon.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
2 years ago
Wooferz
aa398948da
Merge branch 'louislam:master' into patch-1
3 years ago
Louis Lam
11243a6ca1
Merge pull request #1222 from NETivism/issue-1201
...
Show some pure text body in notification when keyword not found
3 years ago
Wooferz
54548e34ed
Added label to status badge
3 years ago
Nelson Chan
2c0180f323
Fix: Fix error when status page desc. is null
3 years ago
Louis Lam
4fdaa1abb6
[Push API] Response 404 if error, fix #1721
3 years ago
Louis Lam
cc258dce14
Merge pull request #1674 from philippdormann/feature/ntfy-support
...
feat: ntfy push support
3 years ago
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
3 years ago
Louis Lam
091158cfe7
[Status Page] Preload data
3 years ago
Louis Lam
e4ad8cbfc8
Remove unused variables
3 years ago
Louis Lam
a674caa520
[Status Page] Add og meta tags
3 years ago
Karel Krýda
fa777c5bc0
Update server/server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Karel Krýda
6d0683b055
Update server/routers/api-router.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Karel Krýda
25262cfb91
Update server/model/monitor.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
c095767f4a
[Status Page] SSR
3 years ago
Louis Lam
ffb7ba176c
Merge remote-tracking branch 'origin/master' into status-page-inject-html
3 years ago
Aram Akhavan
ea10d89f51
show correct down message for first tick
3 years ago
Louis Lam
7f46223d68
Fix another log.debug call
3 years ago
Louis Lam
df4ce811d9
Merge remote-tracking branch 'origin/master' into kaysond_master
...
# Conflicts:
# server/model/monitor.js
3 years ago
Moritz R
e9e78c26e5
Merge branch 'master' into master
3 years ago
Aram Akhavan
ab4edf2092
Fix log.debug calls
3 years ago
Marc Hagen
5830f1e0b5
[feat] Adding PagerDuty notification
3 years ago
Louis Lam
35b8e89457
Merge pull request #1473 from Computroniks/#1059-specify-dns-resolver-port
...
Added #1059 : Allow to specify Resolver Port for DNS Monitor
3 years ago
DasCanard
f23baf9c22
Added Push Monitor to Discord Notifications
3 years ago
Philipp Dormann
54184350a4
fix: missing semicolons
3 years ago
Philipp Dormann
14dbe7c334
clean up + default ntfs.sh server url
3 years ago
Philipp Dormann
71f031c14e
add ntfy support
...
ref https://github.com/louislam/uptime-kuma/issues/1622
3 years ago
c0derMo
32cfd411f8
Fixed style & code errors
3 years ago
Moritz R
a9f3142cee
Merge branch 'master' into master
3 years ago
Nelson Chan
b7ba6330db
Feat: Add cert exp. settings
3 years ago
Sascha Kruse
da99a57560
Merge remote-tracking branch 'fxgh/radius-check' into radius-check
3 years ago
Sascha Kruse
42d68edab0
(style) add trailing comma
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Sascha Kruse
019d638767
Merge remote-tracking branch 'ghupstream/master' into radius-check
3 years ago
Louis Lam
7a46b44d25
Merge remote-tracking branch 'origin/master' into karelkryda_master
...
# Conflicts:
# src/components/HeartbeatBar.vue
3 years ago
Louis Lam
8ede6d888f
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
Louis Lam
cec0521834
[Discord] Fix ping type should no port, update better naming
3 years ago
Louis Lam
73b603dd10
Merge pull request #1627 from karelkryda/wrong-uptime-for-push
...
Fixed incorrect uptime calculation for push monitors
3 years ago
Christopher Pickering
ef73af391f
added option for ntlm authorization
3 years ago
Christopher Pickering
44f6fca945
added finally to close connection pool
3 years ago
Christopher Pickering
c346ea7864
updated name on export
3 years ago
Christopher Pickering
f0ad32a252
merged
3 years ago
Christopher Pickering
5720017fb4
updated name on import
3 years ago
sur.la.route
5bba19f866
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
sur.la.route
e198f2f1ab
updated format
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Christopher Pickering
87f933df4f
added sqlserver monitor
3 years ago
Sascha Kruse
398ecb7666
add radius check
3 years ago
Louis Lam
66971deaf4
Merge remote-tracking branch 'origin/master' into fix-1448-discord-service-url
3 years ago
Louis Lam
59be9bb971
working
3 years ago
Louis Lam
8077744c60
Merge pull request #1604 from c-w/fix-apprise-zulip
...
Fix apprise integration for Zulip Streams
3 years ago
Jordan Bertasso
c5faf709b8
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
Karel Krýda
7da9f139c1
Bug fix
3 years ago
Karel Krýda
42f931f6cf
Merge branch 'master' into master
3 years ago
Karel Krýda
2fe5c090aa
small fixes
3 years ago
Clemens Wolff
b680371746
Make apprise notification title configurable in UI
3 years ago
Louis Lam
4e3258579d
Merge branch 'master' into uptime-badges
...
# Conflicts:
# server/util-server.js
3 years ago
Aram Akhavan
cd3fbc80b4
Add first parameter back to logging in api router
3 years ago
Aram Akhavan
bb7d67f717
Apply suggestions from code review
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Karel Krýda
9a35386841
Merge branch 'master' into master
3 years ago
Louis Lam
429ad384d0
Fix hardcoded path for error.log and move errorLog() to UptimeKumaServer.errorLog()
3 years ago
OidaTiftla
93050208bb
Merge database changes into single patch file
3 years ago
OidaTiftla
98ee9caf2c
Add variable for currentTime
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
OidaTiftla
8e99cbf426
Merge branch 'master' into introduce-resend-interval
3 years ago
Greg Smith
cbfecab850
switch to the more-up-to-date esm-wallaby
...
https://github.com/wallabyjs/esm
3 years ago
Clemens Wolff
4b9dc2890d
Convert let to const
3 years ago
Clemens Wolff
f9004bcbed
Add optional title to apprise notification
3 years ago
Clemens Wolff
bc174c3325
Extract child process args into variable
3 years ago
Louis Lam
4c2753af46
Remove an unused variable
3 years ago
Louis Lam
c6ba5b621c
Remove isPublished, checkPublished which had been removed in upstream.
3 years ago
Karel Krýda
2b14bdae62
Merge branch 'master' into master
3 years ago
Louis Lam
d962ab7a1c
Merge branch 'master' into uptime-badges
...
# Conflicts:
# package-lock.json
# server/routers/api-router.js
3 years ago
Louis Lam
53b98ad3e4
Add more comment for aliyun-sms fix
3 years ago
Greg Smith
d0546afe71
fix esm require: no ugly warnings
3 years ago
Karel Krýda
31b90d12a4
Added the ability to choose on which status pages maintenance information should be displayed
3 years ago
Karel Krýda
b4ffcc5555
Added JSDoc
3 years ago
Louis Lam
42ea3fb412
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
9f8b3151d8
Update server/util-server.js
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
GOGOsu
73e38a13d2
Update server/notification-providers/aliyun-sms.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Karel Krýda
f78d01d770
Resolve lint errors
3 years ago
Karel Krýda
7532acc95d
Resolve conflicts
3 years ago
Greg Smith
f4515ad8c5
add axios cached dns resolve to monitor
3 years ago
Karel Krýda
ed84e56a85
Merge remote-tracking branch 'origin_kuma/master'
...
# Conflicts:
# package-lock.json
# server/database.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# src/components/MonitorList.vue
# src/components/PingChart.vue
# src/icon.js
# src/pages/DashboardHome.vue
# src/pages/StatusPage.vue
# src/router.js
# src/util.js
3 years ago
GOGOsu
369477b4b9
Update aliyun-sms.js
3 years ago
GOGOsu
2347a01f7c
Update aliyun-sms.js
...
Add comments for the changed code.
3 years ago
GOGOsu
ae2c49a729
Update aliyun-sms.js
3 years ago
GOGOsu
b9e72b9645
Update aliyun-sms.js
...
aliyun-sms.js: escape more characters than encodeURIComponent
see https://help.aliyun.com/document_detail/315526.html
字符A~Z、a~z、0~9以及字符-、_、.、~不编码。对其它ASCII码字符进行编码。
3 years ago
Louis Lam
60538036c6
[ #1108 ] Change "true" to "up"
3 years ago
Louis Lam
0ba5d031d0
Merge branch 'master' into push-status-param
...
# Conflicts:
# server/routers/api-router.js
3 years ago
Louis Lam
023db1450d
Fix #1577
3 years ago
Matthew Nickson
3c01e8732c
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Louis Lam
1687de163c
Merge pull request #1565 from Saibamen/eslint
...
Fix some of ESLint warnings
3 years ago
Aram Akhavan
39df4eea92
Ssynchronize push monitor heartbeats to api calls
...
Includes a 1s buffer time to allow the push url to be called before the monitor is checked
3 years ago
Adam Stachowicz
1e595eaa76
Update linters
3 years ago
Adam Stachowicz
5fbfacf5ce
Fix ESlint warnings
3 years ago
Matthew Nickson
d1a3cd047a
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Matthew Nickson
587faecf87
Made value nullable in apicache JSDoc
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
46da5e51be
Fix JSDoc grammar
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
1eecdec2d9
Update JSDoc for better clarity
...
Co-authored-by: Nelson Chan <chakflying@hotmail.com>
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jens Neuber
64a33d7455
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Matthew Nickson
09e61d9d63
Changed Array<T> to type[]
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
9996ba1636
Add JSDoc to server/modules/apicache/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
c2f6c5b42e
Added JSDoc docs for mqttAsync
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
0083485d4c
Updated server/model/* JSDoc to match new methods
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
OidaTiftla
7ed8ae9f7c
Fix trailing space warning
3 years ago
Matthew Nickson
4ddbf71920
Fixed trailing spaces in database.js
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
068b920553
Add JSDoc to server/socket-handlers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
OidaTiftla
d6b591a513
Make comment more readable
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
3d04befc1f
Add JSDoc to server/routers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
6d22ebedca
Merge branch 'master' into add-JSDoc-comments
3 years ago
OidaTiftla
19933bbd99
Improve backwards compatibility
3 years ago
OidaTiftla
60f8ab7285
Use new logging mechanism
3 years ago
OidaTiftla
b7e2489d22
Merge branch 'master' into introduce-resend-interval
3 years ago
Matthew Nickson
03b2d8d521
Add JSDoc to server/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jens Neuber
e103ac8335
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Louis Lam
10f6a3c4f5
Merge pull request #1229 from Computroniks/#1209-Logout-button-in-navbar
...
Add #1209 : logout button in navbar
3 years ago
Louis Lam
200fdfb808
Merge code manually since some code moved to another file
3 years ago
Louis Lam
29d2d95c71
Merge branch '1.14.X'
...
# Conflicts:
# package.json
# server/server.js
3 years ago
Louis Lam
919393cac9
Partially change the server core into a class, remove all require("./server") #1520
3 years ago
Louis Lam
17d4003e5c
Add dropdown menu
3 years ago
Louis Lam
e2c45f93bf
Merge pull request #1509 from chakflying/feat/mqtt-optional-message
...
Feat: Allow MQTT successMessage to be optional
3 years ago
Louis Lam
addf75daa7
Fix MQTT password do not save
3 years ago
Louis Lam
359a490ae3
Fix #1510
3 years ago
Nelson Chan
cd38dd3f68
Feat: Allow MQTT successMessage to be optional
3 years ago
Louis Lam
5fa62a888c
Merge branch 'master' into mqtt2
...
# Conflicts:
# server/database.js
# server/util-server.js
3 years ago
Louis Lam
e6a8a84278
Include only nessacary data in webhook
3 years ago
Louis Lam
47c72192e1
[eslint] Enable yoda and eqeqeq
3 years ago
Louis Lam
d71c086447
Standardize array bracket spacing
3 years ago
Louis Lam
8eb83394f7
Refine UI/UX for custom css / footer text. Add switch for show/hide powered by
3 years ago
Matthew Nickson
45f44b183d
Add JSDoc to server/model/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Matthew Nickson
5a209c74e1
Add JSDoc to server/notification-providers/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
07c474db0b
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
8d8c38b1a8
Allow unused vars in args and fix more eslint issues
3 years ago
Louis Lam
e34420368b
Remove try-catch and fix username/password/port not working for mqtt
3 years ago
Matthew Nickson
60c63cc18e
Add JSDoc to server/jobs/*
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Louis Lam
566133e350
Domain Name Expiry Notification for https monitor only
3 years ago
Louis Lam
30e113755e
Add HIDE_LOG and catch error if cannot subscribe topic
3 years ago
Louis Lam
083e8355b7
Change debug to log.debug
3 years ago
Louis Lam
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
3 years ago
Matthew Nickson
a680331dd7
Fixes issue with ::1 port 5300 requests
...
Now the address is wrapped in `[]` in order to prevent ::1 port 5300
being interpreted as ::1:5300. Wrapping the IPv4 address in `[]` does
seem to have any effect on correct domain name resolution. In order to
prevent issues if a user inputs an address with brackets, they are
removed from the string if present before being re-added when it is
passed to `setServers`. I have also removed the JSDoc comment as this
will be added in a seperate PR
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jordan Bertasso
288ed1e3ca
Merge branch 'master' into fix-1448-discord-service-url
3 years ago
Louis Lam
fb0064082e
Change Pushdeer to PushDeer
3 years ago
ngc7331
93c51504f9
fixes: formatting and security issues
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
ngc7331
fb059f5e91
Add support for Pushdeer notifications
3 years ago
Louis Lam
d0b5f147e2
Fix spelling and merge mistake
3 years ago
Louis Lam
ddf8a7a692
Fix camelCase
3 years ago
ColdThunder11
bd9df09f87
Apply suggestions from code review, fix style
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
ColdThunder11
4656ab3d57
Add OneBot notification service
3 years ago
Louis Lam
0a5db0cecb
Fix #1478
3 years ago
Matthew Nickson
8c8eeaf627
Merge branch 'master' into #1059-specify-dns-resolver-port
3 years ago
Matthew Nickson
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>
3 years ago
Louis Lam
649f3106e1
Enforce semicolon, fix format globally
3 years ago
Louis Lam
17dcf6d3a2
Merge pull request #910 from andreasbrett/logging
...
introduce consistent logging
3 years ago
Louis Lam
e9ce1433cd
Change log_info to log.info by making it into an object
3 years ago
Moritz R
361e44ad6a
Merge branch 'louislam:master' into master
3 years ago
Louis Lam
4053b9db1f
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
772d009f43
Merge branch 'master' into fluencydoc_master
...
# Conflicts:
# extra/update-version.js
# server/client.js
# server/server.js
3 years ago
Louis Lam
6179f6c982
Merge branch 'master' into issue/1138
...
# Conflicts:
# server/server.js
3 years ago
Louis Lam
94770cf865
Resolve log message null reference
3 years ago
Louis Lam
279e2eb3f6
Merge branch 'master' into logging
...
# Conflicts:
# server/database.js
# server/jobs.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/socket-handlers/status-page-socket-handler.js
# server/util-server.js
3 years ago
jordanbertasso
2638d68c97
Cover dns and steam types in Discord notifs
3 years ago
jordanbertasso
0961c6d9b3
Check for ping and port type in discord notifs
3 years ago
Louis Lam
c9fa183712
Manage domain names
3 years ago
Louis Lam
0afa0be5c2
Merge branch 'master' into status-page-domain
...
# Conflicts:
# server/database.js
3 years ago
Louis Lam
6a30dbd71a
Fix Mattermost when channel is empty #1468
3 years ago
Louis Lam
7bbaeffd3e
Fix reset-password (issue caused by 5027fcd320
)
3 years ago
Louis Lam
008dc27f52
Reload proxy settings for monitors in the monitorList
3 years ago
Louis Lam
5027fcd320
Export server using an object class
3 years ago
Louis Lam
d5e68f8453
Export monitor list
3 years ago
Louis Lam
082c2dd32d
Remove restartMonitors() and move proxy socket events to a socket handler file
3 years ago
Louis Lam
c4e74c9943
Render <StatusPage> if domain matched
3 years ago
Louis Lam
fee88b32e3
Set PRAGMA synchronous = FULL
3 years ago
Louis Lam
c9deea9fdf
Merge pull request #1456 from Arubinu/alerta
...
Fix "API key parameter 'undefined' is invalid"
3 years ago
Louis Lam
70311f7a5a
Add an option to enable/disable the domain name expiry notification #1364
3 years ago
Louis Lam
4b99160b1f
Fix "Check Update" is not checked by default
3 years ago
Louis Lam
48d679234a
Stop bree and cloudflared while the server shutting down
3 years ago
Alvin Pergens
d3d1656625
Fix "API key parameter 'undefined' is invalid"
3 years ago
Moritz R
af44b0beab
Merge branch 'master' into master
3 years ago
Moritz R
84a0b24448
Update server/model/monitor.js
...
As per recommendation of @Computroniks
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
3 years ago
Jimmy Huang
a4be651118
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Louis Lam
04e3394d02
Merge branch 'master' into feature/request-with-http-proxy
...
# Conflicts:
# package-lock.json
# package.json
# server/database.js
# src/languages/en.js
# src/mixins/socket.js
3 years ago
Louis Lam
6674005e8b
Fix storing cloudflared token while start cloudflared
3 years ago
Louis Lam
b72a2d350f
Set cloudflared token from env var or arg
3 years ago
Louis Lam
82ea896bbc
Improve the workflow of cloudflared
3 years ago
Louis Lam
f1f4b3b377
Add reverse proxy setting page for controlling cloudflared
3 years ago
Louis Lam
a6b52b7ba6
Merge branch 'master' into cloudflared
3 years ago
Louis Lam
b8dea3a823
Merge remote-tracking branch 'origin/master'
3 years ago
Louis Lam
0da6e6b1fb
Some improvements
3 years ago
Louis Lam
44fb2a88f2
Add cloudflared socket handler
3 years ago
OidaTiftla
d8013f31e8
Update version after merging new master branch
3 years ago
OidaTiftla
91366ff565
Merge branch 'master' into introduce-resend-interval
3 years ago
Louis Lam
be88351eb3
Merge pull request #1136 from chakflying/fix/prometheus-on-delete
...
Fix: Remove prometheus metrics on delete [Test needed]
3 years ago
Louis Lam
28d72fcd08
Fix #1409 , slug cannot be empty
3 years ago
Louis Lam
71af08189e
Clear useless code
3 years ago
Louis Lam
d32ba7cadd
Fix #1318 , basic auth is completely disabled if the auth is disabled
3 years ago
Louis Lam
775d1696fa
Fix pushover device not working #1114
3 years ago
Louis Lam
ad2130b7b5
[Status Page] Fix monitors are deleted unexpectedly #1399
3 years ago
Louis Lam
3adda48f3a
Load the status page list earlier
3 years ago
Louis Lam
d7a839aa52
[Status Page] Fix reset entry page
3 years ago
Louis Lam
aef0a66205
[Status Page] Simplify show tags logic
3 years ago
Louis Lam
37be7df9b0
[Status Page] Delete status page
3 years ago
Louis Lam
8d981c8f0b
[Status Page] Fix migration and unpin incident
3 years ago
Louis Lam
27bfae67af
[Status Page] Add a new status page
3 years ago
Louis Lam
719a136d1e
[Status Page] Improved entry page
3 years ago
Louis Lam
e87cdf4d09
[Status Page] wip, upload logo and status page listing
3 years ago
Louis Lam
1033ca5cf4
[Status Page] wip, combine api, add status_page_id into group and incident tables
3 years ago
Louis Lam
18ec42b060
[Status Page] wip
3 years ago
Louis Lam
7c7dbf68c1
[Status Page] wip, sidebar for editor
3 years ago
Louis Lam
50d6e888c2
[new status page] wip
3 years ago
Louis Lam
72ce28a541
Migrate status page table
3 years ago
Louis Lam
1e2a8453c6
Merge branch 'master' into restructure-status-page
3 years ago
Louis Lam
1fa4a16663
Check beta release
3 years ago
Uğur Erkan
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
3 years ago
Uğur Erkan
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
3 years ago
Louis Lam
8bbf55777e
Merge pull request #1205 from arjunkomath/master
...
Add notification provider - Push
3 years ago
Louis Lam
fa490d0bf1
[Alerta] Handle general message
3 years ago
Louis Lam
c52c8a4206
Merge branch 'master' into alerta
...
# Conflicts:
# server/notification.js
# src/components/notifications/index.js
# src/languages/en.js
3 years ago
Louis Lam
9789d8cde8
Merge branch 'master' into alerta
3 years ago
Louis Lam
ccb3d85a48
Merge pull request #1157 from zackelia/master
...
Implement gorush notifications
3 years ago
Louis Lam
b62d94184a
Merge branch 'master' into restructure-status-page
3 years ago
Louis Lam
595cd93220
Check invalid interval
3 years ago
Ananth Kamath
258d93be72
Fix mattermost couldn't find channel issue
3 years ago
Jimmy Huang
244a7b3671
Update server/model/monitor.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Alvin Pergens
8febff9282
fix comments
3 years ago
Alvin Pergens
90f2497548
change data for Alerta
3 years ago
Jens Neuber
28be32fc68
Merge branch 'master' of https://github.com/louislam/uptime-kuma into uptime-badges
3 years ago
Alvin Pergens
cefe43800f
add alerta service
3 years ago
Karel Krýda
b49e5d5c39
The SQL query to determine if the monitor is under maintenance is now in its own method.
3 years ago
Jimmy Huang
ee90d2713f
refs issue-1201 in upstream.
...
Add 100 characters from response body to bean.msg after keyword not match.
3 years ago
Karel Krýda
e7b2832967
The start and end dates of the maintenance are now stored in UTC, which allows it to be converted between time zones
3 years ago
OidaTiftla
f390a8caf1
Fix missing DB patch and use DATETIME as column format
3 years ago
OidaTiftla
f931e709e6
Add database patch
3 years ago
Karel Krýda
5fda1f0f59
minor fixes (missing commas, spaces, translations)
3 years ago
OidaTiftla
11e9eee09d
Change seconds to minutes
3 years ago
OidaTiftla
b69a8b8493
Fix formatting
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
OidaTiftla
1ac904d6d6
Introduce resend interval if down
3 years ago
Karel Krýda
0d3414c6d6
A complete maintenance planning system has been created
3 years ago
c0derMo
29df70949d
Add ability to connect to daemon via http / tcp for windows compatibility
3 years ago
Arjun Komath
23796723dd
Address code review
...
Add missing comma
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Arjun Komath
51b7a2badb
remove log
3 years ago
Arjun Komath
74c584f544
Add Push by Techulus
3 years ago
Tarun Singh
0345719e53
added cleartimeout in case client is already ended
3 years ago
Tarun Singh
22256dfcd2
added timeout for removing the dead loop state
3 years ago
Louis Lam
aba6cb2c52
Merge pull request #1169 from jbenguira/patch-1
...
Fixed #1024
3 years ago
Louis
d1a99b0a22
Check Node.js version, better error message
3 years ago
c0derMo
4818bb67d6
Added trailing comma, fixed spelling & translation
3 years ago
Joseph Benguira
3b9fac2942
Update server/prometheus.js
...
removed useless spaces
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
c0derMo
c5cc42272f
Fixing the editing of docker container & adding english translation
3 years ago
c0derMo
b0259b5592
Added docker container monitor
3 years ago
Louis Lam
227bbdea2f
[MQTT] Try to improve error handling
3 years ago
Louis Lam
6272514820
[MQTT] Use existing fields instead of creating new ones (Server)
3 years ago
Louis Lam
32ec4beda0
Merge branch 'master' into mqtt
3 years ago
Louis Lam
482b3f9233
Update server/util-server.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Louis Lam
076d6bdbb6
Merge branch 'master' into mqtt
...
# Conflicts:
# package-lock.json
# server/database.js
3 years ago
Joseph Benguira
13acdd4c65
Fix for issue in logs
...
This fix address the issue described here: https://github.com/louislam/uptime-kuma/issues/1024
3 years ago
Louis
ed64853125
Keep FBSD, BSD for ping only
3 years ago
Denis
0f822d3b2a
FBSD does not exists anymore
3 years ago
Denis
6bda5c6329
update comment
3 years ago
Denis Fondras
44bc98a453
Merge branch 'louislam:master' into master
3 years ago
Louis
f9751d0c01
Fix FBSD to BSD https://github.com/louislam/uptime-kuma/pull/1155#issuecomment-1009544236
3 years ago
Denis
53df9a36e3
reintroduce exports.FBSD
3 years ago
Zack Elia
ea43422ccf
Implement gorush notifications
3 years ago
Denis
8063449f49
ping path is common to all BSDs
3 years ago
Marc Harnos
0bbe157099
change parsing priority for all passed arguments
...
update all passed args in server.js to prioritize command line, then use
env.UPTIME_KUMA_ environment variables, then use the generic environment
variable versions env.HOST, env.PORT, env.SSL_KEY, env.SSL_CERT and fall
back to default values where applicable
3 years ago
Marc Harnos
0053a29d10
add validation to port value parsing
...
only port configurations that are valid (not isNaN) after parseInt
are considered to be used in port variable
3 years ago
Marc Harnos
2c8d5d28e9
simplify host fallback logic
...
move decision logic for freeBSD HOST environment var into temp var
3 years ago