Skip to content

Commit

Permalink
Fixed height bug, improved documentation for time stamped indices
Browse files Browse the repository at this point in the history
  • Loading branch information
Rashid Khan committed Mar 5, 2013
1 parent b2c7f19 commit 5a0f15b
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 16 deletions.
1 change: 0 additions & 1 deletion panels/dashcontrol/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ angular.module('kibana.dashcontrol', [])
// Long ugly if statement for figuring out which dashboard to load on init
// If there is no dashboard defined, find one
if(_.isUndefined($scope.dashboards)) {
console.log('ok, defining')
// First check the URL for a path to a dashboard
if(!(_.isUndefined($routeParams.type)) && !(_.isUndefined($routeParams.id))) {
var _type = $routeParams.type;
Expand Down
4 changes: 2 additions & 2 deletions panels/histogram/module.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<kibana-panel ng-controller='histogram' ng-init="init()" style="height:{{row.height}}">
<div histogram params="{{panel}}" style="height:{{panel.height}};position:relative"></div>
<kibana-panel ng-controller='histogram' ng-init="init()" style="height:{{panel.height || row.height}}">
<div histogram params="{{panel}}" style="height:{{panel.height || row.height}};position:relative"></div>
</kibana-panel>
1 change: 0 additions & 1 deletion panels/histogram/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ angular.module('kibana.histogram', [])
interval: secondsToHms(calculate_interval($scope.from,$scope.to,40,0)/1000),
show : ['bars','y-axis','x-axis','legend'],
fill : 3,
height : $scope.panel.height || $scope.row.height,
timezone: 'browser', // browser, utc or a standard timezone
group : "default",
}
Expand Down
2 changes: 1 addition & 1 deletion panels/map/module.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<kibana-panel ng-controller='map' ng-init="init()">
<div map params="{{panel}}" style="height:{{panel.height}}"></div>
<div map params="{{panel}}" style="height:{{panel.height || row.height}}"></div>
</kibana-panel>
1 change: 0 additions & 1 deletion panels/map/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ angular.module('kibana.map', [])
colors : ['#C8EEFF', '#0071A4'],
size : 100,
exclude : [],
height : $scope.panel.height || $scope.row.height,
group : "default",
}
_.defaults($scope.panel,_d)
Expand Down
2 changes: 1 addition & 1 deletion panels/pie/module.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<kibana-panel ng-controller='pie' ng-init="init()">
<div pie params="{{panel}}" style="height:{{panel.height}};position:relative"></div>
<div pie params="{{panel}}" style="height:{{panel.height || row.height}};position:relative"></div>
</kibana-panel>
1 change: 0 additions & 1 deletion panels/pie/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ angular.module('kibana.pie', [])
// Set and populate defaults
var _d = {
query : { field:"_all", query:"*", goal: 1},
height : $scope.panel.height || $scope.row.height,
size : 10,
exclude : [],
donut : false,
Expand Down
2 changes: 1 addition & 1 deletion panels/table/module.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<kibana-panel ng-controller='table' ng-init='init()'>
<div style="height:{{panel.height}};overflow-y:auto;overflow-x:auto">
<div style="height:{{panel.height || row.height}};overflow-y:auto;overflow-x:auto">
<div class="row-fluid">
<div class="span1 offset3" style="text-align:right">
<i ng-click="panel.offset = 0;get_data();" ng-show="panel.offset > 0" class='icon-circle-arrow-left pointer'></i>
Expand Down
1 change: 0 additions & 1 deletion panels/table/module.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ angular.module('kibana.table', [])
query : "*",
size : 100,
offset : 0,
height : $scope.panel.height || $scope.row.height,
sort : ['@timestamp','desc'],
group : "default",
style : {},
Expand Down
15 changes: 9 additions & 6 deletions panels/timepicker/editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,16 @@ <h6>Time Field</h6>
<h5>Index Settings</h5>
<div ng-show="panel.timed_indices" class="row-fluid">
<div class="span12">
<p>
Time stamped indices use a dated index pattern instead of pointing directly
to one specific index. For example, to match the default logstash index pattern
you might use <code>"logstash-"yyyy.mm.dd</code>. The quotes around "logstash-"
are important as they instruct Kibana not to treat those letters as a pattern.
<p class="small">
Time stamped indices use your selected time range to create a list of
indices that match a specified timestamp pattern. This can be very
efficient for some data sets (eg, logs) For example, to match the
default logstash index pattern you might use
<code>"logstash-"yyyy.mm.dd</code>. The quotes around "logstash-" are
important as they instruct Kibana not to treat those letters as a
pattern.
</p>
<p>
<p class="small">
See <a href="http://blog.stevenlevithan.com/archives/date-time-format">http://blog.stevenlevithan.com/archives/date-time-format</a>
for documentation on date formatting.
</p>
Expand Down

0 comments on commit 5a0f15b

Please sign in to comment.