From 0938e4fbdaeb785a9ec20e9b240a149b368364b1 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Fri, 23 Apr 2021 21:50:25 +0800 Subject: [PATCH 01/21] Update config.yaml --- config.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/config.yaml b/config.yaml index cb3e7b4fc..2702b3955 100644 --- a/config.yaml +++ b/config.yaml @@ -1,24 +1,24 @@ settings: - title: 'Status Page' - url: 'https://status-page.eidam.dev' # used for Slack messages + title: 'Cotpear Status Page' + url: 'https://status.cotpear.com' # used for Slack messages logo: logo-192x192.png # image in ./public/ folder daysInHistogram: 90 # number of days you want to display in histogram collectResponseTimes: true # collects avg response times from CRON locations - allmonitorsOperational: 'All Systems Operational' - notAllmonitorsOperational: 'Not All Systems Operational' + allmonitorsOperational: '所有系統運作良好' + notAllmonitorsOperational: '部分系統運作有異' monitorLabelOperational: 'Operational' monitorLabelNotOperational: 'Not Operational' - monitorLabelNoData: 'No data' - dayInHistogramNoData: 'No data' - dayInHistogramOperational: 'All good' - dayInHistogramNotOperational: ' incident(s)' # xx incident(s) recorded + monitorLabelNoData: '無資料' + dayInHistogramNoData: '無資料' + dayInHistogramOperational: '一切良好' + dayInHistogramNotOperational: ' 個事件' # xx incident(s) recorded monitors: - - id: workers-cloudflare-com # unique identifier - name: workers.cloudflare.com - description: 'You write code. They handle the rest.' # default=empty - url: 'https://workers.cloudflare.com/' # URL to fetch + - id: www-cotpear-com # unique identifier + name: 首頁 - https://www.cotpear.com + description: 'Cotpear 主頁' # default=empty + url: 'https://www.cotpear.com/' # URL to fetch method: GET # default=GET expectStatus: 200 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false From ea7ed001d6cd5f71fb822f9af849eb51ac81821c Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Fri, 23 Apr 2021 22:13:50 +0800 Subject: [PATCH 02/21] Update config.yaml --- config.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/config.yaml b/config.yaml index 2702b3955..fd3d1a5d9 100644 --- a/config.yaml +++ b/config.yaml @@ -7,8 +7,8 @@ settings: allmonitorsOperational: '所有系統運作良好' notAllmonitorsOperational: '部分系統運作有異' - monitorLabelOperational: 'Operational' - monitorLabelNotOperational: 'Not Operational' + monitorLabelOperational: '良好' + monitorLabelNotOperational: '有狀況' monitorLabelNoData: '無資料' dayInHistogramNoData: '無資料' dayInHistogramOperational: '一切良好' @@ -23,15 +23,15 @@ monitors: expectStatus: 200 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false - - id: www-cloudflare-com - name: www.cloudflare.com - description: 'Built for anything connected to the Internet.' - url: 'https://www.cloudflare.com' + - id: *-cotpear-com + name: Cotpear 總網絡系統 - https://*.cotpear.com + description: 'Cotpear 總網絡系統（未實質應用）' + url: 'https://*.cotpear.com' method: GET expectStatus: 200 - - - id: blog-cloudflare-com - name: The Cloudflare Blog - url: 'https://blog.cloudflare.com/' + - id: -cotpear-com + name: Cotpear 狀態 - https://status.cotpear.com + description: 'Cotpear 狀態' + url: 'https://status.cotpear.com' method: GET expectStatus: 200 From c666d8c456ef0d9a71575e3a5069038aa32b2f4b Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Fri, 23 Apr 2021 22:16:51 +0800 Subject: [PATCH 03/21] Update index.js --- pages/index.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pages/index.js b/pages/index.js index 4f7121158..73441c28d 100644 --- a/pages/index.js +++ b/pages/index.js @@ -90,7 +90,7 @@ export default function Index({ config, kvMonitors, kvMonitorsLastUpdate }) { })}
- Powered by{' '} + 技術是由{' '} Cloudflare Workers{' '} @@ -98,13 +98,14 @@ export default function Index({ config, kvMonitors, kvMonitorsLastUpdate }) { Flareact{' '} + 提供。
- Get Your Status Page + 部署一個您自己的狀態頁面
From 3ab0a446316e4a6e1f1d8b023d6e023b8ee584d0 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Fri, 23 Apr 2021 22:26:25 +0800 Subject: [PATCH 04/21] Update config.yaml --- config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index fd3d1a5d9..2b02ebcd8 100644 --- a/config.yaml +++ b/config.yaml @@ -23,7 +23,7 @@ monitors: expectStatus: 200 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false - - id: *-cotpear-com + - id: point-cotpear-com name: Cotpear 總網絡系統 - https://*.cotpear.com description: 'Cotpear 總網絡系統（未實質應用）' url: 'https://*.cotpear.com' From fc2cd828a769cf82521f30b820c23b79718415c3 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 21:46:25 +0800 Subject: [PATCH 05/21] Update config.yaml --- config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 2b02ebcd8..792ab84e8 100644 --- a/config.yaml +++ b/config.yaml @@ -24,9 +24,9 @@ monitors: followRedirect: false # should fetch follow redirects, default=false - id: point-cotpear-com - name: Cotpear 總網絡系統 - https://*.cotpear.com + name: Cotpear 總網絡系統 - https://cotpear.com description: 'Cotpear 總網絡系統（未實質應用）' - url: 'https://*.cotpear.com' + url: 'https://cotpear.com' method: GET expectStatus: 200 - id: -cotpear-com From 0ff9a004359340eb56e1ffeff3ec251f3e95017b Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 21:51:19 +0800 Subject: [PATCH 06/21] Update monitorCard.js --- src/components/monitorCard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/monitorCard.js b/src/components/monitorCard.js index 01fc6e23f..e7b55a522 100644 --- a/src/components/monitorCard.js +++ b/src/components/monitorCard.js @@ -40,8 +40,8 @@ export default function MonitorCard({ key, monitor, data }) {
-
{config.settings.daysInHistogram} days ago
-
Today
+
{config.settings.daysInHistogram} 天前
+
今天
) From bd8cad6497194a3d0793d2241c6ef7ced3477d96 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 21:53:33 +0800 Subject: [PATCH 07/21] Update monitorStatusLabel.js --- src/components/monitorStatusLabel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/monitorStatusLabel.js b/src/components/monitorStatusLabel.js index f03b160dd..40db9ba53 100644 --- a/src/components/monitorStatusLabel.js +++ b/src/components/monitorStatusLabel.js @@ -9,7 +9,7 @@ const classes = { export default function MonitorStatusLabel({ kvMonitor }) { let color = 'gray' - let text = 'No data' + let text = '無資料' if (typeof kvMonitor !== 'undefined') { if (kvMonitor.lastCheck.operational) { From 0d4b584d282d63f66c8273e002c7ac0dcd3f5369 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 21:59:55 +0800 Subject: [PATCH 08/21] Update monitorStatusHeader.js --- src/components/monitorStatusHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/monitorStatusHeader.js b/src/components/monitorStatusHeader.js index 38bddac59..78ff258df 100644 --- a/src/components/monitorStatusHeader.js +++ b/src/components/monitorStatusHeader.js @@ -23,9 +23,9 @@ export default function MonitorStatusHeader({ kvMonitorsLastUpdate }) {
{text}
{kvMonitorsLastUpdate.time && typeof window !== 'undefined' && (
- checked{' '} + 於{' '} {Math.round((Date.now() - kvMonitorsLastUpdate.time) / 1000)} sec - ago (from{' '} + 前檢查 (從{' '} {locations[kvMonitorsLastUpdate.loc] || kvMonitorsLastUpdate.loc})
)} From 9ac82a1ead96be3feee4452e36bd76d0b1d3b4ee Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 22:01:31 +0800 Subject: [PATCH 09/21] Update helpers.js --- src/functions/helpers.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/functions/helpers.js b/src/functions/helpers.js index f4f5327f1..56f507cfa 100644 --- a/src/functions/helpers.js +++ b/src/functions/helpers.js @@ -4,10 +4,10 @@ import { useEffect, useState } from 'react' const kvDataKey = 'monitors_data_v1_1' export const locations = { - WAW: 'Warsaw', - SCL: 'Santiago de Chile', - MEL: 'Melbourne', - SIN: 'Singapore', + WAW: '華沙', + SCL: '聖地牙哥', + MEL: '墨爾本', + SIN: '新加坡', } export async function getKVMonitors() { From b74968a5b13aabf6833cebb0b242035e80920201 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 22:03:01 +0800 Subject: [PATCH 10/21] Update monitorStatusHeader.js --- src/components/monitorStatusHeader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/monitorStatusHeader.js b/src/components/monitorStatusHeader.js index 78ff258df..518aee750 100644 --- a/src/components/monitorStatusHeader.js +++ b/src/components/monitorStatusHeader.js @@ -25,7 +25,7 @@ export default function MonitorStatusHeader({ kvMonitorsLastUpdate }) {
於{' '} {Math.round((Date.now() - kvMonitorsLastUpdate.time) / 1000)} sec - 前檢查 (從{' '} + 前檢查 (位置: {' '} {locations[kvMonitorsLastUpdate.loc] || kvMonitorsLastUpdate.loc})
)} From 9ad964d4d77c3774719bade7f95151005c3594ed Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 22:09:16 +0800 Subject: [PATCH 11/21] Update config.yaml --- config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 792ab84e8..550986e53 100644 --- a/config.yaml +++ b/config.yaml @@ -28,8 +28,8 @@ monitors: description: 'Cotpear 總網絡系統（未實質應用）' url: 'https://cotpear.com' method: GET - expectStatus: 200 - - id: -cotpear-com + expectStatus: 302 + - id: status-cotpear-com name: Cotpear 狀態 - https://status.cotpear.com description: 'Cotpear 狀態' url: 'https://status.cotpear.com' From 84644c62829b5d329ff0c3fbcb806e511c3de6b8 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 22:11:49 +0800 Subject: [PATCH 12/21] Update monitorStatusHeader.js --- src/components/monitorStatusHeader.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/monitorStatusHeader.js b/src/components/monitorStatusHeader.js index 518aee750..c7ad8858f 100644 --- a/src/components/monitorStatusHeader.js +++ b/src/components/monitorStatusHeader.js @@ -24,9 +24,8 @@ export default function MonitorStatusHeader({ kvMonitorsLastUpdate }) { {kvMonitorsLastUpdate.time && typeof window !== 'undefined' && (
於{' '} - {Math.round((Date.now() - kvMonitorsLastUpdate.time) / 1000)} sec - 前檢查 (位置: {' '} - {locations[kvMonitorsLastUpdate.loc] || kvMonitorsLastUpdate.loc}) + {Math.round((Date.now() - kvMonitorsLastUpdate.time) / 1000)} 秒前檢查 + (位置: {' '}{locations[kvMonitorsLastUpdate.loc] || kvMonitorsLastUpdate.loc})
)} From 50ab5f71764cbda342bb6883f7dcdb84a02009a2 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sat, 24 Apr 2021 22:24:25 +0800 Subject: [PATCH 13/21] Update config.yaml --- config.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config.yaml b/config.yaml index 550986e53..49bea3fef 100644 --- a/config.yaml +++ b/config.yaml @@ -35,3 +35,9 @@ monitors: url: 'https://status.cotpear.com' method: GET expectStatus: 200 + - id: yi_chi-cotpear-com + name: Yi Chi Profile - https://yi-chi.cotpear.com + description: '關於我 - 齊一個人頁面' + url: 'https://yi-chi.cotpear.com' + method: GET + expectStatus: 200 From 9751ea596b154e0e61687b5a11ea415d133ebaa7 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sun, 25 Apr 2021 17:32:38 +0800 Subject: [PATCH 14/21] Update wrangler.toml --- wrangler.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrangler.toml b/wrangler.toml index 509a63c12..1375ea163 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -5,7 +5,7 @@ type = "webpack" webpack_config = "node_modules/flareact/webpack" [triggers] -crons = ["* * * * *"] +crons = ["*/2 * * * *"] [site] bucket = "out" From b579ede900264aacd5358e4caa27e8770f0ff095 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Sun, 25 Apr 2021 17:48:29 +0800 Subject: [PATCH 15/21] Update wrangler.toml --- wrangler.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrangler.toml b/wrangler.toml index 1375ea163..0a7d30041 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -5,7 +5,7 @@ type = "webpack" webpack_config = "node_modules/flareact/webpack" [triggers] -crons = ["*/2 * * * *"] +crons = ["*/15 * * * *"] [site] bucket = "out" From 0d54da3b65ee064ff61f4bd2fb01cb849296934b Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Mon, 9 Aug 2021 22:42:10 +0800 Subject: [PATCH 16/21] Update config.yaml --- config.yaml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/config.yaml b/config.yaml index 49bea3fef..f0a5d87cb 100644 --- a/config.yaml +++ b/config.yaml @@ -23,18 +23,6 @@ monitors: expectStatus: 200 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false - - id: point-cotpear-com - name: Cotpear 總網絡系統 - https://cotpear.com - description: 'Cotpear 總網絡系統（未實質應用）' - url: 'https://cotpear.com' - method: GET - expectStatus: 302 - - id: status-cotpear-com - name: Cotpear 狀態 - https://status.cotpear.com - description: 'Cotpear 狀態' - url: 'https://status.cotpear.com' - method: GET - expectStatus: 200 - id: yi_chi-cotpear-com name: Yi Chi Profile - https://yi-chi.cotpear.com description: '關於我 - 齊一個人頁面' From e85c03183e53e314c42000571d4bf2cdde840b47 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Mon, 14 Feb 2022 20:46:57 +0800 Subject: [PATCH 17/21] Update config.yaml --- config.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/config.yaml b/config.yaml index f0a5d87cb..711d511e6 100644 --- a/config.yaml +++ b/config.yaml @@ -22,6 +22,13 @@ monitors: method: GET # default=GET expectStatus: 200 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false + - id: go-cotpear-com # unique identifier + name: go.cotpear.com + description: 'Go Cotpear' # default=empty + url: 'https://go.cotpear.com/' # URL to fetch + method: GET # default=GET + expectStatus: 301 # operational status, default=200 + followRedirect: false # should fetch follow redirects, default=false - id: yi_chi-cotpear-com name: Yi Chi Profile - https://yi-chi.cotpear.com From 749db68fe052a41c18c4d49048268657ccf41b2b Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Mon, 14 Feb 2022 20:57:08 +0800 Subject: [PATCH 18/21] Update config.yaml --- config.yaml | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/config.yaml b/config.yaml index 711d511e6..1c29230d0 100644 --- a/config.yaml +++ b/config.yaml @@ -22,17 +22,33 @@ monitors: method: GET # default=GET expectStatus: 200 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false + - id: go-cotpear-com # unique identifier - name: go.cotpear.com - description: 'Go Cotpear' # default=empty + name: 短連結服務 - go.cotpear.com + description: '短連結服務(非公用服務)' # default=empty url: 'https://go.cotpear.com/' # URL to fetch method: GET # default=GET expectStatus: 301 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false - + + - id: pwd-cotpear-com + name: 密碼管理器 - https://pwd.cotpear.com + description: 'Cotpear 密碼管理器' + url: 'https://pwd.cotpear.com' + method: GET + expectStatus: 200 + + - id: policies-cotpear-com + name: Cotpear 隱私權與政策 - https://policies.cotpear.com + description: 'Cotpear 隱私權與政策' + url: 'https://policies.cotpear.com' + method: GET + expectStatus: 200 + - id: yi_chi-cotpear-com name: Yi Chi Profile - https://yi-chi.cotpear.com description: '關於我 - 齊一個人頁面' url: 'https://yi-chi.cotpear.com' method: GET expectStatus: 200 + From 7040482f858ad8894b7710210711746d69d74518 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Mon, 14 Feb 2022 21:08:36 +0800 Subject: [PATCH 19/21] Update config.yaml --- config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 1c29230d0..4d34e6ba2 100644 --- a/config.yaml +++ b/config.yaml @@ -26,9 +26,9 @@ monitors: - id: go-cotpear-com # unique identifier name: 短連結服務 - go.cotpear.com description: '短連結服務(非公用服務)' # default=empty - url: 'https://go.cotpear.com/' # URL to fetch + url: 'https://go.cotpear.com/status' # URL to fetch method: GET # default=GET - expectStatus: 301 # operational status, default=200 + expectStatus: 404 # operational status, default=200 followRedirect: false # should fetch follow redirects, default=false - id: pwd-cotpear-com From 730af432f96deda96c04a5704c3d6f4f839f8e75 Mon Sep 17 00:00:00 2001 From: chiyi4488 Date: Mon, 14 Feb 2022 21:32:32 +0800 Subject: [PATCH 20/21] Update config.yaml --- config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 4d34e6ba2..a34ca8152 100644 --- a/config.yaml +++ b/config.yaml @@ -5,8 +5,8 @@ settings: daysInHistogram: 90 # number of days you want to display in histogram collectResponseTimes: true # collects avg response times from CRON locations - allmonitorsOperational: '所有系統運作良好' - notAllmonitorsOperational: '部分系統運作有異' + allmonitorsOperational: '所有站點運作良好' + notAllmonitorsOperational: '部分站點運作有異' monitorLabelOperational: '良好' monitorLabelNotOperational: '有狀況' monitorLabelNoData: '無資料' From 71ef627e324cd3ce40f51400110baf8fab694c65 Mon Sep 17 00:00:00 2001 From: TurboHK <59258447+TurboHK@users.noreply.github.com> Date: Tue, 4 Oct 2022 01:17:06 +0800 Subject: [PATCH 21/21] Update LICENSE --- LICENSE | 1 + 1 file changed, 1 insertion(+) diff --git a/LICENSE b/LICENSE index 306dbc509..672d21d48 100644 --- a/LICENSE +++ b/LICENSE @@ -19,3 +19,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +