diff --git a/package.json b/package.json index ae8ed1b1..6cb8d9db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.7.3", + "version": "1.8.0", "license": "MIT", "repository": { "type": "git", @@ -29,13 +29,13 @@ "build-docker": "npm run build-docker-debian && npm run build-docker-alpine", "build-docker-alpine-base": "docker buildx build -f docker/alpine-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-alpine . --push", "build-docker-debian-base": "docker buildx build -f docker/debian-base.dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:base-debian . --push", - "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.7.3-alpine --target release . --push", - "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.7.3 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.7.3-debian --target release . --push", + "build-docker-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:alpine -t louislam/uptime-kuma:1-alpine -t louislam/uptime-kuma:1.8.0-alpine --target release . --push", + "build-docker-debian": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.8.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.8.0-debian --target release . --push", "build-docker-nightly": "docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", "build-docker-nightly-alpine": "docker buildx build -f dockerfile-alpine --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly-alpine --target nightly . --push", "build-docker-nightly-amd64": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", "upload-artifacts": "docker buildx build --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.7.3 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.8.0 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "update-version": "node extra/update-version.js", "mark-as-nightly": "node extra/mark-as-nightly.js", diff --git a/server/prometheus.js b/server/prometheus.js index c27f87f0..870581d2 100644 --- a/server/prometheus.js +++ b/server/prometheus.js @@ -6,7 +6,7 @@ const commonLabels = [ "monitor_url", "monitor_hostname", "monitor_port", -] +]; const monitor_cert_days_remaining = new PrometheusClient.Gauge({ name: "monitor_cert_days_remaining", @@ -41,45 +41,46 @@ class Prometheus { monitor_url: monitor.url, monitor_hostname: monitor.hostname, monitor_port: monitor.port - } + }; } update(heartbeat, tlsInfo) { + if (typeof tlsInfo !== "undefined") { try { - let is_valid = 0 + let is_valid = 0; if (tlsInfo.valid == true) { - is_valid = 1 + is_valid = 1; } else { - is_valid = 0 + is_valid = 0; } - monitor_cert_is_valid.set(this.monitorLabelValues, is_valid) + monitor_cert_is_valid.set(this.monitorLabelValues, is_valid); } catch (e) { - console.error(e) + console.error(e); } try { - monitor_cert_days_remaining.set(this.monitorLabelValues, tlsInfo.certInfo.daysRemaining) + monitor_cert_days_remaining.set(this.monitorLabelValues, tlsInfo.certInfo.daysRemaining); } catch (e) { - console.error(e) + console.error(e); } } try { - monitor_status.set(this.monitorLabelValues, heartbeat.status) + monitor_status.set(this.monitorLabelValues, heartbeat.status); } catch (e) { - console.error(e) + console.error(e); } try { if (typeof heartbeat.ping === "number") { - monitor_response_time.set(this.monitorLabelValues, heartbeat.ping) + monitor_response_time.set(this.monitorLabelValues, heartbeat.ping); } else { // Is it good? - monitor_response_time.set(this.monitorLabelValues, -1) + monitor_response_time.set(this.monitorLabelValues, -1); } } catch (e) { - console.error(e) + console.error(e); } } @@ -87,4 +88,4 @@ class Prometheus { module.exports = { Prometheus -} +};