Merge branch 'louislam:master' into master
This commit is contained in:
Ioma Taani
GitHub
commit
909412c87e
6 changed files with 179 additions and 27 deletions
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
|
|
@ -25,4 +25,4 @@ Please delete options that are not relevant.
|
|||
|
||||
## Screenshots (if any)
|
||||
|
||||
Please do not use any external image service. Instead, just paste in or drag and drop the image here and it will be uploaded automatically.
|
||||
Please do not use any external image service. Instead, just paste in or drag and drop the image here, and it will be uploaded automatically.
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
First of all, thank you everyone who made pull requests for Uptime Kuma, I never thought GitHub Community can be that nice! And also because of this, I also never thought other people actually read my code and edit my code. It is not structured and commented so well, lol. Sorry about that.
|
||||
|
||||
The project was created with vite.js (vue3). Then I created a sub-directory called "server" for server part. Both frontend and backend share the same package.json.
|
||||
The project was created with vite.js (vue3). Then I created a subdirectory called "server" for server part. Both frontend and backend share the same package.json.
|
||||
|
||||
The frontend code build into "dist" directory. The server (express.js) exposes the "dist" directory as root of the endpoint. This is how production is working.
|
||||
|
||||
|
|
@ -27,11 +27,10 @@ The frontend code build into "dist" directory. The server (express.js) exposes t
|
|||
|
||||
## Can I create a pull request for Uptime Kuma?
|
||||
|
||||
Generally, if the pull request is working fine and it do not affect any existing logic, workflow and performance, I will merge into the master branch once it is tested.
|
||||
Generally, if the pull request is working fine, and it does not affect any existing logic, workflow and performance, I will merge into the master branch once it is tested.
|
||||
|
||||
If you are not sure whether I will accept your pull request, feel free to create an empty pull request draft first.
|
||||
|
||||
|
||||
### Recommended Pull Request Guideline
|
||||
|
||||
1. Fork the project
|
||||
|
|
@ -66,7 +65,7 @@ I do not have such knowledge to test it.
|
|||
|
||||
#### ⚠ Low Priority - Harsh Mode
|
||||
|
||||
Some pull requests are required to modify the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also you may need to write a lot of unit tests to ensure that there is no breaking change.
|
||||
Some pull requests are required to modify the core. To be honest, I do not want anyone to try to do that, because it would spend a lot of your time. I will review your pull request harshly. Also, you may need to write a lot of unit tests to ensure that there is no breaking change.
|
||||
|
||||
- Touch large parts of code of any very important features
|
||||
- Touch monitoring logic
|
||||
|
|
@ -74,7 +73,6 @@ Some pull requests are required to modify the core. To be honest, I do not want
|
|||
- Touch the entry point of Docker or Node.js
|
||||
- Modify auth
|
||||
|
||||
|
||||
#### *️⃣ Low Priority
|
||||
|
||||
It changed my current workflow and require further studies.
|
||||
|
|
@ -143,7 +141,7 @@ express.js is just used for serving the frontend built files (index.html, .js an
|
|||
- modules/ (Modified 3rd-party modules)
|
||||
- notification-providers/ (individual notification logic)
|
||||
- routers/ (Express Routers)
|
||||
- scoket-handler (Socket.io Handlers)
|
||||
- socket-handler (Socket.io Handlers)
|
||||
- server.js (Server main logic)
|
||||
|
||||
## How to start the Frontend Dev Server
|
||||
|
|
@ -201,7 +199,7 @@ ncu -u -t patch
|
|||
npm install
|
||||
```
|
||||
|
||||
Since previously updating vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only.
|
||||
Since previously updating Vite 2.5.10 to 2.6.0 broke the application completely, from now on, it should update patch release version only.
|
||||
|
||||
Patch release = the third digit ([Semantic Versioning](https://semver.org/))
|
||||
|
||||
|
|
@ -209,20 +207,19 @@ Patch release = the third digit ([Semantic Versioning](https://semver.org/))
|
|||
|
||||
Please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
|
||||
|
||||
|
||||
## Wiki
|
||||
|
||||
Since there is no way to make a pull request to wiki's repo, I have set up another repo to do that.
|
||||
|
||||
https://github.com/louislam/uptime-kuma-wiki
|
||||
|
||||
|
||||
## Maintainer
|
||||
|
||||
Check the latest issues and pull requests:
|
||||
https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
|
||||
|
||||
### Release Procedures
|
||||
|
||||
1. Draft a release note
|
||||
1. Make sure the repo is cleared
|
||||
1. `npm run update-version 1.X.X`
|
||||
|
|
@ -234,22 +231,24 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc
|
|||
1. SSH to demo site server and update to 1.X.X
|
||||
|
||||
Checking:
|
||||
|
||||
- Check all tags is fine on https://hub.docker.com/r/louislam/uptime-kuma/tags
|
||||
- Try the Docker image with tag 1.X.X (Clean install / amd64 / arm64 / armv7)
|
||||
- Try clean install with Node.js
|
||||
- Try clean installation with Node.js
|
||||
|
||||
### Release Wiki
|
||||
|
||||
#### Setup Repo
|
||||
```
|
||||
|
||||
```bash
|
||||
git clone https://github.com/louislam/uptime-kuma-wiki.git
|
||||
cd uptime-kuma-wiki
|
||||
git remote add production https://github.com/louislam/uptime-kuma.wiki.git
|
||||
```
|
||||
|
||||
#### Push to Production Wiki
|
||||
```
|
||||
|
||||
```bash
|
||||
git pull
|
||||
git push production master
|
||||
```
|
||||
|
||||
|
|
|
|||
10
README.md
10
README.md
|
|
@ -17,13 +17,13 @@ Try it!
|
|||
|
||||
https://demo.uptime.kuma.pet
|
||||
|
||||
It is a temporary live demo, all data will be deleted after 10 minutes. The server is located at Tokyo, so if you live far from there it may affect your experience. I suggest that you should install and try it out for the best demo experience.
|
||||
It is a temporary live demo, all data will be deleted after 10 minutes. The server is located in Tokyo, so if you live far from there, it may affect your experience. I suggest that you should install and try it out for the best demo experience.
|
||||
|
||||
VPS is sponsored by Uptime Kuma sponsors on [Open Collective](https://opencollective.com/uptime-kuma)! Thank you so much!
|
||||
|
||||
## ⭐ Features
|
||||
|
||||
* Monitoring uptime for HTTP(s) / TCP / Ping / DNS Record / Push.
|
||||
* Monitoring uptime for HTTP(s) / TCP / HTTP(s) Keyword / Ping / DNS Record / Push / Steam Game Server.
|
||||
* Fancy, Reactive, Fast UI/UX.
|
||||
* Notifications via Telegram, Discord, Gotify, Slack, Pushover, Email (SMTP), and [70+ notification services, click here for the full list](https://github.com/louislam/uptime-kuma/tree/master/src/components/notifications).
|
||||
* 20 second intervals.
|
||||
|
|
@ -120,7 +120,7 @@ If you love this project, please consider giving me a ⭐.
|
|||
|
||||
### Issues Page
|
||||
|
||||
You can discuss or ask for help in [Issues](https://github.com/louislam/uptime-kuma/issues).
|
||||
You can discuss or ask for help in [issues](https://github.com/louislam/uptime-kuma/issues).
|
||||
|
||||
### Subreddit
|
||||
|
||||
|
|
@ -132,8 +132,8 @@ https://www.reddit.com/r/UptimeKuma/
|
|||
|
||||
If you want to report a bug or request a new feature. Free feel to open a [new issue](https://github.com/louislam/uptime-kuma/issues).
|
||||
|
||||
If you want to translate Uptime Kuma into your langauge, please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
|
||||
If you want to translate Uptime Kuma into your language, please read: https://github.com/louislam/uptime-kuma/tree/master/src/languages
|
||||
|
||||
If you want to modify Uptime Kuma, this guideline may be useful for you: https://github.com/louislam/uptime-kuma/blob/master/CONTRIBUTING.md
|
||||
|
||||
English proofreading is needed too because my grammar is not that great sadly. Feel free to correct my grammar in this readme, source code, or wiki.
|
||||
English proofreading is needed too because my grammar is not that great, sadly. Feel free to correct my grammar in this README, source code, or wiki.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
"url": "https://github.com/louislam/uptime-kuma.git"
|
||||
},
|
||||
"engines": {
|
||||
"node": "14.* >=16.*"
|
||||
"node": "14.* || >=16.*"
|
||||
},
|
||||
"scripts": {
|
||||
"install-legacy": "npm install --legacy-peer-deps",
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
"build": "vite build --config ./config/vite.config.js",
|
||||
"test": "node test/prepare-test-server.js && node server/server.js --port=3002 --data-dir=./data/test/ --test",
|
||||
"test-with-build": "npm run build && npm test",
|
||||
"jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend && jest --runInBand --config=./config/jest.config.js",
|
||||
"jest": "node test/prepare-jest.js && npm run jest-frontend && npm run jest-backend",
|
||||
"jest-frontend": "cross-env TEST_FRONTEND=1 jest --config=./config/jest-frontend.config.js",
|
||||
"jest-backend": "cross-env TEST_BACKEND=1 jest --config=./config/jest-backend.config.js",
|
||||
"tsc": "tsc",
|
||||
|
|
|
|||
|
|
@ -8,4 +8,4 @@
|
|||
6. Add it into `languageList` constant.
|
||||
7. Make a [pull request](https://github.com/louislam/uptime-kuma/pulls) when you have done.
|
||||
|
||||
If you do not have programming skills, let me know in [Issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏
|
||||
If you do not have programming skills, let me know in [the issues section](https://github.com/louislam/uptime-kuma/issues). I will assist you. 😏
|
||||
|
|
|
|||
|
|
@ -113,7 +113,7 @@ export default {
|
|||
Email: "Email",
|
||||
Test: "Teszt",
|
||||
"Certificate Info": "Tanúsítvány információk",
|
||||
"Resolver Server": "Resolver szerver",
|
||||
"Resolver Server": "DNS szerver",
|
||||
"Resource Record Type": "Resource Record típusa",
|
||||
"Last Result": "Utolsó eredmény",
|
||||
"Create your admin account": "Hozza létre az adminisztrátor felhasználót",
|
||||
|
|
@ -197,4 +197,157 @@ export default {
|
|||
line: "Line Messenger",
|
||||
mattermost: "Mattermost",
|
||||
"Status Page": "Státusz oldal",
|
||||
"Primary Base URL": "Elsődleges URL",
|
||||
"Push URL": "Meghívandó URL",
|
||||
needPushEvery: "Ezt az URL-t kell meghívni minden {0} másodpercben.",
|
||||
pushOptionalParams: "Opcionális paraméterek: {0}",
|
||||
defaultNotificationName: "{notification} értesítésem ({number})",
|
||||
here: "itt",
|
||||
Required: "Kötelező",
|
||||
"Bot Token": "Hibás token",
|
||||
wayToGetTelegramToken: "Innen kaphat token-t: {0}.",
|
||||
"Chat ID": "Csevegés ID",
|
||||
supportTelegramChatID: "Támogatja a közvetlen csevegést, csoportnak küldést és csatona ID-t is",
|
||||
wayToGetTelegramChatID: "A csevegés ID-t kinyerheti azzal, hogy küld egy üzenetet a bot-nak és erre az URL-re ellátogat, ahol láthatja a chat_id:-t",
|
||||
"YOUR BOT TOKEN HERE": "AZ ÖN BOT TOKENJE ITT",
|
||||
chatIDNotFound: "Csevegés ID nem található, küldjön egy első üzenetet a bot-nak",
|
||||
"Post URL": "Cél URL (Post)",
|
||||
"Content Type": "Tartalom típus (Content Type)",
|
||||
webhookJsonDesc: "{0} ideális a moderh HTTP szerverekhez, mint az Express.js",
|
||||
webhookFormDataDesc: "{multipart} ideális a PHP-hez. A JSON értelmezhető ezzel: {decodeFunction}",
|
||||
secureOptionNone: "Nincs / STARTTLS (25, 587)",
|
||||
secureOptionTLS: "TLS (465)",
|
||||
"Ignore TLS Error": "TLS hiba figyelmen kívül hagyása",
|
||||
"From Email": "Feladó email",
|
||||
emailCustomSubject: "Egyedi tárgy",
|
||||
"To Email": "Cél email",
|
||||
smtpCC: "Másolat",
|
||||
smtpBCC: "Titkos másolat",
|
||||
"Discord Webhook URL": "Discord cím (webhook URL)",
|
||||
wayToGetDiscordURL: "Kaphat egy ilyet, ha ellátogat a Server Settings -> Integrations -> Create Webhook oldalra",
|
||||
"Bot Display Name": "Bot megjelenő neve",
|
||||
"Prefix Custom Message": "Egyedi előtét üzenet",
|
||||
"Hello @everyone is...": "Hello {'@'}mindenki...",
|
||||
"Webhook URL": "Cím (webhook URL)",
|
||||
wayToGetTeamsURL: "Itt megnézheti, hogy kell ilyen URL-t készíteni: {0}.",
|
||||
Number: "Szám",
|
||||
Recipients: "Címzettek",
|
||||
needSignalAPI: "Egy Signal kliensre van szüksége, amihez REST API tartozik.",
|
||||
wayToCheckSignalURL: "Itt megnézheti, hogy hozhat létre egyet:",
|
||||
signalImportant: "FONTOS! Nem keverheti a csoportokat és számokat a címzetteknél.",
|
||||
"Application Token": "Alkalmazás token",
|
||||
"Server URL": "Szerver URL",
|
||||
Priority: "Prioritás",
|
||||
"Icon Emoji": "Emoji ikonok",
|
||||
"Channel Name": "Csatorna neve",
|
||||
"Uptime Kuma URL": "Uptime Kuma cím",
|
||||
aboutWebhooks: "Webhook-okról több info: {0}",
|
||||
aboutChannelName: "Adja meg a {0} csatorna nevét ha szeretné elkerülni a webhook-ot. Pl: #masik-csatorna",
|
||||
aboutKumaURL: "Ha üresen hagyja a Uptime Kuma cím mezőt, akkor a projekt GitHub oldala lesz az alapértelmezett.",
|
||||
emojiCheatSheet: "Emoji csalás: {0}",
|
||||
clicksendsms: "ClickSend SMS",
|
||||
"User Key": "Felhasználói kulcs",
|
||||
Device: "Eszköz",
|
||||
"Message Title": "Üzenet címe",
|
||||
"Notification Sound": "Értesítési hang",
|
||||
"More info on:": "További információ: {0}",
|
||||
pushoverDesc1: "A vészhelyzeti prioritásnak (2) 30 másodperc az újrapróbálkozási alapértéke és egy óra után lejár.",
|
||||
pushoverDesc2: "Ha különböző eszközökre szeretne értesítést küldeni, töltse ki az Eszköz mezőt.",
|
||||
"SMS Type": "SMS típusa",
|
||||
octopushTypePremium: "Premium (Fast - recommended for alerting)",
|
||||
octopushTypeLowCost: "Low Cost (Slow - sometimes blocked by operator)",
|
||||
checkPrice: "Nézze meg az {0} féle árat:",
|
||||
apiCredentials: "API kulcsok",
|
||||
octopushLegacyHint: "Az Octopush régi (2011-2020) verzióját használja vagy az újat?",
|
||||
"Check octopush prices": "Nézze meg az Octopush {0} féle árát.",
|
||||
octopushPhoneNumber: "Telefonszám (nemz. formátum, pl : +36705554433) ",
|
||||
octopushSMSSender: "SMS küldő neve : 3-11 betű/szám (a-zA-Z0-9) vagy szóköz",
|
||||
"LunaSea Device ID": "LunaSea eszköz ID",
|
||||
"Apprise URL": "Apprise cím (URL)",
|
||||
"Example:": "Például: {0}",
|
||||
"Read more:": "Itt olvashat róla: {0}",
|
||||
"Status:": "Állapot: {0}",
|
||||
"Read more": "Tovább olvasom",
|
||||
appriseInstalled: "Apprise telepítve.",
|
||||
appriseNotInstalled: "Apprise nincs telepítve. {0}",
|
||||
"Access Token": "Elérési token",
|
||||
"Channel access token": "Csatorna elérési token",
|
||||
"Line Developers Console": "Line Developers konzol",
|
||||
lineDevConsoleTo: "Line Developers konzol - {0}",
|
||||
"Basic Settings": "Alap beállítások",
|
||||
"User ID": "Felhasználó ID",
|
||||
"Messaging API": "Üzenet API",
|
||||
wayToGetLineChannelToken: "{0} első eléréséhez készítsen egy Provider-t és csatornát (Messaging API), utána kaphatja meg a csatorna elérési token-t és felhasználó ID-t az alábbi menüpontban.",
|
||||
"Icon URL": "Ikon cím (URL)",
|
||||
aboutIconURL: "Megadhat egy webcímet az Ikon cím mezőben, ezzel felülírva az alapértelmezet képet. Nem kerül felhasználásra, ha az Emoji-k be vannak állítva.",
|
||||
aboutMattermostChannelName: "Felülírhatja az alapértelmezett csatornát, ahova a webhook az adatokat küldi. Ehhez töltse ki a \"Csatorna neve\" mezőt (pl: #egyeb-csatorna). A Mattermost webhook beállításaiban további engedélyek szükségesek",
|
||||
matrix: "Matrix",
|
||||
promosmsTypeEco: "SMS ECO - olcsó, de lassú, gyakran túlterhelt. Csak lengyel címzettekhez.",
|
||||
promosmsTypeFlash: "SMS FLASH - Az üzenet automatikusan megjelenik a fogadó eszközön. Csak lengyel címzettekhez.",
|
||||
promosmsTypeFull: "SMS FULL - Prémium szintje az SMS-nek. Megadható a feladó neve, de előtte jóváhagyás szükséges. Ideális értesítésekhez.",
|
||||
promosmsTypeSpeed: "SMS SPEED - A legmagasabb prioritás a rendszerben. Nagyon gyors és pontos, de költséges (kb. duplája a hagyományos SMS-nek).",
|
||||
promosmsPhoneNumber: "Telefonszám (lengyel címzett esetén az országkód elhagyható)",
|
||||
promosmsSMSSender: "SMS feladónév: Előre beállított név vagy az alábbiak egyike: InfoSMS, SMS Info, MaxSMS, INFO, SMS",
|
||||
"Feishu WebHookUrl": "Feishu webhook cím (URL)",
|
||||
matrixHomeserverURL: "Homeserver cím (URL http(s):// előtaggal és opcionálisan port-tal)",
|
||||
"Internal Room Id": "Belső Szoba ID",
|
||||
matrixDesc1: "A belső szoba ID-t a szpbák speciális beállítások között találja meg a Matrix kliens programban. Így kell kinéznie: !QMdRCpUIfLwsfjxye6:home.server.",
|
||||
matrixDesc2: "Erősen ajánlott készíteni egy új felhasználót és nem a teljes joggal rendelkező felhasználót használni. Az új felhasználó létrehozása után csak azokba a szobákba kell megjhívni a felhasználót, ahol értesítéseket szeretne kapni. Ezzel a művelettel lehet elérési token-t kérni: {0}",
|
||||
Method: "Metódus",
|
||||
Body: "Törzs",
|
||||
Headers: "Fejlécek",
|
||||
PushUrl: "Push cím (URL)",
|
||||
HeadersInvalidFormat: "A kérés fejléc nem egy valós JSON: ",
|
||||
BodyInvalidFormat: "A kérés törzse nem egy valós JSON: ",
|
||||
"Monitor History": "Vizsgálatok előzményei",
|
||||
clearDataOlderThan: "Előzmények megtartása {0} napig.",
|
||||
PasswordsDoNotMatch: "Jelszó nem egyezik.",
|
||||
records: "sorok",
|
||||
"One record": "Egy sor",
|
||||
steamApiKeyDescription: "Steam Game Server ellenőrzéséhez szükséges egy Steam Web-API kulcs. Itt létrehozhat egy API kulcsot: ",
|
||||
"Current User": "Felhasználó",
|
||||
recent: "Legújabb",
|
||||
Done: "Kész",
|
||||
Info: "Infó",
|
||||
Security: "Biztonság",
|
||||
"Steam API Key": "Steam API kulcs",
|
||||
"Shrink Database": "Adatbázis tömörítése",
|
||||
"Pick a RR-Type...": "Válasszon egy RR-típust...",
|
||||
"Pick Accepted Status Codes...": "Válasszon olyan kódot, ami elfogadottnak számít...",
|
||||
Default: "Alapért.",
|
||||
"HTTP Options": "HTTP beállítások",
|
||||
"Create Incident": "Incidens létrehozása",
|
||||
Title: "Cím",
|
||||
Content: "Tartalom",
|
||||
Style: "Stílus",
|
||||
info: "info",
|
||||
warning: "warning",
|
||||
danger: "danger",
|
||||
primary: "primary",
|
||||
light: "light",
|
||||
dark: "dark",
|
||||
Post: "Bejegyzés",
|
||||
"Please input title and content": "Adjon meg címet és tartalmat",
|
||||
Created: "Létrehozva",
|
||||
"Last Updated": "Utolsó mód.",
|
||||
Unpin: "Leválaszt",
|
||||
"Switch to Light Theme": "Világos témára váltás",
|
||||
"Switch to Dark Theme": "Sötét témára váltás",
|
||||
"Show Tags": "Címkék mutatása",
|
||||
"Hide Tags": "Címkék elrejtése",
|
||||
Description: "Leírás",
|
||||
"No monitors available.": "Nincs még figyelő beállítva.",
|
||||
"Add one": "Adjon hozzá egyet",
|
||||
"No Monitors": "Nincs figyelő",
|
||||
"Untitled Group": "Névtelen csoport",
|
||||
Services: "Szolgáltatások",
|
||||
Discard: "Elvet",
|
||||
Cancel: "Mégsem",
|
||||
"Powered by": "A megoldást szállítja az",
|
||||
shrinkDatabaseDescription: "VACUUM futtatása az SQLite-on. Ha az adatbázisod 1.10.0-nál újabb, akkor az AUTO_VACUUM engedélyezve van, nincs szükség a műveletre.",
|
||||
serwersms: "SerwerSMS.pl",
|
||||
serwersmsAPIUser: "API felhasználónév (webapi_ előtaggal együtt)",
|
||||
serwersmsAPIPassword: "API jelszó",
|
||||
serwersmsPhoneNumber: "Telefonszám",
|
||||
serwersmsSenderName: "SMS feladó neve (regisztrált név az oldalon)",
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue