Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tbaltrushaitis committed Feb 3, 2018
2 parents 62c76b6 + ddb8e1d commit b0e5dca
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 54 deletions.
56 changes: 39 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,37 @@
# CMDB-rtm #

Plugin for CMDB application that work with data in real time.
Plugin for CMDB application that visualize data in real time.

![Real Time Jobs Progress View](assets/img/cmdb-rtm-progress.gif)

`cmdb` `real-time` `monitoring`
`cmdb` `real-time` `monitoring` `data visualization`

---

## Dependencies ##
- [animate.css](http://daneden.github.io/animate.css/) v3.5.2 - A cross-browser library of CSS animations.
- [Bootstrap](http://getbootstrap.com) v3.3.7 - HTML, CSS, and JS framework
- [jQuery](http://jquery.com/) v2.2.4 - JavaScript Library
- [Underscore.js](http://underscorejs.org) v1.8.3 - JavaScript library that provides a whole mess of useful functional programming helpers.
## :computer: Live Demo ##
See it in action :point_right: [Real-time Tasks Progress Visualization](http://bit.ly/cmdb-rtm)

### :name_badge: Badges ###

[![Contributors](https://img.shields.io/github/contributors/tbaltrushaitis/cmdb-rtm.svg)](https://github.com/tbaltrushaitis/cmdb-rtm/graphs/contributors)

---

## Getting started ##
## :octocat: Credits ##

```
$ git clone https://bitbucket.org/devopscrew/cmdb-rtm
Scope | Role | Name | Version | Description
:-----:|:----:|:-----|:-------:|:------------
Front | Library | [animate.css](http://daneden.github.io/animate.css/) | 3.5.2 | A cross-browser library of CSS animations
Front | Framework | [Bootstrap](http://getbootstrap.com) | 3.3.7 | HTML, CSS, and JS framework
Front | Library | [jQuery](http://jquery.com/) | 3.3.1 | JavaScript Library
Front | Library | [Lodash](https://lodash.com/docs/4.17.4) | 4.17.4 | A modern JavaScript utility library delivering modularity, performance & extras.

---

## :runner: Getting started ##

```shell
$ git clone https://github.com/tbaltrushaitis/cmdb-rtm
$ cd cmdb-rtm
$ cp -pr src/* ./
$ npm i
Expand All @@ -30,21 +42,31 @@ $ npm start

---

## Todo List ##
## :pushpin: Todo List ##

- ~~Example Done Item~~ (Done v0.0.0)

---

## Change log ##
## :memo: Changelog ##

*v0.0.1:*
**v0.0.1:**

- [x] Init of repository
- [x] Makefile
- [x] package.json

*v0.0.0:*
---

* Init of repository
* Makefile
* package.json
### :link: More Info ###

- [GitHub / Basic writing and formatting syntax](https://help.github.com/articles/basic-writing-and-formatting-syntax/)
- [BitBucket Markdown Howto](https://bitbucket.org/tutorials/markdowndemo)
- [Creating an Automated Build](https://docs.docker.com/docker-hub/builds/)
- [Linking containers](https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks.md)
- [Cross-host linking containers](https://docs.docker.com/engine/admin/ambassador_pattern_linking.md)
- [Linking containers](https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks.md)

---

:scorpius:
5 changes: 3 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
]
, "keywords": [
"rtm"
, "data visualization"
, "real time hosting monitoring"
, "real time monitoring"
, "real time hosting"
Expand Down Expand Up @@ -37,11 +38,11 @@
, "bootstrap": "~3.3.7"
, "font-awesome": "~4.7.0"
, "ionicons": "~4.0.0-11"
, "jquery": "~2.2.4"
, "jquery": "~3.3.1"
, "jquery-ui": "~1.12.1"
, "jquery-tmpl": "*"
, "lodash": "^4.17.4"
, "noty": "~2.3.11"
, "noty": "~2.4.1"
, "requirejs": "~2.3.5"
, "socket.io": "~2.0.4"
, "text": "~2.0.15"
Expand Down
48 changes: 29 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,49 @@
"node": ">=6.9.1"
, "npm": ">=3.10.8"
}
, "main": "app/server.js"
, "keywords": [
"rtm"
, "data visualization"
, "real time hosting monitoring"
, "real time monitoring"
, "real time hosting"
, "real time charts"
, "real time graphs"
, "real time graphics"
, "real time visalization"
]
, "main": "app/server.js"
, "scripts": {
"start": "node app/server.js"
, "build": "gulp build"
"start": "node app/server.js"
, "build": "gulp build"
}
, "repository": {
"type": "git"
, "url": "https://bitbucket.org/devopscrew/cmdb-rtm"
, "url": "https://github.com/tbaltrushaitis/cmdb-rtm"
}
, "bugs": {
"url": "https://bitbucket.org/devopscrew/cmdb-rtm/issues"
"url": "https://github.com/tbaltrushaitis/cmdb-rtm/issues"
}
, "license": "MIT"
, "private": true
, "dependencies": {
"backbone": "^1.3.3"
, "bower": "^1.8.2"
, "compression": "^1.7.1"
, "cookie-parser": "^1.4.3"
, "express": "^4.16.2"
, "lodash": "^4.17.4"
, "nconf": "^0.10.0"
, "md5": "^2.2.1"
, "socket.io": "^2.0.4"
, "path": "^0.12.7"
, "requestify": "^0.2.5"
, "response-time": "^2.3.2"
, "uuid": "^3.1.0"
"backbone": "^1.3.3"
, "bower": "^1.8.2"
, "compression": "^1.7.1"
, "cookie-parser": "^1.4.3"
, "express": "^4.16.2"
, "lodash": "^4.17.4"
, "nconf": "^0.10.0"
, "md5": "^2.2.1"
, "socket.io": "^2.0.4"
, "path": "^0.12.7"
, "requestify": "^0.2.5"
, "response-time": "^2.3.2"
, "uuid": "^3.1.0"
}
, "dependenciesDisabled": {
"connect": "~3.4.1"
, "text": "~2.0.14"
, "underscore": "~1.8.3"
, "use-amd": "~0.4.0"
}
, "devDependencies": {
Expand Down
29 changes: 13 additions & 16 deletions src/app/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ const Job = class Job extends EE {
};



/**
* MIDDLEWARES
*/
Expand Down Expand Up @@ -141,8 +140,6 @@ ioServer.on('connection', function (client) {

});



let optsStatic = {
dotfiles: 'ignore'
, etag: true
Expand All @@ -167,18 +164,18 @@ app.post('/spawn', function (req, res) {
_.each(connections, function (connection) {

connection.send({
"id": id
"id": idq
, "progress": progress
, "speed": speed
, "conn": {
"domain": connection.domain
, "connected": connection.connected
, "handshaked": connection.handshaked
, "connections": connection.connections
, "options": connection.options
, "_heartbeats": connection._heartbeats
"domain": connection.domain
, "connected": connection.connected
, "handshaked": connection.handshaked
, "connections": connection.connections
, "options": connection.options
, "_heartbeats": connection._heartbeats
, "_maxListeners": connection._maxListeners
, "sessionId": connection.sessionId
, "sessionId": connection.sessionId
}
})
});
Expand Down Expand Up @@ -238,10 +235,10 @@ app.use(function (err, req, res, next) {

// Return json
res.send({
status: 'error',
code: err.code,
errno: err.errno,
message: err.message
status: 'error'
, code: err.code
, errno: err.errno
, message: err.message
});

});
Expand All @@ -267,7 +264,7 @@ process.on('SIGINT', function () {


/**
* EXPOSE
* EXPOSES
* @public
*/

Expand Down

0 comments on commit b0e5dca

Please sign in to comment.