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 1e30b49..6b46c0b 100644 Binary files a/Pipeline/requirements.txt and b/Pipeline/requirements.txt differ diff --git a/README.md b/README.md index e936343..19a2377 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Version](https://img.shields.io/badge/Version-v2.1.18-brightgreen.svg)](https://ambar.cloud) +[![Version](https://img.shields.io/badge/Version-v2.1.19-brightgreen.svg)](https://ambar.cloud) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/RD17/ambar/blob/master/License.txt) :mag: Ambar: Document Search Engine diff --git a/ServiceApi/package.json b/ServiceApi/package.json index 8fa9be0..3f72f10 100644 --- a/ServiceApi/package.json +++ b/ServiceApi/package.json @@ -1,6 +1,6 @@ { "name": "ambar-serviceapi", - "version": "1.3.0", + "version": "2.1.19", "description": "Ambar ServiceAPI", "main": "dist", "scripts": { @@ -45,6 +45,7 @@ "redis": "^2.6.3", "request": "^2.76.0", "resource-router-middleware": "^0.5.1", + "slao": "^0.1.3", "streamifier": "^0.1.1" }, "devDependencies": { diff --git a/ServiceApi/src/index.js b/ServiceApi/src/index.js index 48414a7..c511b61 100644 --- a/ServiceApi/src/index.js +++ b/ServiceApi/src/index.js @@ -4,6 +4,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, MongoProxy, StorageService } from './services' const createLogRecord = (type, message) => ({ @@ -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: