From 7591d829697a96bef3483b687d8fbc22d26dbfa7 Mon Sep 17 00:00:00 2001 From: isido993 Date: Sat, 20 Apr 2019 16:17:27 +0000 Subject: [PATCH] v2.1.19e-7 --- CHANGELOG.md | 9 ++++++++- FrontEnd/package.json | 2 +- Pipeline/requirements.txt | Bin 210 -> 210 bytes README.md | 2 +- ServiceApi/package.json | 3 ++- ServiceApi/src/index.js | 3 +++ WebApi/package.json | 3 ++- WebApi/src/index.js | 3 +++ docker-compose.yml | 8 ++++++-- 9 files changed, 26 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9be5c2..0ab2be1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ Change log ========== +2.1.19 (2019-04-19) +------------------- + +### What's new: + +- API monitoring with SLAO added, set `SLAO_API_KEY` env values for `serviceapi` and `webapi` containers in your `docker-compose.yml` file + 2.1.8 (2018-05-16) ------------------- @@ -7,7 +14,7 @@ This Release is sponsored by [IFIC.co.uk](http://www.ific.co.uk/), special thank ### What's new: -- Dramatic increase of crawling speed +- Dramatic increase in crawling speed - Storage consumption is minimal, now you download files directly from crawled fs - File removal sync -> if file removed from folder it will be marked as removed in Ambar - Added ability to ignore files by folders, extensions and file names diff --git a/FrontEnd/package.json b/FrontEnd/package.json index 39d1c6e..af06e26 100644 --- a/FrontEnd/package.json +++ b/FrontEnd/package.json @@ -1,6 +1,6 @@ { "name": "ambar-frontend", - "version": "0.0.1", + "version": "2.1.19", "description": "Ambar Frontend", "main": "index.js", "engines": { diff --git a/Pipeline/requirements.txt b/Pipeline/requirements.txt index 1e30b4948e9a7e3531f68fc4479fa17c689b6490..6b46c0b8f2a97c590d44d23ec49e62e8aff23b80 100644 GIT binary patch delta 25 dcmcb_c!_aB2frPIErSt*9uOMgtpQZ11 ({ @@ -16,6 +17,8 @@ let app = express() app.server = http.createServer(app) +app.use(slao.init({ appName: 'ambar-serviceapi' })) + app.use(cors({ credentials: true, origin: true diff --git a/WebApi/package.json b/WebApi/package.json index 54c6de9..bc6d587 100644 --- a/WebApi/package.json +++ b/WebApi/package.json @@ -1,6 +1,6 @@ { "name": "ambar-webapi", - "version": "2.1.18", + "version": "2.1.19", "description": "Ambar WebAPI", "main": "dist", "scripts": { @@ -44,6 +44,7 @@ "request": "^2.76.0", "request-promise-native": "^1.0.5", "resource-router-middleware": "^0.5.1", + "slao": "^0.1.3", "streamifier": "^0.1.1" }, "devDependencies": { diff --git a/WebApi/src/index.js b/WebApi/src/index.js index 45180bd..b88c753 100644 --- a/WebApi/src/index.js +++ b/WebApi/src/index.js @@ -5,6 +5,7 @@ import cors from 'cors' import bodyParser from 'body-parser' import api from './api' import config from './config' +import slao from 'slao' import { ErrorHandlerService, EsProxy, StorageService } from './services' const createLogRecord = (type, message) => ({ @@ -17,6 +18,8 @@ let app = express() app.server = http.createServer(app) +app.use(slao.init({ appName: 'ambar-webapi' })) + app.use(cors({ credentials: true, origin: true diff --git a/docker-compose.yml b/docker-compose.yml index f136c96..2bc9ca5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -76,7 +76,9 @@ services: - redisHost=redis - redisPort=6379 - rabbitHost=amqp://rabbit - - langAnalyzer=${langAnalyzer} + - langAnalyzer=${langAnalyzer} + - SLAO_HOSTNAME=ambar + - SLAO_API_KEY= webapi: depends_on: serviceapi: @@ -96,7 +98,9 @@ services: - redisHost=redis - redisPort=6379 - serviceApiUrl=http://serviceapi:8081 - - rabbitHost=amqp://rabbit + - rabbitHost=amqp://rabbit + - SLAO_HOSTNAME=ambar + - SLAO_API_KEY= frontend: depends_on: webapi: