Merge branch 'master' of github.com:grafana/grafana

CHANGELOG.md

@@ -11,6 +11,8 @@
 * **Graph**: Fixed issue with unneeded scrollbar in legend for Firefox, fixes [#4760](https://github.com/grafana/grafana/issues/4760)
 * **Graph**: Fixed issue with unneeded scrollbar in legend for Firefox, fixes [#4760](https://github.com/grafana/grafana/issues/4760)
 * **Table panel**: Fixed issue table panel formating string array properties, fixes [#4791](https://github.com/grafana/grafana/issues/4791)
 * **Table panel**: Fixed issue table panel formating string array properties, fixes [#4791](https://github.com/grafana/grafana/issues/4791)
 * **grafana-cli**: Improve error message when failing to install plugins due to corrupt response, fixes [#4651](https://github.com/grafana/grafana/issues/4651)
 * **grafana-cli**: Improve error message when failing to install plugins due to corrupt response, fixes [#4651](https://github.com/grafana/grafana/issues/4651)
+* **Singlestat**: Fixes prefix an postfix for gauges, fixes [#4812](https://github.com/grafana/grafana/issues/4812)
+* **Singlestat**: Fixes auto-refresh on change for some options, fixes [#4809](https://github.com/grafana/grafana/issues/4809)
 
 
 # 3.0.0-beta5 (2016-04-15)
 # 3.0.0-beta5 (2016-04-15)
 
 

Makefile

+all: deps build
+
+deps:
+	go run build.go setup
+	godep restore
+	npm install
+
+build:
+	go run build.go build
+	npm run build
+
+test:
+	godep go test -v ./pkg/...
+	npm test
+
+run:
+	./bin/grafana-server

README.md

@@ -103,8 +103,7 @@ npm (v2.5.0) and grunt (v0.4.5). Run the following:
 
 
 ```bash
 ```bash
 npm install
 npm install
-npm install -g grunt-cli
-grunt
+npm run build
 ```
 ```
 
 
 ### Recompile backend on source change
 ### Recompile backend on source change
@@ -145,4 +144,3 @@ please [sign the CLA](http://docs.grafana.org/project/cla/)
 
 
 Grafana is distributed under Apache 2.0 License.
 Grafana is distributed under Apache 2.0 License.
 Work in progress Grafana 2.0 (with included Grafana backend)
 Work in progress Grafana 2.0 (with included Grafana backend)
-

build.go

@@ -306,7 +306,7 @@ func ChangeWorkingDir(dir string) {
 }
 }
 
 
 func grunt(params ...string) {
 func grunt(params ...string) {
-	runPrint("./node_modules/grunt-cli/bin/grunt", params...)
+	runPrint("./node_modules/.bin/grunt", params...)
 }
 }
 
 
 func setup() {
 func setup() {

circle.yml

@@ -25,7 +25,7 @@ test:
      # Go test
      # Go test
      - godep go test -v ./pkg/...
      - godep go test -v ./pkg/...
      # js tests
      # js tests
-     - ./node_modules/grunt-cli/bin/grunt test
+     - npm test
      - npm run coveralls
      - npm run coveralls
 
 
 deployment:
 deployment:

package.json

@@ -62,6 +62,7 @@
     "npm": "2.14.x"
     "npm": "2.14.x"
   },
   },
   "scripts": {
   "scripts": {
+    "build": "grunt",
     "test": "grunt test",
     "test": "grunt test",
     "coveralls": "grunt karma:coveralls && rm -rf ./coverage"
     "coveralls": "grunt karma:coveralls && rm -rf ./coverage"
   },
   },

public/app/plugins/panel/singlestat/module.ts

@@ -278,6 +278,14 @@ class SingleStatCtrl extends MetricsPanelCtrl {
       return body;
       return body;
     }
     }
 
 
+    function getValueText() {
+      var result = panel.prefix ? panel.prefix : '';
+      result += data.valueFormated;
+      result += panel.postfix ? panel.postfix : '';
+
+      return result;
+    }
+
     function addGauge() {
     function addGauge() {
       var plotCanvas = $('<div></div>');
       var plotCanvas = $('<div></div>');
       var plotCss = {
       var plotCss = {
@@ -332,8 +340,8 @@ class SingleStatCtrl extends MetricsPanelCtrl {
             },
             },
             value: {
             value: {
               color: panel.colorValue ? getColorForValue(data, data.valueRounded) : null,
               color: panel.colorValue ? getColorForValue(data, data.valueRounded) : null,
-              formatter: function () { return data.valueFormated; },
-              font: { size: getGaugeFontSize() }
+              formatter: function() { return getValueText(); },
+              font: { size: getGaugeFontSize(), family: 'Helvetica Neue", Helvetica, Arial, sans-serif' }
             },
             },
             show: true
             show: true
           }
           }
@@ -352,7 +360,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
     function getGaugeFontSize() {
     function getGaugeFontSize() {
       if (panel.valueFontSize) {
       if (panel.valueFontSize) {
         var num = parseInt(panel.valueFontSize.substring(0, panel.valueFontSize.length - 1));
         var num = parseInt(panel.valueFontSize.substring(0, panel.valueFontSize.length - 1));
-        return 30 * (num / 100);
+        return (30 * (num / 100)) + 15;
       } else {
       } else {
         return 30;
         return 30;
       }
       }
@@ -419,6 +427,7 @@ class SingleStatCtrl extends MetricsPanelCtrl {
 
 
     function render() {
     function render() {
       if (!ctrl.data) { return; }
       if (!ctrl.data) { return; }
+      ctrl.setValues(ctrl.data);
       data = ctrl.data;
       data = ctrl.data;
       setElementHeight();
       setElementHeight();
 
 

public/sass/components/_panel_singlestat.scss

@@ -48,4 +48,8 @@
   }
   }
 }
 }
 
 
+#flotGagueValue0 {
+  font-weight: bold; //please dont hurt me for this!
+}
+