1.1.4 release artifacts

Author: Jesse White

dist/backshift.js

@@ -1376,7 +1376,7 @@ Backshift.Graph = Backshift.Class.create(Backshift.Class.Configurable, {
         if (results.constants && results.constants[prop]) {
           value = results.constants[prop];
         } else {
-          value = prop;
+          value = "null";
         }
         if (title) { title = title.replace(re, value); }
         if (verticalLabel) { verticalLabel = verticalLabel.replace(re, value); }
@@ -1752,7 +1752,7 @@ Backshift.DataSource.OpenNMS = Backshift.Class.create(Backshift.DataSource, {
   },
 
   _parseResponse: function (json) {
-    var k, columns, columnNames, columnNameToIndex, constants,
+    var k, columns, columnNames, columnNameToIndex, constants, parts,
         numMetrics = json.labels.length;
 
     columns = new Array(1 + numMetrics);
@@ -1774,13 +1774,14 @@ Backshift.DataSource.OpenNMS = Backshift.Class.create(Backshift.DataSource, {
       for (var c=0, len=json.constants.length, key, value, label; c < len; c++) {
         key = json.constants[c].key;
         value = json.constants[c].value;
-        for (var l=0; l < numMetrics; l++) {
-          label = json.labels[l];
-          if (key.indexOf(label+'.') === 0) {
-            // constant matches the label, extract the constant name
-            key = key.substring((label+'.').length);
-            constants[key] = (value === undefined? null: value);
-          }
+
+        // All of the constants are prefixed with the label of the associated source, but
+        // the graph definitions don't support this prefix, so we just cut the prefix
+        // off the constant name
+        parts = key.split('.');
+        if (parts.length > 1) {
+          key = parts[1];
+          constants[key] = (value === undefined? null: value);
         }
       }
     }
@@ -1789,7 +1790,7 @@ Backshift.DataSource.OpenNMS = Backshift.Class.create(Backshift.DataSource, {
       columns: columns,
       columnNames: columnNames,
       columnNameToIndex: columnNameToIndex,
-      constants: constants,
+      constants: constants
     };
   }
 });
@@ -2331,6 +2332,13 @@ Backshift.Graph.Flot = Backshift.Class.create(Backshift.Graph, {
     numSeries = this.model.series.length;
     numValues = timestamps.length;
 
+    // Rendering will silently fail if the timestamps are not ordered, throw an exception if this is detected
+    for (i = 1; i < numValues; i++) {
+      if (timestamps[i] < timestamps[i-1]) {
+        throw "Timestamps are not properly ordered! (" + timestamps[i] + " < " + timestamps[i-1] + ")";
+      }
+    }
+
     var from, to;
     if (numValues >= 2) {
       from = timestamps[0];

dist/backshift.min.js

@@ -1190,7 +1190,7 @@ Backshift.Graph = Backshift.Class.create(Backshift.Class.Configurable, {
         if (results.constants && results.constants[prop]) {
           value = results.constants[prop];
         } else {
-          value = prop;
+          value = "null";
         }
         if (title) { title = title.replace(re, value); }
         if (verticalLabel) { verticalLabel = verticalLabel.replace(re, value); }
@@ -1408,6 +1408,13 @@ Backshift.Graph.Flot = Backshift.Class.create(Backshift.Graph, {
     numSeries = this.model.series.length;
     numValues = timestamps.length;
 
+    // Rendering will silently fail if the timestamps are not ordered, throw an exception if this is detected
+    for (i = 1; i < numValues; i++) {
+      if (timestamps[i] < timestamps[i-1]) {
+        throw "Timestamps are not properly ordered! (" + timestamps[i] + " < " + timestamps[i-1] + ")";
+      }
+    }
+
     var from, to;
     if (numValues >= 2) {
       from = timestamps[0];
@@ -1853,7 +1860,7 @@ Backshift.DataSource.OpenNMS = Backshift.Class.create(Backshift.DataSource, {
   },
 
   _parseResponse: function (json) {
-    var k, columns, columnNames, columnNameToIndex, constants,
+    var k, columns, columnNames, columnNameToIndex, constants, parts,
         numMetrics = json.labels.length;
 
     columns = new Array(1 + numMetrics);
@@ -1875,13 +1882,14 @@ Backshift.DataSource.OpenNMS = Backshift.Class.create(Backshift.DataSource, {
       for (var c=0, len=json.constants.length, key, value, label; c < len; c++) {
         key = json.constants[c].key;
         value = json.constants[c].value;
-        for (var l=0; l < numMetrics; l++) {
-          label = json.labels[l];
-          if (key.indexOf(label+'.') === 0) {
-            // constant matches the label, extract the constant name
-            key = key.substring((label+'.').length);
-            constants[key] = (value === undefined? null: value);
-          }
+
+        // All of the constants are prefixed with the label of the associated source, but
+        // the graph definitions don't support this prefix, so we just cut the prefix
+        // off the constant name
+        parts = key.split('.');
+        if (parts.length > 1) {
+          key = parts[1];
+          constants[key] = (value === undefined? null: value);
         }
       }
     }
@@ -1890,7 +1898,7 @@ Backshift.DataSource.OpenNMS = Backshift.Class.create(Backshift.DataSource, {
       columns: columns,
       columnNames: columnNames,
       columnNameToIndex: columnNameToIndex,
-      constants: constants,
+      constants: constants
     };
   }
 });