From f74b2662c57a91c4f50041dd11cd0d743a100a85 Mon Sep 17 00:00:00 2001 From: Lukas <35193662+NixNotCastey@users.noreply.github.com> Date: Mon, 18 Oct 2021 12:02:54 +0200 Subject: [PATCH 1/9] Fixed values for sms type --- src/components/notifications/PromoSMS.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/notifications/PromoSMS.vue b/src/components/notifications/PromoSMS.vue index 06dea0b2..61e61a93 100644 --- a/src/components/notifications/PromoSMS.vue +++ b/src/components/notifications/PromoSMS.vue @@ -10,8 +10,8 @@
{{ $t("checkPrice", [$t("promosms")]) }} From c363d3374e6b01f37cc1da59ef8a83247ff70ea4 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 18 Oct 2021 19:45:50 +0800 Subject: [PATCH 2/9] fix "build-docker-nightly-alpine" wrong path --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ca64dbe5..165057a9 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "build-docker-alpine": "docker buildx build -f docker/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 -f docker/dockerfile --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 -f docker/dockerfile --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-alpine": "docker buildx build -f docker/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 -f docker/dockerfile --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.8.0 && npm ci --production && npm run download-dist", From cc36ff52104b699feda918ce4d6b5bddf9061ab6 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 18 Oct 2021 19:46:15 +0800 Subject: [PATCH 3/9] update to 1.9.0 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 165057a9..7709a64e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.8.0", + "version": "1.9.0", "license": "MIT", "repository": { "type": "git", @@ -30,13 +30,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 docker/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 -f docker/dockerfile --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-alpine": "docker buildx build -f docker/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.9.0-alpine --target release . --push", + "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.9.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.9.0-debian --target release . --push", "build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", "build-docker-nightly-alpine": "docker buildx build -f docker/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 -f docker/dockerfile --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.8.0 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.9.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", From 5f36d2acdacf022fd8085fbe419242702bf5aa2f Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 18 Oct 2021 20:02:50 +0800 Subject: [PATCH 4/9] fix upload artifacts --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7709a64e..b83efa12 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", "build-docker-nightly-alpine": "docker buildx build -f docker/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 -f docker/dockerfile --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", + "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", "setup": "git checkout 1.9.0 && npm ci --production && npm run download-dist", "download-dist": "node extra/download-dist.js", "update-version": "node extra/update-version.js", From f11417e8549835acfa4433aa8d094dc77ffb788f Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 18 Oct 2021 20:43:17 +0800 Subject: [PATCH 5/9] [upload artifacts] no idea why suddenly not working via env var, hardcode the VERSION instead --- docker/dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/dockerfile b/docker/dockerfile index 97655748..27ee9736 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -34,7 +34,7 @@ RUN apt update && \ ARG GITHUB_TOKEN ARG TARGETARCH ARG PLATFORM=debian -ARG VERSION +ARG VERSION=1.9.0 ARG FILE=$PLATFORM-$TARGETARCH-$VERSION.tar.gz ARG DIST=dist.tar.gz From 3512faad142dd047e6dc125db241d685084acd32 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 18 Oct 2021 23:38:29 +0800 Subject: [PATCH 6/9] move `kubernetes` folder to the `k8s-unofficial` branch --- kubernetes/README.md | 32 ----------------- kubernetes/kustomization.yml | 10 ------ kubernetes/uptime-kuma/deployment.yml | 45 ------------------------ kubernetes/uptime-kuma/ingressroute.yml | 39 -------------------- kubernetes/uptime-kuma/kustomization.yml | 5 --- kubernetes/uptime-kuma/pvc.yml | 10 ------ kubernetes/uptime-kuma/service.yml | 13 ------- 7 files changed, 154 deletions(-) delete mode 100644 kubernetes/README.md delete mode 100644 kubernetes/kustomization.yml delete mode 100644 kubernetes/uptime-kuma/deployment.yml delete mode 100644 kubernetes/uptime-kuma/ingressroute.yml delete mode 100644 kubernetes/uptime-kuma/kustomization.yml delete mode 100644 kubernetes/uptime-kuma/pvc.yml delete mode 100644 kubernetes/uptime-kuma/service.yml diff --git a/kubernetes/README.md b/kubernetes/README.md deleted file mode 100644 index e85b0c4c..00000000 --- a/kubernetes/README.md +++ /dev/null @@ -1,32 +0,0 @@ -# Uptime-Kuma K8s Deployment - -⚠ Warning: K8s deployment is provided by contributors. I have no experience with K8s and I can't fix error in the future. I only test Docker and Node.js. Use at your own risk. - -## How does it work? - -Kustomize is a tool which builds a complete deployment file for all config elements. -You can edit the files in the ```uptime-kuma``` folder except the ```kustomization.yml``` until you know what you're doing. -If you want to choose another namespace you can edit the ```kustomization.yml``` in the ```kubernetes```-Folder and change the ```namespace: uptime-kuma``` to something you like. - -It creates a certificate with the specified Issuer and creates the Ingress for the Uptime-Kuma ClusterIP-Service. - -## What do I have to edit? - -You have to edit the ```ingressroute.yml``` to your needs. -This ingressroute.yml is for the [nginx-ingress-controller](https://kubernetes.github.io/ingress-nginx/) in combination with the [cert-manager](https://cert-manager.io/). - -- Host -- Secrets and secret names -- (Cluster)Issuer (optional) -- The Version in the Deployment-File - - Update: - - Change to newer version and run the above commands, it will update the pods one after another - -## How To use - -- Install [kustomize](https://kubectl.docs.kubernetes.io/installation/kustomize/) -- Edit files mentioned above to your needs -- Run ```kustomize build > apply.yml``` -- Run ```kubectl apply -f apply.yml``` - -Now you should see some k8s magic and Uptime-Kuma should be available at the specified address. diff --git a/kubernetes/kustomization.yml b/kubernetes/kustomization.yml deleted file mode 100644 index 0daf10f4..00000000 --- a/kubernetes/kustomization.yml +++ /dev/null @@ -1,10 +0,0 @@ -namespace: uptime-kuma -namePrefix: uptime-kuma- - -commonLabels: - app: uptime-kuma - -bases: - - uptime-kuma - - diff --git a/kubernetes/uptime-kuma/deployment.yml b/kubernetes/uptime-kuma/deployment.yml deleted file mode 100644 index b97ece21..00000000 --- a/kubernetes/uptime-kuma/deployment.yml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - component: uptime-kuma - name: deployment -spec: - selector: - matchLabels: - component: uptime-kuma - replicas: 1 - strategy: - type: Recreate - - template: - metadata: - labels: - component: uptime-kuma - spec: - containers: - - name: app - image: louislam/uptime-kuma:1 - ports: - - containerPort: 3001 - volumeMounts: - - mountPath: /app/data - name: storage - livenessProbe: - exec: - command: - - node - - extra/healthcheck.js - initialDelaySeconds: 180 - periodSeconds: 60 - timeoutSeconds: 30 - readinessProbe: - httpGet: - path: / - port: 3001 - scheme: HTTP - - volumes: - - name: storage - persistentVolumeClaim: - claimName: pvc diff --git a/kubernetes/uptime-kuma/ingressroute.yml b/kubernetes/uptime-kuma/ingressroute.yml deleted file mode 100644 index 71f7027f..00000000 --- a/kubernetes/uptime-kuma/ingressroute.yml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/proxy-read-timeout: "3600" - nginx.ingress.kubernetes.io/proxy-send-timeout: "3600" - nginx.ingress.kubernetes.io/server-snippets: | - location / { - proxy_set_header Upgrade $http_upgrade; - proxy_http_version 1.1; - proxy_set_header X-Forwarded-Host $http_host; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header Host $host; - proxy_set_header Connection "upgrade"; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_cache_bypass $http_upgrade; - } - name: ingress -spec: - tls: - - hosts: - - example.com - secretName: example-com-tls - rules: - - host: example.com - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: service - port: - number: 3001 diff --git a/kubernetes/uptime-kuma/kustomization.yml b/kubernetes/uptime-kuma/kustomization.yml deleted file mode 100644 index 638a2ab6..00000000 --- a/kubernetes/uptime-kuma/kustomization.yml +++ /dev/null @@ -1,5 +0,0 @@ -resources: - - deployment.yml - - service.yml - - ingressroute.yml - - pvc.yml \ No newline at end of file diff --git a/kubernetes/uptime-kuma/pvc.yml b/kubernetes/uptime-kuma/pvc.yml deleted file mode 100644 index eda3b8be..00000000 --- a/kubernetes/uptime-kuma/pvc.yml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: pvc -spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 4Gi diff --git a/kubernetes/uptime-kuma/service.yml b/kubernetes/uptime-kuma/service.yml deleted file mode 100644 index 5fa812e1..00000000 --- a/kubernetes/uptime-kuma/service.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: service -spec: - selector: - component: uptime-kuma - type: ClusterIP - ports: - - name: http - port: 3001 - targetPort: 3001 - protocol: TCP From 8eaa8116c3a010b763f429af214acee67aa12299 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Mon, 18 Oct 2021 23:55:00 +0800 Subject: [PATCH 7/9] update email --- CODE_OF_CONDUCT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index b618a2c4..746334e6 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -60,7 +60,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at -louis@uptimekuma.louislam.net. +uptime@kuma.pet. All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the From 182597944d775e0e60d1681ecb5d6cc4b6d64cf0 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 19 Oct 2021 00:19:26 +0800 Subject: [PATCH 8/9] fix #721 --- src/mixins/socket.js | 8 ++++---- src/pages/Details.vue | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/mixins/socket.js b/src/mixins/socket.js index 321e2d6b..d7ac8bcb 100644 --- a/src/mixins/socket.js +++ b/src/mixins/socket.js @@ -347,7 +347,7 @@ export default { let result = {}; let unknown = { - text: "Unknown", + text: this.$t("Unknown"), color: "secondary", }; @@ -358,17 +358,17 @@ export default { result[monitorID] = unknown; } else if (lastHeartBeat.status === 1) { result[monitorID] = { - text: "Up", + text: this.$t("Up"), color: "primary", }; } else if (lastHeartBeat.status === 0) { result[monitorID] = { - text: "Down", + text: this.$t("Down"), color: "danger", }; } else if (lastHeartBeat.status === 2) { result[monitorID] = { - text: "Pending", + text: this.$t("Pending"), color: "warning", }; } else { diff --git a/src/pages/Details.vue b/src/pages/Details.vue index d38d8f84..1363aa20 100644 --- a/src/pages/Details.vue +++ b/src/pages/Details.vue @@ -41,7 +41,7 @@ {{ $t("checkEverySecond", [ monitor.interval ]) }}
- {{ $t(status.text) }} + {{ status.text }}
From c6fc385289ac9bd2691b6c2406be1a0550c58da5 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Tue, 19 Oct 2021 00:20:27 +0800 Subject: [PATCH 9/9] update to 1.9.1 --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index b83efa12..174ab6aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uptime-kuma", - "version": "1.9.0", + "version": "1.9.1", "license": "MIT", "repository": { "type": "git", @@ -30,13 +30,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 docker/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.9.0-alpine --target release . --push", - "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.9.0 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.9.0-debian --target release . --push", + "build-docker-alpine": "docker buildx build -f docker/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.9.1-alpine --target release . --push", + "build-docker-debian": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma -t louislam/uptime-kuma:1 -t louislam/uptime-kuma:1.9.1 -t louislam/uptime-kuma:debian -t louislam/uptime-kuma:1-debian -t louislam/uptime-kuma:1.9.1-debian --target release . --push", "build-docker-nightly": "docker buildx build -f docker/dockerfile --platform linux/amd64,linux/arm64,linux/arm/v7 -t louislam/uptime-kuma:nightly --target nightly . --push", "build-docker-nightly-alpine": "docker buildx build -f docker/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 -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:nightly-amd64 --target nightly . --push --progress plain", "upload-artifacts": "docker buildx build -f docker/dockerfile --platform linux/amd64 -t louislam/uptime-kuma:upload-artifact --build-arg GITHUB_TOKEN --target upload-artifact . --progress plain", - "setup": "git checkout 1.9.0 && npm ci --production && npm run download-dist", + "setup": "git checkout 1.9.1 && 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",