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

Add ability to set a global time interval

Browse Source 
The interval is configurable in the data source.
This commit only adds the ability to Elasticsearch datasources
This commit is contained in:
Felix Barnsteiner
2015-10-23 09:32:02 +02:00
parent 2d23251da9
commit e4fecb48e3
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/features/panel/panelHelper.js
View File

@@ -59,7 +59,9 @@ function (angular, dateMath, rangeUtil, _, kbn, $) {
scope.resolution = Math.ceil($(window).width() * (scope.panel.span / 12));
}
scope.interval = kbn.calculateInterval(scope.range, scope.resolution, scope.panel.interval);
var panelInterval = scope.panel.interval;
var datasourceInterval = (scope.datasource || {}).interval;
scope.interval = kbn.calculateInterval(scope.range, scope.resolution, panelInterval || datasourceInterval);
};
this.applyPanelTimeOverrides = function(scope) {

1
public/app/plugins/datasource/elasticsearch/datasource.js
View File

@@ -24,6 +24,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
this.index = datasource.index;
this.timeField = datasource.jsonData.timeField;
this.indexPattern = new IndexPattern(datasource.index, datasource.jsonData.interval);
this.interval = datasource.jsonData.timeInterval;
this.queryBuilder = new ElasticQueryBuilder({
timeField: this.timeField
});

19
public/app/plugins/datasource/elasticsearch/partials/config.html
View File

@@ -1,7 +1,7 @@
<div ng-include="httpConfigPartialSrc"></div>
<br>
<h5>Elastic search details</h5>
<h5>Elasticsearch details</h5>
<div class="tight-form">
<ul class="tight-form-list">
@@ -20,7 +20,7 @@
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 144px">
Time field name
@@ -31,3 +31,18 @@
</ul>
<div class="clearfix"></div>
</div>
<div class="tight-form last">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 144px">
Group by time interval
</li>
<li>
<input type="text" class="input-medium tight-form-input input-xlarge" ng-model="current.jsonData.timeInterval"
spellcheck='false' placeholder="example: >10s">
</li>
<li class="tight-form-item">
<i class="fa fa-question-circle" bs-tooltip="'Set a low limit by having a greater sign: example: >60s'" data-placement="right"></i>
</li>
</ul>
<div class="clearfix"></div>
</div>