Enhance metric informations

Author: MikeBild

bin/dropstack-deploy

@@ -237,7 +237,7 @@ function deployment(settings, verbose, token, url) {
         return resolve(settings);
       }
 
-      const progressMessage = progressState.buildImageProgress || progressState.deployProgress || progressState.pushImageProgress || '';
+      const progressMessage = progressState.buildImageProgress || progressState.deployProgress || progressState.pushImageProgress || 'Processing';
       if(progressState && progressState.serviceName && verbose) {
         console.log(chalk.gray(`${progressState.serviceName} ${progressMessage} ${(progressState.log || '').replace('\n', '')}`))
       } else {

bin/dropstack-logs

@@ -8,7 +8,7 @@ const configuration = require('../lib/settings')();
 
 program
   .arguments('[name]')
-  .option('-f, --nofollow', 'Do not follow stream')
+  .option('-f, --nofollow', 'Disable live updates.')
   .action(name => log({
     name: name,
     follow: !Boolean(program.nofollow),

bin/dropstack-metric

@@ -9,8 +9,8 @@ const configuration = require('../lib/settings')();
 
 program
   .arguments('[name]')
-  .option('-f, --nofollow', 'Do not follow stream')
-  .option('-a, --all', 'Show online and offline deployments.')
+  .option('-f, --nofollow', 'Disable live updates.')
+  .option('-a, --all', 'Show all deployments.')
   .action(name => metricsLive({
     name: name,
     all: program.all,
@@ -30,13 +30,13 @@ function metrics({name, all}){
     .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)
-    .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`, ' ')}`)));
+    .filter(x => !all & !name ? x.active : true)
+    .forEach(x => console.log(chalk.gray(`${x.active ? chalk.green('active  ') : chalk.red('inactive')} - ${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
@@ -88,19 +88,20 @@ function metricsLive({name, all, nofollow}){
 
       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);
+        .filter(x => !all & !name ? x.active : true);
 
       services
       .forEach(x => {
         process.stdout.cursorTo(0);
         process.stdout.clearLine();
-        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`, ' ')}`));
+        console.log(chalk.gray(`${x.active ? chalk.green('active  ') : chalk.red('inactive')} - ${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);
+
+      process.stdout.moveCursor(0, (services.length + 2) * -1);
     };
 
     es.onerror = () => {

bin/dropstack-remove

@@ -106,6 +106,11 @@ function remove({name, force}){
       process.exit(1);
     }
 
+    if(err.message === `error: ${name} missing`) {
+      console.error(chalk.red(`\nService not found. Already removed or wrong account? Use ${chalk.bold('dropstack login <url>')} to verifiy your credentials.`));
+      process.exit(1);
+    }
+
     console.error(chalk.red(`\nAn unexpected error occurred!\nError: ${chalk.gray(err.message)}`));
     process.exit(1);
   })

package.json

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