IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-10 08:03:58 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(elasticsearch): small refactoring and polish

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-09-07 09:36:56 +02:00
parent 6c304924f7
commit efc3def7f2
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
public/app/directives/metric.segment.js
View File

@ -173,11 +173,12 @@ function (angular, app, _, $) {
$scope.valueToSegment = function(value) {
var option = _.findWhere($scope.options, {value: value});
if (option) {
return uiSegmentSrv.newSegment({value: option.text, cssClass: attrs.cssClass, custom: attrs.custom});
} else {
return uiSegmentSrv.newSegment({value: value, cssClass: attrs.cssClass, custom: attrs.custom});
}
var segment = {
cssClass: attrs.cssClass,
custom: attrs.custom,
value: option ? option.text : value,
};
return uiSegmentSrv.newSegment(segment);
};
$scope.getOptionsInternal = function() {

2
public/app/plugins/datasource/elasticsearch/bucketAgg.js
View File

@ -54,7 +54,7 @@ function (angular, _, queryDef) {
$scope.settingsLinkText += ' (' + $scope.agg.order + ')';
}
} else if ($scope.agg.type === 'date_histogram') {
delete $scope.agg.field;
$scope.agg.field = $scope.target.timeField;
}
return true;

6
public/app/plugins/datasource/elasticsearch/partials/bucketAgg.html
View File

@ -7,10 +7,10 @@
<li>
<metric-segment-model property="agg.type" options="bucketAggTypes" on-change="onChangeInternal()" custom="false" css-class="tight-form-item-large"></metric-segment-model>
</li>
<li ng-if="agg.field">
<li>
<metric-segment-model property="agg.field" get-options="getFields()" on-change="onChangeInternal()" css-class="tight-form-item-xxlarge"></metric-segment>
</li>
<li class="tight-form-item tight-form-align" ng-if="settingsLinkText">
<li class="tight-form-item last" ng-if="settingsLinkText">
<a ng-click="toggleOptions()">{{settingsLinkText}}</a>
</li>
</ul>
@ -27,7 +27,7 @@
</div>
<div class="tight-form" ng-if="showOptions">
<div style="margin: 20px 0 20px 148px;display: inline-block">
<div style="tight-form-inner-box" ng-if="agg.type === 'terms'">
<div class="tight-form">
<ul class="tight-form-list">
<li class="tight-form-item" style="width: 60px">

2
public/app/plugins/datasource/elasticsearch/partials/metricAgg.html
View File

@ -9,7 +9,7 @@
<li ng-if="agg.type !== 'count'">
<metric-segment-model property="agg.field" get-options="getFields()" on-change="onChange()" css-class="tight-form-item-xxlarge"></metric-segment>
</li>
<li class="tight-form-item tight-form-align" ng-if="settingsLinkText">
<li class="tight-form-item last" ng-if="settingsLinkText">
<a ng-click="toggleOptions()">{{settingsLinkText}}</a>
</li>
</ul>

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

@ -15,6 +15,7 @@ function (angular, _) {
target.metrics = target.metrics || [{ type: 'count', id: '1' }];
target.bucketAggs = target.bucketAggs || [{ type: 'date_histogram', id: '2'}];
target.timeField = $scope.datasource.timeField;
};
$scope.getFields = function() {

5
public/css/less/tightform.less
View File

@ -213,3 +213,8 @@ select.tight-form-input {
.tight-form-item-large { width: 115px; }
.tight-form-item-xlarge { width: 150px; }
.tight-form-item-xxlarge { width: 200px; }
.tight-form-inner-box {
margin: 20px 0 20px 148px;
display: inline-block;
}