diff --git a/infra/k8s/default/bt-github-notify.yaml b/infra/k8s/default/bt-github-notify.yaml index 87f09cbcf..4b1b172ed 100644 --- a/infra/k8s/default/bt-github-notify.yaml +++ b/infra/k8s/default/bt-github-notify.yaml @@ -46,6 +46,6 @@ spec: envFrom: - secretRef: name: general-secrets - image: gcr.io/berkeleytime-218606/github-notify:latest + image: berkeleytime.com:5000/berkeleytime/bt-github-notify imagePullPolicy: Always name: bt-github-notify diff --git a/infra/k8s/default/bt-gitlab-notify.yaml b/infra/k8s/default/bt-gitlab-notify.yaml index 7c50431d8..0b5a416a2 100644 --- a/infra/k8s/default/bt-gitlab-notify.yaml +++ b/infra/k8s/default/bt-gitlab-notify.yaml @@ -44,6 +44,6 @@ spec: name: general-secrets - secretRef: name: slack-webhooks - image: gcr.io/berkeleytime-218606/gitlab-notify:latest + image: berkeleytime.com:5000/berkeleytime/bt-gitlab-notify imagePullPolicy: Always name: bt-gitlab-notify diff --git a/statuspage/config.js b/statuspage/config.js index 9b22bb72b..690e2a346 100644 --- a/statuspage/config.js +++ b/statuspage/config.js @@ -3,4 +3,4 @@ export const PORT_EXPRESS_HTTPS = 443; export const STATUS_DEGRADED_PERFORMANCE = "degraded_performance"; export const STATUS_OPERATIONAL = "operational"; export const STATUS_MAJOR_OUTAGE = "major_outage"; -export const URL_BERKELEYTIME = "http://berkeleytime.com"; +export const URL_BERKELEYTIME = "https://berkeleytime.com"; diff --git a/statuspage/config.statuspage.template.json b/statuspage/config.statuspage.template.json index 5c4abd03d..7da376fd3 100644 --- a/statuspage/config.statuspage.template.json +++ b/statuspage/config.statuspage.template.json @@ -1,16 +1,15 @@ { - "url": "https://berkeleytime.com", - "apiKey": "api key", - "pageId": "page id", - "statusInterval": 120, - - "apiStatus": { - "metricId": "api metric id", - "componentId": "api component id" - }, - - "frontendStatus": { - "metricId": "frontend metric id", - "componentId": "frontend component id" - } + "apiKey": "32465954-9baf-4532-....", + "pageId": "0xf....", + "apiStatus": { + "metricId": "6kt04d...", + "componentId": "8gz..." + }, + "frontendStatus": { + "metricId": "sdysw0....", + "componentId": "4yzhg..." + }, + "gitlabStatus": { + "componentId": "z4m6slg..." + } } diff --git a/statuspage/index.js b/statuspage/index.js index 4882946bb..dc567359b 100644 --- a/statuspage/index.js +++ b/statuspage/index.js @@ -104,13 +104,8 @@ const updateStatuspage = async (ping, auth) => { }; for await (const _ of setInterval(spConfig.statusInterval * 1000)) { - const { - apiStatus, - frontendStatus, - gitlabStatus, - elasticsearchStatus, - url, - } = spConfig; + const { apiStatus, frontendStatus, gitlabStatus, elasticsearchStatus, url } = + spConfig; const niceTime = () => moment().tz("America/Los_Angeles").format(`YYYY-MM-DD HH:mm:ss dddd`); await updateStatuspage(async () => { diff --git a/statuspage/package.json b/statuspage/package.json index 66405894f..3e9051c33 100644 --- a/statuspage/package.json +++ b/statuspage/package.json @@ -20,7 +20,7 @@ "moment-timezone": "^0.5.33" }, "devDependencies": { - "nodemon": "^2.0.7", + "nodemon": "^2.0.15", "prettier-plugin-jsdoc": "^0.3.18" } }