#21 Enhance metric informations

Author: MikeBild

bin/dropstack-logs

@@ -28,7 +28,7 @@ function log({name, follow}) {
     es.onopen = () => {
       process.stdout.cursorTo(0);
       process.stdout.clearLine();
-      process.stdout.write(`${chalk.green('Connected!')} ${chalk.gray('Receiving data ...')}`);
+      process.stdout.write(`${chalk.green('Connected!')} ${chalk.gray('Receiving data ...')}\n`);
     };
 
     es.onerror = () => {

bin/dropstack-metric

@@ -8,15 +8,19 @@ const EventSource = require('eventsource');
 const configuration = require('../lib/settings')();
 
 program
-  .arguments('<name>')
-  .option('-l, --live', 'Output as Live-Stream.')
-  .action(name => metrics(Object.assign({name: name}, program)))
+  .arguments('[name]')
+  .option('-f, --nofollow', 'Do not follow stream')
+  .option('-a, --all', 'Show online and offline deployments.')
+  .action(name => metricsLive({
+    name: name,
+    all: program.all,
+    nofollow: program.nofollow,
+  }))
   .parse(process.argv);
 
-if(!program.args.length) metrics(program.opts());
+if(!program.args.length) metricsLive(program.opts());
 
-function metrics({name, live}){
-  if(live) return metricsLive(name)
+function metrics({name, all}){
   configuration
   .load()
   .then(settings => { console.log(`Metrics for ${chalk.green.underline(settings.username)}`); return settings;})
@@ -26,12 +30,13 @@ function metrics({name, live}){
     .then(response => response.json()))
   .then(data => Boolean(data.message) ? Promise.reject(new Error(data.message)) : data)
   .then(data => {
-    console.log(chalk.green(`Summary  - ${pad(16, `Requests: ${methodCounts(data.methods)}`, ' ')} ${pad(20, `Incoming: ${(data.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(data.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}\n`));
+    console.log(chalk.green(`Summary - ${pad(16, `Requests: ${methodCounts(data.methods)}`, ' ')} ${pad(20, `Incoming: ${(data.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(data.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}\n`));
 
     Object.keys(data.services)
     .map(x => data.services[x])
     .filter(x => name ? x.name === name : true)
-    .forEach(x => console.log(chalk.gray(`${chalk.green(x.name)} - ${pad(16, `Requests: ${methodCounts(x.methods)}`, ' ')} ${pad(20, `Incoming: ${(x.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(x.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}`)));
+    .filter(x => !all ? x.active : true)
+    .forEach(x => console.log(chalk.gray(`${x.active ? chalk.green('online ') : chalk.red('offline')} - ${x.active ? chalk.green(x.name) : chalk.gray(x.name)} - ${pad(16, `Requests: ${methodCounts(x.methods)}`, ' ')} ${pad(20, `Incoming: ${(x.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(x.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}`)));
   })
   .catch(err => {
     process.stderr.write('\x1B[?25h'); //show terminal cursor
@@ -56,7 +61,9 @@ function metrics({name, live}){
   });
 }
 
-function metricsLive(name){
+function metricsLive({name, all, nofollow}){
+  if(nofollow) return metrics({name, all});
+
   configuration
   .load()
   .then(settings => { console.log(`Live metrics for ${chalk.green.underline(settings.username)}`); return settings;})
@@ -81,14 +88,17 @@ function metricsLive(name){
 
       process.stdout.cursorTo(0);
       process.stdout.clearLine();
-      console.log(chalk.green(`Summary  - ${pad(16, `Requests: ${methodCounts(data.methods)}`, ' ')} ${pad(20, `Incoming: ${(data.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(data.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}\n`));
+      console.log(chalk.green(`Summary - ${pad(16, `Requests: ${methodCounts(data.methods)}`, ' ')} ${pad(20, `Incoming: ${(data.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(data.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}\n`));
+
+      const services = Object.keys(data.services).map(x => data.services[x])
+        .filter(x => name ? x.name === name : true)
+        .filter(x => !all ? x.active : true);
 
-      const services = Object.keys(data.services).map(x => data.services[x]).filter(x => name ? x.name === name : true);
       services
       .forEach(x => {
         process.stdout.cursorTo(0);
         process.stdout.clearLine();
-        console.log(chalk.gray(`${chalk.green(x.name)} - ${pad(16, `Requests: ${methodCounts(x.methods)}`, ' ')} ${pad(20, `Incoming: ${(x.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(x.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}`));
+        console.log(chalk.gray(`${x.active ? chalk.green('online ') : chalk.red('offline')} - ${x.active ? chalk.green(x.name) : chalk.gray(x.name)} - ${pad(16, `Requests: ${methodCounts(x.methods)}`, ' ')} ${pad(20, `Incoming: ${(x.inBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')} ${pad(20, `Outgoing: ${(x.outBytes / (1024 * 1024)).toFixed(2) || 0} MB`, ' ')}`));
       });
       process.stdout.moveCursor(0, (services.length+2) * -1);
     };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dropstack-cli",
-  "version": "2.4.3",
+  "version": "2.4.6",
   "description": "A CLI to simplify continuous deployments into hybrid clouds.",
   "author": "Mike Bild <mike@codecommission.com>",
   "homepage": "https://github.com/codecommission/dropstack-cli#readme",