439b6517d1
Feat: Add http/http keyword timeout option ( #2142 )
...
* feat: Add timeoutMs field
* chore: Update Languages (incl. ko-KR)
* Revert "chore: Update Languages (incl. ko-KR)"
This reverts commit 349331a00b
1 year ago
a032e11a2e
Feat: Create Group in EditMonitor page ( #3379 )
...
* Feat: Create Group in EditMonitor page
* Fix: Start group mon. after child is added
* Chore: Swap confirm & cancel for ergonomics
* Fix rarely issue that group monitor can throw an error if lastBeat is null
* Resume the group monitor in the callback
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
f4967615c0
UPTM-14 - Dashboard Display on vertical 4K screen ( #3451 )
...
* Update src/pages/DashboardHome.vue
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* resolve comment
Co-authored-by: AqidaHaidari <aghida55@gmail.com>
Co-authored-by: Pascal Ojinnaka <56399504+passy4ucj@users.noreply.github.com>
Co-authored-by: Aqida <42426077+AqidaHaidari@users.noreply.github.com>
---------
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: AqidaHaidari <aghida55@gmail.com>
Co-authored-by: gitstart_bot <gitstart_bot@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Pascal Ojinnaka <56399504+passy4ucj@users.noreply.github.com>
Co-authored-by: Aqida <42426077+AqidaHaidari@users.noreply.github.com>
1 year ago
42b5d30a33
feat: Implement oauth2 monitors ( #3119 )
...
* [empty commit] pull request for implement oauth2 monitor
* feat: implement oauth2 client credentials flow
* fix: auth methods clarification & error handling
* docs: fix JSdocs types and clarifications
1 year ago
7f68e4a987
Merge remote-tracking branch 'origin/master' into status-page-expiry
...
# Conflicts:
# src/lang/en.json
1 year ago
149d08ecbb
Chore: make sql monitors eazier to use ( #3474 )
...
* Fixed the sql monitor not having the query required
* Apply suggestions from code review
* added `redis` and `mongodb` to the connectionString as requested by @chakflying
1 year ago
a0bd4b248b
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/debian-base.dockerfile
# package-lock.json
# package.json
# server/database.js
# src/router.js
1 year ago
1d9a28e9ab
feat: Tailscale ping monitor ( #3178 )
...
* Add boilerplate for tailscale ping
* tailscale initial commit draft
* Refactor TailscalePing & better error handling
Split check function into two methods and added async/await syntax for readability/modularity
Switched to promise-based error handling (takes into account different types of error such as "Execution error", "Error in output", "no matching peer", and "is local Tailscale IP") and throws them as JavaScript errors.
* Minor update
* minor update (again)
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Update server/monitor-types/tailscale-ping.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* timeout revision
* JSDoc
* Removed long explainers
* eslint tailscale-ping.js --fix
* reran eslint
* Fix: Use hostname rather than url
* Fixed NaN on monitor interval
now interval value is correctly passed to runTailscalePing
* Add warning message
---------
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
1 year ago
50d4091ded
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
1 year ago
278b88a9d9
✨ feat: added kafka producer ( #3268 )
...
* ✨ feat: added kafka producer
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: eslint warn
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typings and auth problems
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better variable name to trrack disconnection
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: grouping Kafka Producer special settings into one template
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* ✨ feat: add kafka producer translations into `en.json`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: disable close-on-select on kafka broker picker
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: `en.json` invalid json (conflict resolve)
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Minor
* Fix a bug of clone
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
973db9d4b2
Merge pull request #3330 from chakflying/fix/datetime-wrong-type
...
Chore: Fix incorrect data type for DateTime component
1 year ago
6f4af30701
Merge branch 'master' of https://github.com/louislam/uptime-kuma into status-page-expiry
1 year ago
b1f266ceb1
Added expiry changes to status page and fixes
1 year ago
6bece8796e
✨ feat: json-query monitor added ( #3253 )
...
* ✨ feat: json-query monitor added
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: import warning error
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: br tag and remove comment
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: supporting compare string with other types
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: switch to a better lib for json query
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: better description on json query and using `v-html` in jsonQueryDescription element to fix `a` tags
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: result variable in error message
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: typos in json query description
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* 📝 docs: `HTTP(s) Json Query` added to monitor list in `README.md`
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
* 🐛 fix: needed white space in `README.md`
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Nostr dm notifications (#3051 )
* Add nostr DM notification provider
* require crypto for node 18 compatibility
* remove whitespace
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* move closer to where it is used
* simplify success or failure logic
* don't clobber the non-alert msg
* Update server/notification-providers/nostr.js
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* polyfills required for node <= 18
* resolve linter warnings
* missing comma
---------
Co-authored-by: Frank Elsinga <frank@elsinga.de>
* Drop nostr
* Rebuild package-lock.json
* Lint
---------
Signed-off-by: Muhammed Hussein Karimi <info@karimi.dev>
Co-authored-by: Frank Elsinga <frank@elsinga.de>
Co-authored-by: zappityzap <128872140+zappityzap@users.noreply.github.com>
Co-authored-by: Louis Lam <louislam@users.noreply.github.com>
1 year ago
ed6b4e5ae5
Merge remote-tracking branch 'origin/master' into miles/invert-keyword
...
# Conflicts:
# server/database.js
1 year ago
13ae878ee8
Merge pull request #3347 from louislam/1.22.X
...
1.22.x merge to master
1 year ago
4ea5771f97
Status page certificate expiry
1 year ago
df8fcffb19
Drop unused code
1 year ago
e26abc3156
Improve the setup database
1 year ago
d286c534bd
Improve the setup database for embedded MariaDB
1 year ago
16a1a66e09
Merge remote-tracking branch 'origin/master' into 2.0.X
...
# Conflicts:
# docker/alpine-base.dockerfile
# docker/debian-base.dockerfile
# docker/dockerfile
# package.json
# server/database.js
# server/jobs/util-worker.js
# server/model/maintenance.js
# server/model/monitor.js
# server/routers/api-router.js
# server/server.js
# server/uptime-kuma-server.js
1 year ago
afcfb7e19c
Fix: Incorrect data type for DateTime component
1 year ago
4f6035899d
Real browser monitor type ( #3308 )
1 year ago
596402e71f
Merge pull request #3246 from chakflying/ui/monitor-group-select
...
UI: Improve no group monitor message
1 year ago
62bbc1cf55
Merge pull request #3270 from chakflying/fix/clone-group-monitor-fields
...
Fix: Remove extra fields on clone
1 year ago
19fc7d31e6
Fix: Remove extra fields on clone
1 year ago
dfc6e5ea5b
Update NotFound.vue
1 year ago
de9ad0fe60
UI: Add help msg for no Group Mon.
1 year ago
57190b58c6
fix: dont show ping on details page of groups
2 years ago
2b46da0f47
style: fix linting
2 years ago
9bd76c2795
Merge branch 'master' into group-monitors
2 years ago
0b8dddba24
Merge remote-tracking branch 'origin/master' into skaempfe#2593
...
# Conflicts:
# server/model/monitor.js
# src/pages/Details.vue
2 years ago
2114295381
Merge pull request #3052 from chakflying/ui/monitor-page-design-mobile
...
UI: Improve monitor page layout on mobile
2 years ago
83a59bd984
Fix: Add password filtering
2 years ago
446b5fa9e4
UI: Support more monitor types in URL field
2 years ago
253214ad2b
Merge pull request #3024 from chakflying/feat/edit-tag-multiselect
...
UI: Use vue-multiselect in Edit Tag & Styling Fixes
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
72c16c3aa2
Fix eslint warnings
2 years ago
aa8454b73f
Slightly improve error check on maintenance edit page
2 years ago
9975050872
Chore: Fix line break
2 years ago
9f51115a19
Chore: Fix lint
2 years ago
4057ca6e72
UI: Improve monitor page on mobile
2 years ago
eaa948579b
Fix typo in dashboard TCP Port times
2 years ago
a7588adc52
Merge branch 'master' into grpc-patch
2 years ago
af6e01ee3a
Merge pull request #3010 from chakflying/fix/grpc-invalid-regex
...
Fix: Remove invalid gRPC url regex
2 years ago
171aff1226
add invert keyword feature
2 years ago
7706c29564
Minor
2 years ago
9dd1b1ca0f
Merge remote-tracking branch 'origin/master' into show-tags-in-status-page-monitor-select-list
...
# Conflicts:
# src/pages/StatusPage.vue
2 years ago
22f730499f
Improve the database connection string input
2 years ago
1be74e2720
Merge pull request #2870 from chakflying/feat/auto-theme-status-page
...
Feat: Support auto theme in status pages
2 years ago
97c7ad9cc7
Fix: Remove invalid gRPC url regex
2 years ago
e8d48561fc
Change `Retries` from `0` to `1`
2 years ago
524cf7c607
WIP
2 years ago
a6acd065bb
WIP
2 years ago
227cec86a8
WIP
2 years ago
02291730fe
WIP
2 years ago
70572af1af
Fix #2969
2 years ago
097567e5f0
Merge pull request #2878 from chakflying/feat/status-page-countdown
...
Feat: Add status page countdown to refresh
2 years ago
35f300c8eb
Improve and reuse language keys
2 years ago
491239415e
Merge remote-tracking branch 'origin/master' into doubles-ss_master
...
# Conflicts:
# server/database.js
2 years ago
193a273557
Feat: Add status page countdown to refresh
2 years ago
150607cc93
Feat: Support auto theme in status pages
2 years ago
ad26f0e817
Fix: assign tags when cloning monitor
2 years ago
6fc34e44d9
Resolved issue with using IP Address as GRPC URL
...
I've been having an issue with trying to use an IPAddress Host:Port combination in monitoring my GRPC instances.
This was because the input type was set to url instead of text.
Even if the pattern passes the match test, the url would block as it requires a fully qualified domain name with HTTP and this would fail to submit
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
11fa690e09
Updated API Keys UI
...
The UI has now been moved to the settings page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
db6b863445
show tags in monitor select list under status page : change select UI from normal select to vue-multiselect
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
8a115670cd
Fix label and id
...
Co-authored-by: AlexKraus <alex.b.kraus@googlemail.com>
2 years ago
4fed0c152e
Show `Copy of` in front of the cloned monitor name
2 years ago
4a5a424198
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
2 years ago
f47f2d5c87
Better save button for edit/add monitor page
2 years ago
f0ae67f89a
Merge remote-tracking branch 'origin/master' into mathiash98/clone-monitor
...
# Conflicts:
# src/languages/en.js
# src/pages/EditMonitor.vue
2 years ago
46894793fc
Update Learn More url
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
7c8cff7708
Fix: Add null check for injected HTML
2 years ago
372c6b9078
add markdown support for description
2 years ago
72106ba4c4
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
3ab0faee91
Add update query for old monitors and save new data correctly
2 years ago
9e3a77f419
Customize body placeholder for body encoding
2 years ago
cef0a0faf4
Merge branch 'master' into group-monitors
2 years ago
01c71a0242
Fixed logic errors, removed dev leftovers
...
Fixed a logic error where a comma was used instead of an or, also
removed leftover console.logs from testing.
Date picker is now dissabled when don't expire is checked.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
05443f9bb7
Added language keys
...
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
e4183ee2b7
Database Setup Page ( #2738 )
...
* WIP
* WIP: Database setup process
* Add database setup page
2 years ago
36d160ad02
Rename "consequently" to "consecutively" as suggested by @skylarv
...
https://github.com/louislam/uptime-kuma/pull/1212#issuecomment-1423373045
2 years ago
43941fa2c6
feat: add mtls authen method in http/http keyword
2 years ago
0197778af1
Fix change language issue in the setup page
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
5fff63cd59
add keys for translation
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
99c0b8cb71
Feature - Google Analytics - Addressing PR Comments.
2 years ago
29e24e0de9
Feature - Added Optional Google Analytics tag for Status Page.
2 years ago
4287f7e885
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
...
# Conflicts:
# src/lang/en.json
2 years ago
2c581ade90
Merge branch 'louislam:master' into group-monitors
2 years ago
f82d7b4007
Merge remote-tracking branch 'origin/master' into feature/#2365-allow-markdown-in-status-page-footer
...
# Conflicts:
# package-lock.json
# package.json
# src/languages/en.js
2 years ago
95c934e08b
Fix: Do not allow white space around IP
...
Feat: Trim input on submit
Test: Add test for whitespace regex match
2 years ago
7dacc6a002
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
a6894d36f2
[ #2501 ] Dashboard: Details Page
...
- enable clickable URL on Dashboard Details if monitor is of type `mp-health`
2 years ago
664da4a317
Merge pull request #2684 from gitstart/UPTM-3
...
Save button can't be found while edit and add in Mobile version
2 years ago
064bc00f46
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
2 years ago
6828d337ae
Disable HTTP(s) - Browser Engine
...
Reason: Unfortunately, after some test, I found that Playwright requires a lot of libraries to be installed on the Linux host in order to start Chrome or Firefox. It will be hard to install, so I hide this feature for now.
2 years ago
661fa87134
feat: make parent link clickable
2 years ago
d48eb24046
docs: more comments
2 years ago
aee4c22dee
perf: only do one filter instead of 3 in editMonitor
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
54e63f3e25
Save button can't be found while edit and add in Mobile version
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
83e0401dd8
Show game list for GameDig monitor
2 years ago
aab04f6644
Merge remote-tracking branch 'origin/master' into WhyKickAmooCow_master
2 years ago
86ba6f829e
Merge remote-tracking branch 'remote/master' into feature/add-xml-support-to-http-monitors
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
31f45dcfc9
Merge pull request #2540 from twiggotronix/add-mqtt-schemes
...
Add mqtt, mqtts, ws and wss protocols to the mqtt monitor
2 years ago
49ac71e25c
Merge pull request #2549 from Computroniks/docs/update-jsdoc-2023-01-05
...
Added missing JSDoc comments
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
cf21aa3737
Fix lint
2 years ago
9890a0754b
Fix lint
2 years ago
15c64d458b
Fix lint
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
6437ef198f
Merge pull request #2541 from long2ice/master
...
feat: support redis monitor
2 years ago
db757123ba
refactor: reuse databaseConnectionString
2 years ago
e9564619f1
Feat: Implement tags manager in settings
...
Fix: Remove unused color options
Chore: Fix typo
2 years ago
8fab7112a1
Merge branch 'louislam:master' into add-mqtt-schemes
2 years ago
6e50784b6b
Merge branch 'master' into feature/#2365-allow-markdown-in-status-page-footer
2 years ago
80f2d6e2a7
Added markdown support for maintenance
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
852a088529
Added mardown support for incident
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
6bc0bd84af
Allowed markdown in footer of status page
...
Markdown support has been added using the marked module. To secure
against XSS attacks, DOMPurify is used to sanitize the generated HTML
before it is loaded on the page.
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
32f7a0084a
Fixed negative retention time values
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
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
e490ec6d29
move hostname regex pattern function to frontend-utils
2 years ago
dc8289df12
Added JSDoc for src/
...
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
fc5ec5f492
Fixed styling of clear data dropdown
...
Fixed #2419
Signed-off-by: Matthew Nickson <mnickson@sidingsmedia.com>
2 years ago
40ebc2df79
feat: support redis monitor
2 years ago
abf5e435fe
move to utility function
2 years ago
Jinhyeok Lee
Nelson Chan
GitStart
Henrik Gerdes
Louis Lam
Frank Elsinga
SGprooo
Tarun Singh
Muhammed Hussein karimi
Nelson Chan
ITQ
Peace
Peace
Shihaam Abdul Rahman
Miles Steele
Godwin Gabriel Ndlovu
Matthew Nickson
titanventura
Andreas Brett
Faruk Genç
OidaTiftla
Suriya Soutmun
cyril59310
c
Sebastian Kaempfe
gitstart
long2ice
twiggotronix
Adam Spurgeon
David Twigger