Merge pull request #494 from spenceralger/build-tweaks

Build tweaks
This commit is contained in:
spenceralger
2013-09-13 16:29:51 -07:00
121 changed files with 221 additions and 1081 deletions
+1
View File
@@ -4,6 +4,7 @@
require.config({
baseUrl: 'app',
paths: {
config: '../config',
settings: 'components/settings',
kbn: 'components/kbn',
-54
View File
@@ -1,54 +0,0 @@
/**
* These is the app's configuration, If you need to configure
* the default dashboard, please see dashboards/default
*/
define(['settings'],
function (Settings) {
"use strict";
return new Settings({
/**
* URL to your elasticsearch server. You almost certainly don't
* want 'http://localhost:9200' here. Even if Kibana and ES are on
* the same host
*
* By default this will attempt to reach ES at the same host you have
* elasticsearch installed on. You probably want to set it to the FQDN of your
* elasticsearch host
* @type {String}
*/
elasticsearch: "http://"+window.location.hostname+":9200",
/**
* The default ES index to use for storing Kibana specific object
* such as stored dashboards
* @type {String}
*/
kibana_index: "kibana-int",
/**
* Panel modules available. Panels will only be loaded when they are defined in the
* dashboard, but this list is used in the "add panel" interface.
* @type {Array}
*/
panel_names: [
'histogram',
'map',
'pie',
'table',
'filtering',
'timepicker',
'text',
'fields',
'hits',
'dashcontrol',
'column',
'derivequeries',
'trends',
'bettermap',
'query',
'terms'
]
});
});
+1 -1
View File
@@ -1,4 +1,4 @@
<div ng-controller='histogram' ng-init="init()" style="height:{{panel.height || row.height}}">
<div ng-controller='histogram' ng-init="init()" style="min-height:{{panel.height || row.height}}">
<style>
.histogram-legend {
display:inline-block;