Merge branch 'master' of

https://github.com/jdbranham/grafana-diagram.git

Conflicts:
	dist/diagramControl.js.map

Author: jdbranham

dist/diagramControl.js

@@ -6,6 +6,7 @@
   "scripts": {
     "lint": "eslint --color .",
     "test": "grunt",
+    "preinstall": "npm install -g bower",
     "postinstall": "bower install",
     "build": "grunt"
   },
@@ -50,6 +51,6 @@
     "sass": "^1.0.0-beta.3"
   },
   "dependencies": {
-    "lodash": "~4.0.0"
+    "lodash": "^4.17.11"
   }
 }

dist/diagramControl.js.map

@@ -37,6 +37,7 @@ const panelDefaults = {
   mappingType: 1,
   maxWidth: false,
   nullPointMode: 'connected',
+  moddedSeriesVal: 0,
   format: 'none',
   valueName: 'avg',
   valueOptions: ['avg', 'min', 'max', 'total', 'current'],
@@ -451,6 +452,9 @@ class DiagramCtrl extends MetricsPanelCtrl {
       for (var j = 0; j < aComposite.metrics.length; j++) {
         var aMetric = aComposite.metrics[j];
         var seriesName = aMetric.seriesName;
+        // For testing
+        console.debug("aMetric value: " + seriesItem.valueFormatted);
+        console.debug("aMetric: " + seriesName);
         // make sure we have a match
         if (!data.hasOwnProperty(seriesName)) continue;
         var seriesItem = data[seriesName];
@@ -671,11 +675,11 @@ class DiagramCtrl extends MetricsPanelCtrl {
 
       for (var key in data) {
         var seriesItem = data[key];
-
+        
         // Find nodes by ID if we can
         //console.info('finding targetElement');
         var targetElement = d3.select(svg[0].getElementById(key)); // $(svg).find('#'+key).first(); // jquery doesnt work for some ID expressions [prometheus data]
-
+        console.debug("Series item: " + seriesItem.valueFormated);
         if (targetElement[0][0] !== null) { // probably a flowchart
           targetElement.selectAll('rect,circle,polygon').style('fill', seriesItem.color);
 
@@ -750,7 +754,9 @@ function getColorForValue(data, value) {
   console.debug(value);
   for (var i = data.thresholds.length; i > 0; i--) {
     if (value >= data.thresholds[i - 1]) {
-      return data.colorMap[i];
+      console.debug('Color['+(i-1)+']: ' + data.colorMap[i]);
+      return data.colorMap[i-1];
+      //return data.colorMap[i];
     }
   }
   return _.first(data.colorMap);