Matthew Nickson
e7feca1cd6
Added API key authentication handler
...
API key authentication is now possible by making use of the X-API-Key
header. API authentication will only be enabled when a user adds their
first API key, up until this point, they can still use their username
and password to authenticate with API endpoints. After the user adds
their first API key, they may only use API keys in future to
authenticate with the API.
In this commit, the prometheus /metrics endpoint has been changed over
to the new authentication system.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Matthew Nickson
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
Matthew Nickson
ee2eb5109b
Added basic web interface for API keys
...
Web interfaces for manging API keys have been added however translation
keys are still required.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Louis Lam
d1175ff471
Fix #2777
2 years ago
Matthew Nickson
cd18b96f69
Added check to ensure backup exists when restoring ( #2779 )
...
A check to ensure that the backup database exists before deleting the
current database.
Fixes #2778
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
Faruk Genç
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam
f2633a5d01
Finished knex_init_db.js
2 years ago
Louis Lam
4056951915
WIP: building database in knex.js
2 years ago
Louis Lam
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2 years ago
Louis Lam
db4663d6be
Merge remote-tracking branch 'origin/master' into 2.0.X
2 years ago
Louis Lam
c12b06348b
Fix parsing issues of status page's og tags
2 years ago
Bobby Ore
48b637d4c8
Refactor to not introduce a breaking change
2 years ago
Nelson Chan
3439074835
Feat: Use message to improve errror status code
2 years ago
Bobby Ore
3a361d2621
lint fix
2 years ago
Bobby Ore
8725e5daf9
Add ability to use User ID for LunaSea notifications
2 years ago
Brayan Lozano
d45aee450d
Removes unecessary ternary operator
2 years ago
Brayan Lozano
727acb32bf
Adds name + status + message to slack notification
2 years ago
Suriya Soutmun
43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
Suriya Soutmun
faa78443d6
chore: alter table monitor add column tls_ca, tls_cert, tls_key for certificate data
2 years ago
Nelson Chan
e1f956879d
Fix: Use .destroy() instead of .end()
2 years ago
Austin Miller
ef54d9e3b6
Add PagerTree Notification Provider
2 years ago
Louis Lam
68ead3414d
WIP
2 years ago
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
2 years ago
Louis Lam
d4752b65de
WIP
2 years ago
Louis Lam
dc4d2a77bb
WIP
2 years ago
Haytham Salama
1bfb290718
feat: add message thread id for telegram nonfiction
2 years ago
Louis Lam
0b40c65139
Merge remote-tracking branch 'origin/master' into mariadb
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/dockerfile-alpine
# package.json
# server/database.js
2 years ago
Louis Lam
afadfe32d5
Trim
2 years ago
Louis Lam
5f2affb38c
Relocate and fix jsesc issue
2 years ago
Louis Lam
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2 years ago
Faruk Genç
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
c
a823ed8ccc
Feature - Google Analytics - Removed unused import.
2 years ago
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
2 years ago
c
913bb611d5
Feature - Google Analytics - Removed regex to validate a Google Analytics tag.
2 years ago
c
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2 years ago
c
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2 years ago
c
fb2999706c
Feature - Google Analytics - Added JSDoc to Google Analytics functions.
2 years ago
c
2b3a3895b3
Feature - Google Analytics - Use Regex to validate UA as per https://support.google.com/analytics/answer/9310895
2 years ago
c
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2 years ago
c
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
Faruk Genç
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2 years ago
Peace
9446c2d102
fix: use active instead of isActive in uploadBackup
2 years ago
Peace
2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace
f286386f59
fix: add message for empty group pending state
2 years ago
Peace
9286dcb6ce
fix: add serverside check against endless loops
2 years ago
Louis Lam
683f446cf5
Add support for `.env`
2 years ago
Nelson Chan
348d0170fa
Chore: Use constants instead of int
2 years ago
Faruk Genç
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Louis Lam
fca0198d35
Merge pull request #2525 from chakflying/fix/maintenance-badge
...
Fix: Add support for pending & maintenance in badges
2 years ago
Peace
9a46b50989
docs: add comments
2 years ago
Peace
f3ac351d75
feat: set childs under maintenance if parent is too
2 years ago
Faruk Genç
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Peace
aba515e172
feat: disable childs if parent is disabled
2 years ago
Louis Lam
ddce8f0cb0
Fix plugin installation
2 years ago
Peace
97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
Peace
645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
Louis Lam
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
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
2 years ago
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
2 years ago
Louis Lam
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2 years ago
Louis Lam
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2 years ago
Nelson Chan
c4c720027c
Fix: Use correct log call format
2 years ago
Louis Lam
83e0401dd8
Show game list for GameDig monitor
2 years ago
Louis Lam
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
Thomas Spalinger
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2 years ago
Faruk Genç
cd017fce98
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
alejandrohernandezrosales
fa23e7ad19
Removed superflous Message prefix
2 years ago
Faruk Genç
aef85078eb
reorder fix
2 years ago
Faruk Genç
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
Nelson Chan
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2 years ago
Louis Lam
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2 years ago
Louis Lam
a5ff27da7a
Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2 years ago
Louis Lam
27585d0812
Fix #2618
2 years ago
Louis Lam
e675316635
Merge pull request #2586 from PopcornPanda/fix-2544
...
Fix: Allow long sms in PromoSMS
2 years ago
Louis Lam
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
Louis Lam
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
2 years ago
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
3 years ago
Super Manito
54b9698a05
Update
3 years ago
Louis Lam
6424fe77ab
Change successful log from `info` to `debug` in order to avoid large log and less disk usage
3 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
3 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
3 years ago
Louis Lam
f570d41142
Merge remote-tracking branch 'origin/master' into feature/axios-cached-dns-resolve
...
# Conflicts:
# package-lock.json
# package.json
3 years ago
Super Manito
1c4ddaeddf
Update
3 years ago
Super Manito
55a6e5af42
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Super Manito
252709ff49
Update server/notification-providers/bark.js
...
Co-authored-by: Adam Stachowicz <saibamenppl@gmail.com>
3 years ago
Super Manito
404923b7c8
bugfix
3 years ago
Super Manito
a41023ca2a
Update
3 years ago
Super Manito
817c941489
Add Bark Notification Parameters
3 years ago
Daeho Ro
5f6347d277
pull request for adding alertnow notification
3 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>
3 years ago
Louis Lam
04e22f17a9
Merge remote-tracking branch 'origin/master' into christopherpickering_master
...
# Conflicts:
# package-lock.json
# src/languages/en.js
3 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