github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

Merge branch 'master' into home-branding

Browse Source
This commit is contained in:
Nawaz Dhandala
2020-01-14 15:44:12 +01:00
parent eacfc930e0 dba2898af7
commit 36a87bffc4
24 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
CHANGELOG Normal file
View File

0
CONTRIBUTING.md Normal file
View File

2
accounts/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-accounts",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
accounts/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-accounts",
"version": "3.0.1246",
"version": "3.0.1255",
"private": true,
"homepage": "/",
"dependencies": {

2
admin-dashboard/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-admin-dashboard",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
admin-dashboard/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-admin-dashboard",
"version": "3.0.1246",
"version": "3.0.1255",
"private": true,
"dependencies": {
"@trendmicro/react-dropdown": "^1.3.0",

2
api-docs/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-api-docs",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
api-docs/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-api-docs",
"version": "3.0.1246",
"version": "3.0.1255",
"description": "fyipe api refernce",
"main": "Gruntfile.js",
"repository": {

2
backend/backend/services/probeService.js
View File

@@ -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);

2
backend/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-backend",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
backend/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-backend",
"version": "3.0.1246",
"version": "3.0.1255",
"private": true,
"dependencies": {
"@slack/client": "^4.12.0",

2
dashboard/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-dashboard",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
dashboard/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-dashboard",
"version": "3.0.1246",
"version": "3.0.1255",
"private": true,
"dependencies": {
"@beam-australia/react-env": "^2.1.2",

2
home/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-homepage",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
home/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-homepage",
"version": "3.0.1246",
"version": "3.0.1255",
"scripts": {
"start": "node server.js",
"dev": "nodemon server.js",

2
probe/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "probe",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
probe/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "probe",
"version": "3.0.1246",
"version": "3.0.1255",
"description": "",
"main": "index.js",
"scripts": {

2
probe/utils/apiService.js
View File

@@ -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);

2
server-monitor/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-server-monitor",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
server-monitor/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fyipe-server-monitor",
"version": "3.0.1246",
"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"

2
slack/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "slack",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
slack/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "slack",
"version": "3.0.1246",
"version": "3.0.1255",
"description": "Slack invite page for Slack",
"main": "server.js",
"scripts": {

2
status-page/package-lock.json generated
View File

@@ -1,6 +1,6 @@
{
"name": "status-page",
"version": "3.0.1246",
"version": "3.0.1255",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
status-page/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "status-page",
"version": "3.0.1246",
"version": "3.0.1255",
"private": true,
"dependencies": {
"axios": "^0.19.0",