From 8061bd87019217e5e89262e9e089ed885d037200 Mon Sep 17 00:00:00 2001 From: Bert Verhelst Date: Wed, 6 Oct 2021 20:03:48 +0200 Subject: [PATCH] fix(monitor): correctly get deprecated values from checks list --- server/model/monitor.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/model/monitor.js b/server/model/monitor.js index 62cc0d9..b6cf0a9 100644 --- a/server/model/monitor.js +++ b/server/model/monitor.js @@ -6,7 +6,10 @@ dayjs.extend(utc); dayjs.extend(timezone); const axios = require("axios"); const { Prometheus } = require("../prometheus"); -const { debug, UP, DOWN, PENDING, flipStatus, TimeLogger, MONITOR_CHECK_SELECTOR_TYPES } = require("../../src/util"); +const { debug, UP, DOWN, PENDING, flipStatus, TimeLogger, MONITOR_CHECK_SELECTOR_TYPES, + HTTP_STATUS_CODE_SHOULD_EQUAL, + RESPONSE_SHOULD_CONTAIN_TEXT +} = require("../../src/util"); const { tcping, ping, dnsResolve, checkCertificate, getTotalClientInRoom } = require("../util-server"); const { R } = require("redbean-node"); const { BeanModel } = require("redbean-node/dist/bean-model"); @@ -75,8 +78,8 @@ class Monitor extends BeanModel { tags: tags, // Deprecated: Use the values in the checks list instead - accepted_statuscodes: JSON.parse(this.accepted_statuscodes_json), - keyword: this.keyword, + accepted_statuscodes: ((this.checks || []).find(check => check.type === HTTP_STATUS_CODE_SHOULD_EQUAL) || {}).value, + keyword: ((this.checks || []).find(check => check.type === RESPONSE_SHOULD_CONTAIN_TEXT) || {}).value, }; }