IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Worked on relative time and timeshift overrides for singlestat, still an issue for how to visualize the time override

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-03-01 11:48:09 +01:00
parent 2c3d3d0fe3
commit 57b5b4c376
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/features/panel/panelSrv.js
View File

@ -8,7 +8,7 @@ function (angular, _, config) {
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
module.service('panelSrv', function($rootScope, $timeout, datasourceSrv) { module.service('panelSrv', function($rootScope, $timeout, datasourceSrv, $q) {
this.init = function($scope) { this.init = function($scope) {
if (!$scope.panel.span) { $scope.panel.span = 12; } if (!$scope.panel.span) { $scope.panel.span = 12; }
@ -88,21 +88,27 @@ function (angular, _, config) {
return $scope.dashboardViewState.fullscreen && !$scope.fullscreen; return $scope.dashboardViewState.fullscreen && !$scope.fullscreen;
}; };
$scope.getCurrentDatasource = function() {
if ($scope.datasource) {
return $q.when($scope.datasource);
}
return datasourceSrv.get($scope.panel.datasource);
};
$scope.get_data = function() { $scope.get_data = function() {
if ($scope.otherPanelInFullscreenMode()) { return; } if ($scope.otherPanelInFullscreenMode()) { return; }
delete $scope.panelMeta.error; delete $scope.panelMeta.error;
$scope.panelMeta.loading = true; $scope.panelMeta.loading = true;
if ($scope.datasource) { $scope.getCurrentDatasource().then(function(datasource) {
return $scope.refreshData($scope.datasource);
}
datasourceSrv.get($scope.panel.datasource).then(function(datasource) {
$scope.datasource = datasource; $scope.datasource = datasource;
return $scope.refreshData($scope.datasource).then(function() { return $scope.refreshData($scope.datasource).then(function() {
$scope.panelMeta.loading = false; $scope.panelMeta.loading = false;
}); });
}, function(err) { }, function(err) {
console.log('Panel data error:', err); console.log('Panel data error:', err);
$scope.panelMeta.loading = false; $scope.panelMeta.loading = false;

4
src/app/panels/singlestat/editor.html
View File

@ -37,7 +37,7 @@
Prefix Prefix
</li> </li>
<li> <li>
<select class="input-small tight-form-input" style="width: 99px;" ng-model="panel.prefixFontSize" ng-options="f for f in fontSizes" ng-change="render()"></select> <select class="input-small tight-form-input" ng-model="panel.prefixFontSize" ng-options="f for f in fontSizes" ng-change="render()"></select>
</li> </li>
<li class="tight-form-item"> <li class="tight-form-item">
Value Value
@ -49,7 +49,7 @@
Postfix Postfix
</li> </li>
<li> <li>
<select class="input-small tight-form-input last" style="width: 99px" ng-model="panel.postfixFontSize" ng-options="f for f in fontSizes" ng-change="render()"></select> <select class="input-small tight-form-input last" ng-model="panel.postfixFontSize" ng-options="f for f in fontSizes" ng-change="render()"></select>
</li> </li>
</ul> </ul>
<div class="clearfix"></div> <div class="clearfix"></div>

2
src/app/panels/singlestat/module.html
View File

@ -1,4 +1,4 @@
<grafana-panel> <grafana-panel>
<div class="singlestat-panel" singlestat-panel></div> <div class="singlestat-panel" singlestat-panel></div>
<div class="clearfix"></div> <div class="clearfix"></div>
</grafana-panel> </grafana-panel>

1
src/app/panels/singlestat/module.js
View File

@ -88,7 +88,6 @@ function (angular, app, _, TimeSeries, kbn, PanelMeta) {
}; };
$scope.dataHandler = function(results) { $scope.dataHandler = function(results) {
$scope.panelMeta.loading = false;
$scope.series = _.map(results.data, $scope.seriesHandler); $scope.series = _.map(results.data, $scope.seriesHandler);
$scope.render(); $scope.render();
}; };