ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2025-03-04 08:25:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

changes around UI templates

Browse source
This commit is contained in:
Aayush Gupta 2023-11-30 12:54:29 +05:30
parent d9c84299b3
commit f3cbb4edbc
3 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -54,6 +54,7 @@
"simple-mongo": "docker run --rm -p 27017:27017 mongo", "simple-mongo": "docker run --rm -p 27017:27017 mongo",
"simple-postgres": "docker run --rm -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres", "simple-postgres": "docker run --rm -p 5432:5432 -e POSTGRES_PASSWORD=postgres postgres",
"simple-mariadb": "docker run --rm -p 3306:3306 -e MYSQL_ROOT_PASSWORD=mariadb# mariadb", "simple-mariadb": "docker run --rm -p 3306:3306 -e MYSQL_ROOT_PASSWORD=mariadb# mariadb",
"simple-zookeeper": "docker run --rm -p 2181:2181 zookeeper",
"update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix", "update-language-files": "cd extra/update-language-files && node index.js && cross-env-shell eslint ../../src/languages/$npm_config_language.js --fix",
"release-final": "node ./extra/test-docker.js && node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js", "release-final": "node ./extra/test-docker.js && node extra/update-version.js && npm run build-docker && node ./extra/press-any-key.js && npm run upload-artifacts && node ./extra/update-wiki-version.js",
"release-beta": "node ./extra/test-docker.js && node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts", "release-beta": "node ./extra/test-docker.js && node extra/beta/update-version.js && npm run build && node ./extra/env2arg.js docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:$VERSION -t louislam/uptime-kuma:beta . --target release --push && node ./extra/press-any-key.js && npm run upload-artifacts",

2
src/lang/en.json
View file

@ -862,5 +862,5 @@
"GrafanaOncallUrl": "Grafana Oncall URL", "GrafanaOncallUrl": "Grafana Oncall URL",
"Browser Screenshot": "Browser Screenshot", "Browser Screenshot": "Browser Screenshot",
"Zookeeper Host": "Zookeeper Host", "Zookeeper Host": "Zookeeper Host",
"Zookeeper Timeout": "Zookeeper Timeout" "Zookeeper Timeout": "Zookeeper Connect Timeout (ms)"
} }

36
src/pages/EditMonitor.vue
View file

@ -388,6 +388,19 @@
</div> </div>
</template> </template>
<!-- Zookeeper -->
<template v-if="monitor.type === 'zookeeper'">
<div class="my-3">
<label for="zookeeperHost" class="form-label">{{ $t("Zookeeper Host") }}</label>
<input id="zookeeperHost" v-model="monitor.zookeeperHost" type="text" class="form-control" required>
</div>
<div class="my-3">
<label for="zookeeperTimeout" class="form-label">{{ $t("Zookeeper Timeout") }}</label>
<input id="zookeeperTimeout" v-model="monitor.zookeeperTimeout" type="number" class="form-control" required min="1000" max="60000" step="1000">
</div>
</template>
<!-- Interval --> <!-- Interval -->
<div class="my-3"> <div class="my-3">
<label for="interval" class="form-label">{{ $t("Heartbeat Interval") }} ({{ $t("checkEverySecond", [ monitor.interval ]) }})</label> <label for="interval" class="form-label">{{ $t("Heartbeat Interval") }} ({{ $t("checkEverySecond", [ monitor.interval ]) }})</label>
@ -502,19 +515,6 @@
</div> </div>
</template> </template>
<!-- Zookeeper -->
<template v-if="monitor.type === 'zookeeper'">
<div class="my-3">
<label for="zookeeperHost" class="form-label">{{ $t("Zookeeper Host") }}</label>
<input id="zookeeperHost" v-model="monitor.zookeeperHost" type="text" class="form-control" required>
</div>
<div class="my-3">
<label for="zookeeperTimeout" class="form-label">{{ $t("Connection Timeout") }}</label>
<input id="zookeeperTimeout" v-model="monitor.zookeeperTimeout" type="number" class="form-control" required min="1000" max="60000" step="1000">
</div>
</template>
<!-- Parent Monitor --> <!-- Parent Monitor -->
<div class="my-3"> <div class="my-3">
<label for="parent" class="form-label">{{ $t("Monitor Group") }}</label> <label for="parent" class="form-label">{{ $t("Monitor Group") }}</label>
@ -1233,6 +1233,16 @@ message HealthCheckResponse {
} }
} }
// Set the host and timeout template for zookeeper
if (this.monitor.type === "zookeeper") {
if (! this.monitor.zookeeperHost) {
this.monitor.zookeeperHost = "host:port";
}
if (! this.monitor.zookeeperTimeout) {
this.monitor.zookeeperTimeout = 5000;
}
}
}, },
currentGameObject(newGameObject, previousGameObject) { currentGameObject(newGameObject, previousGameObject) {