8d24891b8e
Merge pull request #3054 from TechWilk/keyword-not-found-whitespace
...
Trim before truncating "keword not found" message
2 years ago
7f5d0e5490
Merge remote-tracking branch 'origin/1.21.X'
...
# Conflicts:
# package-lock.json
2 years ago
f0beccf6bf
Fix `Same As Server Timezone` do not save correctly
2 years ago
d23cb0b382
Fix maintenance do not start after 1.21.2
2 years ago
0e516a42e5
Trim before truncating "keword not found" message
2 years ago
9e320dc5fb
Expose timezone and local datetime to notification providers
2 years ago
682f8e52a8
lint
2 years ago
171aff1226
add invert keyword feature
2 years ago
45ef7b2f69
Fix Effective Date Range cannot be removed
2 years ago
dbfaddafca
Validate cron before submit
2 years ago
524cf7c607
WIP
2 years ago
227cec86a8
WIP
2 years ago
02291730fe
WIP
2 years ago
3c3a192943
Merge pull request #2906 from chakflying/fix/duplicate-expiry-notif
...
Fix: Check for TLS expiry notified days smaller than target
2 years ago
7330db3563
Improve error handling of mysqlQuery and return row count as result
2 years ago
dbe73bd6ae
Update monitor.js ( #2929 )
...
Language
2 years ago
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
533bc1505b
Prevent generating duplicated timeslots
2 years ago
f32fcb204f
Fix: Check for notified days smaller than target
2 years ago
2dedc1cfbd
Fix #2776
2 years ago
38ab5e0f3e
Merge pull request #2558 from Computroniks/feature/1685-prometheus-api-key
...
Added #1685 : Add API keys for API authentication
2 years ago
ea3b3abe36
Fine tune
2 years ago
7f9332c753
Merge remote-tracking branch 'origin/master' into feature/482-add-description-to-monitor
...
# Conflicts:
# server/database.js
# server/model/monitor.js
# src/icon.js
# src/languages/en.js
# src/languages/es-ES.js
2 years ago
f32d3af62c
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
a7b49fcd98
Fix json body after xml body added
2 years ago
ef64077980
Merge remote-tracking branch 'origin/master' into feature/1685-prometheus-api-key
...
# Conflicts:
# src/lang/en.json
2 years ago
cecb0b6425
Merge pull request #2610 from bayramberkay/feature/add-xml-support-to-http-monitors
...
Add xml support to HTTP monitors
2 years ago
2fa233ae7f
Fix prometheus null issues
2 years ago
7f88aacbe7
make monitor start() and stop() async
2 years ago
4dfc1a0221
Merge pull request #2664 from spali/keep_prometheus_instance
...
remember prometheus instance and expose it
2 years ago
0be8b111e2
chore: better up message
...
Co-authored-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
cef0a0faf4
Merge branch 'master' into group-monitors
2 years ago
1d4af39820
Fixed JSDoc for one method
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
dd1d71530f
sorted tags on dashboard
...
see https://github.com/louislam/uptime-kuma/issues/2785
2 years ago
cd796898d0
Added expiry check for frontend
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
d7f2fa982a
Merge branch 'master' into feature/1685-prometheus-api-key
2 years ago
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
19c8538149
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
4056951915
WIP: building database in knex.js
2 years ago
c12b06348b
Fix parsing issues of status page's og tags
2 years ago
43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
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
5f2affb38c
Relocate and fix jsesc issue
2 years ago
10c6f3b688
Merge remote-tracking branch 'origin/master' into feature-google-analytics
2 years ago
666838f334
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
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
c08d8a5eaf
Google Analytics - Simplified retrieving Tag ID from Status Page.
2 years ago
3ff0cbe311
Feature - Google Analytics - Simplified Module & Escaped the Script to prevent XXS.
2 years ago
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2 years ago
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
f286386f59
fix: add message for empty group pending state
2 years ago
9a46b50989
docs: add comments
2 years ago
f3ac351d75
feat: set childs under maintenance if parent is too
2 years ago
35bd129d66
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
aba515e172
feat: disable childs if parent is disabled
2 years ago
97bd306a09
Merge branch 'louislam:master' into group-monitors
2 years ago
645fd94bba
feat: add ability to group monitors in dashboard
2 years ago
e5ca67d062
HTTPS Monitor using Real Browsers + Limited plugin support ( #1787 )
2 years ago
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
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
1dabbd6442
Merge pull request #2666 from chakflying/fix/log-call
...
Fix: Fix incorrect log call format in docker monitor
2 years ago
9cc3bd0de4
Avoid the multiple queries for Gamedig monitor
2 years ago
c4c720027c
Fix: Use correct log call format
2 years ago
83e0401dd8
Show game list for GameDig monitor
2 years ago
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
f155ec9ba8
remember prometheus instance and expose it
...
in preperation for #2491,#680 and #898
2 years ago
aef85078eb
reorder fix
2 years ago
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
6961b1bdd2
Fix: Use default timeout & CachebleDnsHttpsAgent
2 years ago
c47b6c5995
Merge remote-tracking branch 'origin/1.19.X'
...
# Conflicts:
# package-lock.json
# package.json
# src/util-frontend.js
2 years ago
a5ff27da7a
Drop the property `monitor.maintenance`, use `lastHeartBeat.status` to check status instead
2 years ago
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
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
3adc9e65d6
Add only xml support to http monitors
2 years ago
db757123ba
refactor: reuse databaseConnectionString
2 years ago
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
774d754b21
Add GameDig monitor
2 years ago
7a13b959a3
Updated to match changes in #2223
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
caff9ca736
Added JSDoc for server/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
40ebc2df79
feat: support redis monitor
2 years ago
204792dd2d
Fix: Fix incorrect handling for container down
2 years ago
0cead83705
Fix #2516
2 years ago
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
1006fbd873
A possible fix for #2447
2 years ago
4147a4c404
fix : #2480
2 years ago
e12225e595
Fix #2475 #2468 #2455 , add Accept-Encoding only if encountered the abort error
2 years ago
1e689d99b4
Merge pull request #2393 from zImPatrick/discord-docker-fix
...
Fix discord notification not sending when docker container goes down
2 years ago
14fffcf06b
Globally fix if heartbeatJSON["msg"] is undefined
2 years ago
b75db27658
Fix lint
2 years ago
1da00d19fd
Try to fix `incorrect header check`
2 years ago
3b58fd3b3c
Cache uptime
2 years ago
02b5cae577
Fix #2371 by left join maintenance_timeslot
2 years ago
4cd5b5563f
Fix #1145
2 years ago
ee1a56caae
Update /test-webhook and reevaluate sensitive fields
2 years ago
3e68cf2a1c
Specify `Accept-Encoding` for axios request ( Fix #2253 )
2 years ago
2052fa175f
Merge branch 'master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
15b63c82c3
Merge remote-tracking branch 'upstream/master' into feature/#1817-add-mysql-monitor
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
b059a36e66
added MongoDB ping monitor
2 years ago
cb4e512dc6
Merge pull request #2316 from Dafnik/patch-fix-link-preview-description
...
Fix 'undefined' in link preview generation
2 years ago
4042c26390
Fix 'undefined' in link preview generation
2 years ago
b459408b10
fix: resolve conflict
2 years ago
134b3b8ac1
Fix 'dayjs' is never used warning
2 years ago
4339ca7eb5
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
24cb212a37
Fix recurring
2 years ago
d8a676abb6
Implement recurring day of month and day of week
2 years ago
268cbdbf8d
Merge remote-tracking branch 'origin/master' into maintenance
...
# Conflicts:
# server/server.js
# src/components/settings/General.vue
2 years ago
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
edacff123b
Add UTC in the serverTimezone dropdown
2 years ago
2faf866e9e
Implement generateTimeslot() for recurring interval type
2 years ago
39b6725163
Update maintenance tables
2 years ago
dfb75c8afb
Update status page's maintenance message
2 years ago
e07aa982c3
WIP
2 years ago
c84de4d259
WIP: Add maintenance status
2 years ago
c1ccaa7a9f
WIP
2 years ago
539683f8e9
Merge remote-tracking branch 'origin/master' into maintenance
2 years ago
71af23cf00
Fix #2207
2 years ago
a577fba848
Change DateTime Range using serverTimezone
2 years ago
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
6e07ed2081
Fix #2186
2 years ago
0686757160
[Docker Monitor] Change `tcp://` to `http://`
2 years ago
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
204339fbed
Make two functions to convert ISO 8601 <=> YYYY-MM-DD hh:mm:ss
2 years ago
b1465c0282
- Maintenance standardize datetime format to YYYY-MM-DD hh:mm:ss
...
- Import dayjs extensions one time only
- Maintenance activeCondition centralize
2 years ago
4002b9f577
[WIP] Checking maintenance time using maintenance_timeslot table
2 years ago
6537f4fe74
content-type change
2 years ago
5809088f27
Don't override a user-defined content-type header
2 years ago
3f63cb246b
[WIP] Handle timezone offset for timeRange
2 years ago
f11dfc8f43
[WIP] Add/Edit Maintenance with new UI and recurring
2 years ago
9d99c39f30
Update Maintenance UI for recurring
2 years ago
2f67d26702
Merge manually, as this part had been moved
2 years ago
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
6ec6410808
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
c3d655afb4
Merge branch 'master' into feature/#1891-set-ping-packet-size
2 years ago
6bb79597e8
fix: resolve merge conflict
2 years ago
de6e1e7ddd
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# server/database.js
2 years ago
31cc328839
fix lint
2 years ago
0d58526f25
Merge branch 'master' into feature/expand-http-payload-support
2 years ago
2b9bf095a6
Add non-json support for http body
2 years ago
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
34ab6142db
fix: remove new space line
2 years ago
d0d1e0de28
Merge remote-tracking branch 'origin/master' into introduce-resend-interval
...
# Conflicts:
# src/pages/EditMonitor.vue
2 years ago
2232236a7a
[empty commit] pull request for add gRPC protocol
2 years ago
dcecd10c88
Feat/add gRPC protocol ( #1 )
...
* feat: added monitor with gRPC
Co-authored-by: minhhn3 <minhhn3@vng.com.vn>
2 years ago
8ced61697a
Fix save docker host issue
2 years ago
60e7824ff0
Merge branch 'master' into master
2 years ago
88afd662db
Merge remote-tracking branch 'origin/master' into postgres
...
# Conflicts:
# package-lock.json
# package.json
2 years ago
e356d5f623
Fixing linting & adding documentation
2 years ago
0d098b0958
Docker Hosts are now a table & have their own dialog
2 years ago
9a8b484ee8
Merge pull request #1853 from louislam/dns
...
Add cacheable-lookup
2 years ago
1999541802
Merge remote-tracking branch 'origin/master' into dns
2 years ago
Louis Lam
Christopher Wilkinson
Miles Steele
tombii
Nelson Chan
Thomas Spalinger
Peace
Matthew Nickson
Luke Hamburg
Faruk Genç
Suriya Soutmun
Joseph
c
Peace
long2ice
Sebastian Kaempfe
Adam Spurgeon
minhhoang
rmarops
Dafnik
Adam Stachowicz
Justin Tisdale
Minh Hoàng
Moritz R
c0derMo