Skip to content

Add fieldvalue DateHistogramFacet query and panel config for the result #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
saez0pub wants to merge 1 commit into from
Closed

Add fieldvalue DateHistogramFacet query and panel config for the result #49

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions panels/histogram/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ angular.module('kibana.histogram', [])
legend : true,
'x-axis' : true,
'y-axis' : true,
count : 'count',
}
_.defaults($scope.panel,_d)

Expand Down Expand Up @@ -80,12 +81,25 @@ angular.module('kibana.histogram', [])

// Build the facet part, injecting the query in as a facet filter
_.each(queries, function(v) {
request = request
.facet($scope.ejs.DateHistogramFacet("chart"+_.indexOf(queries,v))
.field($scope.time.field)
.interval($scope.panel.interval)
.facetFilter($scope.ejs.QueryFilter(v))
).size(0)
//Handle the old confs without the fieldvalue
if (_.isUndefined($scope.panel.query[_.indexOf(queries,v)].fieldvalue))
$scope.panel.query[_.indexOf(queries,v)].fieldvalue=''
if (_.isEmpty($scope.panel.query[_.indexOf(queries,v)].fieldvalue)) {
request = request
.facet($scope.ejs.DateHistogramFacet("chart"+_.indexOf(queries,v))
.field($scope.time.field)
.interval($scope.panel.interval)
.facetFilter($scope.ejs.QueryFilter(v))
).size(0)
} else {
request = request
.facet($scope.ejs.DateHistogramFacet("chart"+_.indexOf(queries,v))
.field($scope.time.field)
.valueField($scope.panel.query[_.indexOf(queries,v)].fieldvalue)
.interval($scope.panel.interval)
.facetFilter($scope.ejs.QueryFilter(v))
).size(0)
}
})

// Populate the inspector panel
Expand Down Expand Up @@ -127,9 +141,14 @@ angular.module('kibana.histogram', [])
// Assemble segments
var segment_data = [];
_.each(v.entries, function(v, k) {
segment_data.push([v['time'],v['count']])
hits += v['count']; // The series level hits counter
$scope.hits += v['count']; // Entire dataset level hits counter
if(_.isUndefined(v[$scope.panel.count])){
countField=v['count']
} else {
countField=v[$scope.panel.count]
}
segment_data.push([v['time'],countField])
hits += countField; // The series level hits counter
$scope.hits += countField; // Entire dataset level hits counter
});

data.splice.apply(data,[1,0].concat(segment_data)) // Join histogram data
Expand Down Expand Up @@ -319,4 +338,4 @@ angular.module('kibana.histogram', [])
});
}
};
})
})