From d6a90760494dd0967dcc1d5882a58618bc879a17 Mon Sep 17 00:00:00 2001 From: Ibukun Dairo Date: Mon, 13 Jan 2020 11:47:32 +0100 Subject: [PATCH 1/5] Fix probe error --- backend/backend/services/probeService.js | 2 +- probe/utils/apiService.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/backend/services/probeService.js b/backend/backend/services/probeService.js index e3d81b71a8..2ebae224ca 100755 --- a/backend/backend/services/probeService.js +++ b/backend/backend/services/probeService.js @@ -452,7 +452,7 @@ module.exports = { getTime: async function (data) { try { var date = new Date(); - var log = await MonitorLogModel.findOne({ monitorId: data.monitorId, probeId: data.probeId, createdAt: { $lt: date } }); + var log = await MonitorLogModel.findOne({ monitorId: data.monitorId, probeId: data.probeId, createdAt: { $lt: data.date || date } }); return log; } catch (error) { ErrorService.log('probeService.getTime', error); diff --git a/probe/utils/apiService.js b/probe/utils/apiService.js index 71c402bfae..240e61e06c 100755 --- a/probe/utils/apiService.js +++ b/probe/utils/apiService.js @@ -32,7 +32,7 @@ module.exports = { return await postApi(`probe/setTime/${monitorId}`, { responseTime, responseStatus, status }); }, getMonitorTime: async function (monitorId, date) { - return await postApi(`probe/getTime/${monitorId}`, date); + return await postApi(`probe/getTime/${monitorId}`, { date }); }, ping: async function (monitorId, data) { return await postApi(`probe/ping/${monitorId}`, data); From 89e0de5fcf95442565cbff0eb8ab97eb9f8a343f Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Mon, 13 Jan 2020 20:59:16 +0000 Subject: [PATCH 2/5] Add CHANGELOG --- CHANGELOG | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 CHANGELOG diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 0000000000..e69de29bb2 From 800c30dcaa4a8c2e30552b29a2bee430dc194f2b Mon Sep 17 00:00:00 2001 From: Nawaz Dhandala Date: Mon, 13 Jan 2020 20:59:29 +0000 Subject: [PATCH 3/5] Add CONTRIBUTING --- CONTRIBUTING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000000..e69de29bb2 From 4453b01208c2da5d7db31775e8443be082c3fdf0 Mon Sep 17 00:00:00 2001 From: GitLab Runner Date: Mon, 13 Jan 2020 23:10:23 +0000 Subject: [PATCH 4/5] Version Update 3.0.1250 [skip ci] --- accounts/package-lock.json | 2 +- accounts/package.json | 2 +- admin-dashboard/package-lock.json | 2 +- admin-dashboard/package.json | 2 +- api-docs/package-lock.json | 2 +- api-docs/package.json | 2 +- backend/package-lock.json | 2 +- backend/package.json | 2 +- dashboard/package-lock.json | 2 +- dashboard/package.json | 2 +- home/package-lock.json | 2 +- home/package.json | 2 +- probe/package-lock.json | 2 +- probe/package.json | 2 +- server-monitor/package-lock.json | 2 +- server-monitor/package.json | 2 +- slack/package-lock.json | 2 +- slack/package.json | 2 +- status-page/package-lock.json | 2 +- status-page/package.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/accounts/package-lock.json b/accounts/package-lock.json index 000aa8e75b..e2d3e247b1 100644 --- a/accounts/package-lock.json +++ b/accounts/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-accounts", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/accounts/package.json b/accounts/package.json index 9f0c699ed2..ccfe5eb36b 100755 --- a/accounts/package.json +++ b/accounts/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-accounts", - "version": "3.0.1246", + "version": "3.0.1250", "private": true, "homepage": "/", "dependencies": { diff --git a/admin-dashboard/package-lock.json b/admin-dashboard/package-lock.json index e324530674..d2dd7c3310 100644 --- a/admin-dashboard/package-lock.json +++ b/admin-dashboard/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-admin-dashboard", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/admin-dashboard/package.json b/admin-dashboard/package.json index f26a488b5a..5e10ff14b2 100644 --- a/admin-dashboard/package.json +++ b/admin-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-admin-dashboard", - "version": "3.0.1246", + "version": "3.0.1250", "private": true, "dependencies": { "@trendmicro/react-dropdown": "^1.3.0", diff --git a/api-docs/package-lock.json b/api-docs/package-lock.json index 4473d442df..30c36152a7 100755 --- a/api-docs/package-lock.json +++ b/api-docs/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-api-docs", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/api-docs/package.json b/api-docs/package.json index e5d1f090d7..ad92e32ed6 100755 --- a/api-docs/package.json +++ b/api-docs/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-api-docs", - "version": "3.0.1246", + "version": "3.0.1250", "description": "fyipe api refernce", "main": "Gruntfile.js", "repository": { diff --git a/backend/package-lock.json b/backend/package-lock.json index 79a9efe9f5..8fdc7b0f17 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-backend", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/backend/package.json b/backend/package.json index 7e9c08a751..dad05efdcc 100755 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-backend", - "version": "3.0.1246", + "version": "3.0.1250", "private": true, "dependencies": { "@slack/client": "^4.12.0", diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index 6885716647..35b9b55d73 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-dashboard", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/dashboard/package.json b/dashboard/package.json index 82cb719478..1e51d3c091 100755 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-dashboard", - "version": "3.0.1246", + "version": "3.0.1250", "private": true, "dependencies": { "@beam-australia/react-env": "^2.1.2", diff --git a/home/package-lock.json b/home/package-lock.json index 3e3cf386f9..0f4a61e48a 100755 --- a/home/package-lock.json +++ b/home/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-homepage", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/home/package.json b/home/package.json index 3eb7d443a9..ebfcfc282e 100755 --- a/home/package.json +++ b/home/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-homepage", - "version": "3.0.1246", + "version": "3.0.1250", "scripts": { "start": "node server.js", "dev": "nodemon server.js", diff --git a/probe/package-lock.json b/probe/package-lock.json index 63571aa419..35801401c2 100644 --- a/probe/package-lock.json +++ b/probe/package-lock.json @@ -1,6 +1,6 @@ { "name": "probe", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/probe/package.json b/probe/package.json index 6801289124..66340fb306 100755 --- a/probe/package.json +++ b/probe/package.json @@ -1,6 +1,6 @@ { "name": "probe", - "version": "3.0.1246", + "version": "3.0.1250", "description": "", "main": "index.js", "scripts": { diff --git a/server-monitor/package-lock.json b/server-monitor/package-lock.json index 7bb6f32cca..8df9b7531e 100755 --- a/server-monitor/package-lock.json +++ b/server-monitor/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-server-monitor", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/server-monitor/package.json b/server-monitor/package.json index 48f7b8422b..d5f481c271 100755 --- a/server-monitor/package.json +++ b/server-monitor/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-server-monitor", - "version": "3.0.1246", + "version": "3.0.1250", "description": "A fyipe shell package that monitor's server resources - disk, memory and CPU percentage - used.", "bin": { "fyipe-server-monitor": "./bin/server-monitor.js" diff --git a/slack/package-lock.json b/slack/package-lock.json index 44591b9628..6b9d7b0653 100644 --- a/slack/package-lock.json +++ b/slack/package-lock.json @@ -1,6 +1,6 @@ { "name": "slack", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/slack/package.json b/slack/package.json index d4e9988f3b..57afc28ec0 100644 --- a/slack/package.json +++ b/slack/package.json @@ -1,6 +1,6 @@ { "name": "slack", - "version": "3.0.1246", + "version": "3.0.1250", "description": "Slack invite page for Slack", "main": "server.js", "scripts": { diff --git a/status-page/package-lock.json b/status-page/package-lock.json index 5ce9ae2cf2..d1758e0fc3 100644 --- a/status-page/package-lock.json +++ b/status-page/package-lock.json @@ -1,6 +1,6 @@ { "name": "status-page", - "version": "3.0.1246", + "version": "3.0.1250", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/status-page/package.json b/status-page/package.json index 499f8e83ca..41f6e25efa 100755 --- a/status-page/package.json +++ b/status-page/package.json @@ -1,6 +1,6 @@ { "name": "status-page", - "version": "3.0.1246", + "version": "3.0.1250", "private": true, "dependencies": { "axios": "^0.19.0", From dba2898af7b68d0ca9bd0b13afc8b0589d7dc0c9 Mon Sep 17 00:00:00 2001 From: GitLab Runner Date: Tue, 14 Jan 2020 14:08:14 +0000 Subject: [PATCH 5/5] Version Update 3.0.1255 [skip ci] --- accounts/package-lock.json | 2 +- accounts/package.json | 2 +- admin-dashboard/package-lock.json | 2 +- admin-dashboard/package.json | 2 +- api-docs/package-lock.json | 2 +- api-docs/package.json | 2 +- backend/package-lock.json | 2 +- backend/package.json | 2 +- dashboard/package-lock.json | 2 +- dashboard/package.json | 2 +- home/package-lock.json | 2 +- home/package.json | 2 +- probe/package-lock.json | 2 +- probe/package.json | 2 +- server-monitor/package-lock.json | 2 +- server-monitor/package.json | 2 +- slack/package-lock.json | 2 +- slack/package.json | 2 +- status-page/package-lock.json | 2 +- status-page/package.json | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/accounts/package-lock.json b/accounts/package-lock.json index e2d3e247b1..91b10a3244 100644 --- a/accounts/package-lock.json +++ b/accounts/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-accounts", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/accounts/package.json b/accounts/package.json index ccfe5eb36b..f8200caaf3 100755 --- a/accounts/package.json +++ b/accounts/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-accounts", - "version": "3.0.1250", + "version": "3.0.1255", "private": true, "homepage": "/", "dependencies": { diff --git a/admin-dashboard/package-lock.json b/admin-dashboard/package-lock.json index d2dd7c3310..6d104e6ec2 100644 --- a/admin-dashboard/package-lock.json +++ b/admin-dashboard/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-admin-dashboard", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/admin-dashboard/package.json b/admin-dashboard/package.json index 5e10ff14b2..7eee35f5a2 100644 --- a/admin-dashboard/package.json +++ b/admin-dashboard/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-admin-dashboard", - "version": "3.0.1250", + "version": "3.0.1255", "private": true, "dependencies": { "@trendmicro/react-dropdown": "^1.3.0", diff --git a/api-docs/package-lock.json b/api-docs/package-lock.json index 30c36152a7..9d750c2807 100755 --- a/api-docs/package-lock.json +++ b/api-docs/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-api-docs", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/api-docs/package.json b/api-docs/package.json index ad92e32ed6..47a9b53b10 100755 --- a/api-docs/package.json +++ b/api-docs/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-api-docs", - "version": "3.0.1250", + "version": "3.0.1255", "description": "fyipe api refernce", "main": "Gruntfile.js", "repository": { diff --git a/backend/package-lock.json b/backend/package-lock.json index 8fdc7b0f17..49510df4ce 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-backend", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/backend/package.json b/backend/package.json index dad05efdcc..38e18b5165 100755 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-backend", - "version": "3.0.1250", + "version": "3.0.1255", "private": true, "dependencies": { "@slack/client": "^4.12.0", diff --git a/dashboard/package-lock.json b/dashboard/package-lock.json index 35b9b55d73..fc36460298 100644 --- a/dashboard/package-lock.json +++ b/dashboard/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-dashboard", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/dashboard/package.json b/dashboard/package.json index 1e51d3c091..e0ff496816 100755 --- a/dashboard/package.json +++ b/dashboard/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-dashboard", - "version": "3.0.1250", + "version": "3.0.1255", "private": true, "dependencies": { "@beam-australia/react-env": "^2.1.2", diff --git a/home/package-lock.json b/home/package-lock.json index 0f4a61e48a..0bdd3e3ff6 100755 --- a/home/package-lock.json +++ b/home/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-homepage", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/home/package.json b/home/package.json index ebfcfc282e..b6fb805403 100755 --- a/home/package.json +++ b/home/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-homepage", - "version": "3.0.1250", + "version": "3.0.1255", "scripts": { "start": "node server.js", "dev": "nodemon server.js", diff --git a/probe/package-lock.json b/probe/package-lock.json index 35801401c2..d915dd74ca 100644 --- a/probe/package-lock.json +++ b/probe/package-lock.json @@ -1,6 +1,6 @@ { "name": "probe", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/probe/package.json b/probe/package.json index 66340fb306..04e917adae 100755 --- a/probe/package.json +++ b/probe/package.json @@ -1,6 +1,6 @@ { "name": "probe", - "version": "3.0.1250", + "version": "3.0.1255", "description": "", "main": "index.js", "scripts": { diff --git a/server-monitor/package-lock.json b/server-monitor/package-lock.json index 8df9b7531e..6762082fbc 100755 --- a/server-monitor/package-lock.json +++ b/server-monitor/package-lock.json @@ -1,6 +1,6 @@ { "name": "fyipe-server-monitor", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/server-monitor/package.json b/server-monitor/package.json index d5f481c271..2600ca73ae 100755 --- a/server-monitor/package.json +++ b/server-monitor/package.json @@ -1,6 +1,6 @@ { "name": "fyipe-server-monitor", - "version": "3.0.1250", + "version": "3.0.1255", "description": "A fyipe shell package that monitor's server resources - disk, memory and CPU percentage - used.", "bin": { "fyipe-server-monitor": "./bin/server-monitor.js" diff --git a/slack/package-lock.json b/slack/package-lock.json index 6b9d7b0653..c7ce906a50 100644 --- a/slack/package-lock.json +++ b/slack/package-lock.json @@ -1,6 +1,6 @@ { "name": "slack", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/slack/package.json b/slack/package.json index 57afc28ec0..9db1d97427 100644 --- a/slack/package.json +++ b/slack/package.json @@ -1,6 +1,6 @@ { "name": "slack", - "version": "3.0.1250", + "version": "3.0.1255", "description": "Slack invite page for Slack", "main": "server.js", "scripts": { diff --git a/status-page/package-lock.json b/status-page/package-lock.json index d1758e0fc3..2b7c177ead 100644 --- a/status-page/package-lock.json +++ b/status-page/package-lock.json @@ -1,6 +1,6 @@ { "name": "status-page", - "version": "3.0.1250", + "version": "3.0.1255", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/status-page/package.json b/status-page/package.json index 41f6e25efa..c2d67193c2 100755 --- a/status-page/package.json +++ b/status-page/package.json @@ -1,6 +1,6 @@ { "name": "status-page", - "version": "3.0.1250", + "version": "3.0.1255", "private": true, "dependencies": { "axios": "^0.19.0",