mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Fixed height bug, improved documentation for time stamped indices
This commit is contained in:
parent
b2c7f19c7a
commit
5a0f15ba37
@ -32,7 +32,6 @@ angular.module('kibana.dashcontrol', [])
|
|||||||
// Long ugly if statement for figuring out which dashboard to load on init
|
// Long ugly if statement for figuring out which dashboard to load on init
|
||||||
// If there is no dashboard defined, find one
|
// If there is no dashboard defined, find one
|
||||||
if(_.isUndefined($scope.dashboards)) {
|
if(_.isUndefined($scope.dashboards)) {
|
||||||
console.log('ok, defining')
|
|
||||||
// First check the URL for a path to a dashboard
|
// First check the URL for a path to a dashboard
|
||||||
if(!(_.isUndefined($routeParams.type)) && !(_.isUndefined($routeParams.id))) {
|
if(!(_.isUndefined($routeParams.type)) && !(_.isUndefined($routeParams.id))) {
|
||||||
var _type = $routeParams.type;
|
var _type = $routeParams.type;
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<kibana-panel ng-controller='histogram' ng-init="init()" style="height:{{row.height}}">
|
<kibana-panel ng-controller='histogram' ng-init="init()" style="height:{{panel.height || row.height}}">
|
||||||
<div histogram params="{{panel}}" style="height:{{panel.height}};position:relative"></div>
|
<div histogram params="{{panel}}" style="height:{{panel.height || row.height}};position:relative"></div>
|
||||||
</kibana-panel>
|
</kibana-panel>
|
@ -7,7 +7,6 @@ angular.module('kibana.histogram', [])
|
|||||||
interval: secondsToHms(calculate_interval($scope.from,$scope.to,40,0)/1000),
|
interval: secondsToHms(calculate_interval($scope.from,$scope.to,40,0)/1000),
|
||||||
show : ['bars','y-axis','x-axis','legend'],
|
show : ['bars','y-axis','x-axis','legend'],
|
||||||
fill : 3,
|
fill : 3,
|
||||||
height : $scope.panel.height || $scope.row.height,
|
|
||||||
timezone: 'browser', // browser, utc or a standard timezone
|
timezone: 'browser', // browser, utc or a standard timezone
|
||||||
group : "default",
|
group : "default",
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<kibana-panel ng-controller='map' ng-init="init()">
|
<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>
|
</kibana-panel>
|
@ -8,7 +8,6 @@ angular.module('kibana.map', [])
|
|||||||
colors : ['#C8EEFF', '#0071A4'],
|
colors : ['#C8EEFF', '#0071A4'],
|
||||||
size : 100,
|
size : 100,
|
||||||
exclude : [],
|
exclude : [],
|
||||||
height : $scope.panel.height || $scope.row.height,
|
|
||||||
group : "default",
|
group : "default",
|
||||||
}
|
}
|
||||||
_.defaults($scope.panel,_d)
|
_.defaults($scope.panel,_d)
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<kibana-panel ng-controller='pie' ng-init="init()">
|
<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>
|
</kibana-panel>
|
@ -4,7 +4,6 @@ angular.module('kibana.pie', [])
|
|||||||
// Set and populate defaults
|
// Set and populate defaults
|
||||||
var _d = {
|
var _d = {
|
||||||
query : { field:"_all", query:"*", goal: 1},
|
query : { field:"_all", query:"*", goal: 1},
|
||||||
height : $scope.panel.height || $scope.row.height,
|
|
||||||
size : 10,
|
size : 10,
|
||||||
exclude : [],
|
exclude : [],
|
||||||
donut : false,
|
donut : false,
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<kibana-panel ng-controller='table' ng-init='init()'>
|
<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="row-fluid">
|
||||||
<div class="span1 offset3" style="text-align:right">
|
<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>
|
<i ng-click="panel.offset = 0;get_data();" ng-show="panel.offset > 0" class='icon-circle-arrow-left pointer'></i>
|
||||||
|
@ -6,7 +6,6 @@ angular.module('kibana.table', [])
|
|||||||
query : "*",
|
query : "*",
|
||||||
size : 100,
|
size : 100,
|
||||||
offset : 0,
|
offset : 0,
|
||||||
height : $scope.panel.height || $scope.row.height,
|
|
||||||
sort : ['@timestamp','desc'],
|
sort : ['@timestamp','desc'],
|
||||||
group : "default",
|
group : "default",
|
||||||
style : {},
|
style : {},
|
||||||
|
@ -12,13 +12,16 @@
|
|||||||
<h5>Index Settings</h5>
|
<h5>Index Settings</h5>
|
||||||
<div ng-show="panel.timed_indices" class="row-fluid">
|
<div ng-show="panel.timed_indices" class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
<p>
|
<p class="small">
|
||||||
Time stamped indices use a dated index pattern instead of pointing directly
|
Time stamped indices use your selected time range to create a list of
|
||||||
to one specific index. For example, to match the default logstash index pattern
|
indices that match a specified timestamp pattern. This can be very
|
||||||
you might use <code>"logstash-"yyyy.mm.dd</code>. The quotes around "logstash-"
|
efficient for some data sets (eg, logs) For example, to match the
|
||||||
are important as they instruct Kibana not to treat those letters as a pattern.
|
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>
|
<p class="small">
|
||||||
See <a href="http://blog.stevenlevithan.com/archives/date-time-format">http://blog.stevenlevithan.com/archives/date-time-format</a>
|
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.
|
for documentation on date formatting.
|
||||||
</p>
|
</p>
|
||||||
|
Loading…
Reference in New Issue
Block a user