");
scope.height = '200px';
scope.panel = {
@@ -43,8 +44,8 @@ describe('grafanaGraph', function() {
scope.hiddenSeries = {};
scope.dashboard = { timezone: 'browser' };
scope.range = {
- from: new Date('2014-08-09 10:00:00'),
- to: new Date('2014-09-09 13:00:00')
+ from: moment([2015, 1, 1, 10]),
+ to: moment([2015, 1, 1, 22])
};
ctx.data = [];
ctx.data.push(new TimeSeries({
@@ -227,4 +228,31 @@ describe('grafanaGraph', function() {
expect(axis.tickFormatter(100, axis)).to.be("100%");
});
});
+
+ graphScenario('when panel too narrow to show x-axis dates in same granularity as wide panels', function(ctx) {
+ describe('and the range is less than 24 hours', function() {
+ ctx.setup(function(scope) {
+ scope.range.from = moment([2015, 1, 1, 10]);
+ scope.range.to = moment([2015, 1, 1, 22]);
+ });
+
+ it('should format dates as hours minutes', function() {
+ var axis = ctx.plotOptions.xaxis;
+ expect(axis.timeformat).to.be('%H:%M');
+ });
+ });
+
+ describe('and the range is less than one year', function() {
+ ctx.setup(function(scope) {
+ scope.range.from = moment([2015, 1, 1]);
+ scope.range.to = moment([2015, 11, 20]);
+ });
+
+ it('should format dates as month days', function() {
+ var axis = ctx.plotOptions.xaxis;
+ expect(axis.timeformat).to.be('%m/%d');
+ });
+ });
+
+ }, 10);
});
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index 0a171207bcf..f4e0063a912 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -7,6 +7,7 @@ import {SingleStatCtrl} from './controller';
angular.module('grafana.directives').directive('singleStatPanel', singleStatPanel);
+/** @ngInject */
function singleStatPanel($location, linkSrv, $timeout, templateSrv) {
'use strict';
return {
@@ -221,7 +222,7 @@ function singleStatPanel($location, linkSrv, $timeout, templateSrv) {
function getColorForValue(data, value) {
for (var i = data.thresholds.length; i > 0; i--) {
- if (value >= data.thresholds[i]) {
+ if (value >= data.thresholds[i-1]) {
return data.colorMap[i];
}
}
diff --git a/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.ts b/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.ts
index 17b34f6bcef..0ea34c54721 100644
--- a/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.ts
+++ b/public/app/plugins/panel/singlestat/specs/singlestat_panel_spec.ts
@@ -7,7 +7,7 @@ describe('grafanaSingleStat', function() {
describe('positive thresholds', () => {
var data: any = {
colorMap: ['green', 'yellow', 'red'],
- thresholds: [0, 20, 50]
+ thresholds: [20, 50]
};
it('5 should return green', () => {
@@ -29,7 +29,7 @@ describe('grafanaSingleStat', function() {
describe('negative thresholds', () => {
var data: any = {
colorMap: ['green', 'yellow', 'red'],
- thresholds: [ -20, 0, 20]
+ thresholds: [ 0, 20]
};
it('-30 should return green', () => {
@@ -48,7 +48,7 @@ describe('grafanaSingleStat', function() {
describe('negative thresholds', () => {
var data: any = {
colorMap: ['green', 'yellow', 'red'],
- thresholds: [ -40, -27, 20]
+ thresholds: [-27, 20]
};
it('-30 should return green', () => {
diff --git a/trigger_grafana_packer.sh b/trigger_grafana_packer.sh
new file mode 100755
index 00000000000..e4a33a00221
--- /dev/null
+++ b/trigger_grafana_packer.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+_circle_token=$1
+
+trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-packer/tree/master?circle-token=${_circle_token}
+
+curl \
+--header "Accept: application/json" \
+--header "Content-Type: application/json" \
+--request POST ${trigger_build_url}
\ No newline at end of file