Merge branch 'master' into elasticgh-6059

config/kibana.yml

@@ -19,7 +19,7 @@
 # that connects to this Kibana instance.
 # elasticsearch.preserveHost: true
 
-# Kibana uses an index in Elasticsearch to store saved searches, visualizations and 
+# Kibana uses an index in Elasticsearch to store saved searches, visualizations and
 # dashboards. Kibana creates a new index if the index doesn’t already exist.
 # kibana.index: ".kibana"
 
@@ -28,12 +28,12 @@
 
 # If your Elasticsearch is protected with basic authentication, these settings provide
 # the username and password that the Kibana server uses to perform maintenance on the Kibana
-# index at startup. Your Kibana users still need to authenticate with Elasticsearch, which 
+# index at startup. Your Kibana users still need to authenticate with Elasticsearch, which
 # is proxied through the Kibana server.
 # elasticsearch.username: "user"
 # elasticsearch.password: "pass"
 
-# Paths to the PEM-format SSL certificate and SSL key files, respectively. These 
+# Paths to the PEM-format SSL certificate and SSL key files, respectively. These
 # files enable SSL for outgoing requests from the Kibana server to the browser.
 # server.ssl.cert: /path/to/your/server.crt
 # server.ssl.key: /path/to/your/server.key
@@ -43,7 +43,7 @@
 # elasticsearch.ssl.cert: /path/to/your/client.crt
 # elasticsearch.ssl.key: /path/to/your/client.key
 
-# Optional setting that enables you to specify a path to the PEM file for the certificate 
+# Optional setting that enables you to specify a path to the PEM file for the certificate
 # authority for your Elasticsearch instance.
 # elasticsearch.ssl.ca: /path/to/your/CA.pem
 
@@ -54,7 +54,7 @@
 # the elasticsearch.requestTimeout setting.
 # elasticsearch.pingTimeout: 1500
 
-# Time in milliseconds to wait for responses from the back end or Elasticsearch. This value 
+# Time in milliseconds to wait for responses from the back end or Elasticsearch. This value
 # must be a positive integer.
 # elasticsearch.requestTimeout: 30000
 
@@ -76,6 +76,10 @@
 # Set the value of this setting to true to suppress all logging output other than error messages.
 # logging.quiet: false
 
-# Set the value of this setting to true to log all events, including system usage information 
+# Set the value of this setting to true to log all events, including system usage information
 # and all requests.
 # logging.verbose: false
+
+# Set the interval in milliseconds to sample system and process performance
+# metrics. Minimum is 100ms. Defaults to 10000.
+# ops.interval: 10000

docs/kibana-yml.asciidoc

@@ -39,3 +39,4 @@ retrying.
 error messages.
 `logging.verbose`:: *Default: false* Set the value of this setting to `true` to log all events, including system usage 
 information and all requests.
+`ops.interval`:: *Default: 10000* Set the interval in milliseconds to sample system and process performance metrics. Minimum is 100ms. Defaults to 10 seconds.

src/plugins/kibana/public/dashboard/index.html

@@ -1,6 +1,6 @@
 <div dashboard-app class="app-container dashboard-container">
   <navbar ng-show="chrome.getVisible()" name="dashboard">
-    <span class="name" ng-if="dash.id" ng-bind="::dash.title" tooltip="{{::dash.title}}"></span>
+    <span class="name" ng-if="dash.id" ng-bind="::dash.title" tooltip="{{::dash.title}}" tooltip-append-to-body="true"></span>
 
     <form name="queryInput"
       class="fill inline-form"

src/server/config/schema.js

@@ -81,6 +81,10 @@ module.exports = () => Joi.object({
   })
   .default(),
 
+  ops: Joi.object({
+    interval: Joi.number().default(10000),
+  }),
+
   plugins: Joi.object({
     paths: Joi.array().items(Joi.string()).default([]),
     scanDirs: Joi.array().items(Joi.string()).default([]),

src/server/logging/index.js

@@ -39,7 +39,7 @@ module.exports = function (kbnServer, server, config) {
     server.register({
       register: require('good'),
       options: {
-        opsInterval: 5000,
+        opsInterval: config.get('ops.interval'),
         requestHeaders: true,
         requestPayload: true,
         reporters: [

src/ui/public/index_patterns/_mapper.js

@@ -76,7 +76,7 @@ export default function MapperService(Private, Promise, es, config, kbnIndex) {
     };
 
     self.getIndicesForIndexPattern = function (indexPattern) {
-      return es.indices.getAliases({
+      return es.indices.getAlias({
         index: patternToWildcard(indexPattern.id)
       })
       .then(function (resp) {

src/ui/public/stringify/__tests__/_ip.js

@@ -9,7 +9,7 @@ describe('IP Address Format', function () {
     fieldFormats = Private(RegistryFieldFormatsProvider);
   }));
 
-  it('convers a value from a decimal to a string', function () {
+  it('converts a value from a decimal to a string', function () {
     var ip = fieldFormats.getInstance('ip');
     expect(ip.convert(1186489492)).to.be('70.184.100.148');
   });

src/ui/public/stringify/types/Color.js

@@ -1,10 +1,10 @@
 import 'ui/stringify/editors/color.less';
 import _ from 'lodash';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
 import colorTemplate from 'ui/stringify/editors/color.html';
-export default function _StringProvider(Private) {
+export default function ColorFormatProvider(Private) {
 
-  const FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  const FieldFormat = Private(IndexPatternsFieldFormatProvider);
   const DEFAULT_COLOR = {
     range: `${Number.NEGATIVE_INFINITY}:${Number.POSITIVE_INFINITY}`,
     text: '#000000',

src/ui/public/stringify/types/Date.js

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import moment from 'moment';
 import 'ui/field_format_editor/pattern/pattern';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
 import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
 import dateTemplate from 'ui/stringify/editors/date.html';
 export default function DateTimeFormatProvider(Private) {
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
   var BoundToConfigObj = Private(BoundToConfigObjProvider);
 
 

src/ui/public/stringify/types/Ip.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
 export default function IpFormatProvider(Private) {
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
   _.class(Ip).inherits(FieldFormat);
   function Ip(params) {

src/ui/public/stringify/types/Percent.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
 import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
 import StringifyTypesNumeralProvider from 'ui/stringify/types/_Numeral';
-export default function NumberFormatProvider(Private) {
+export default function PercentFormatProvider(Private) {
   var BoundToConfigObj = Private(BoundToConfigObjProvider);
   var Numeral = Private(StringifyTypesNumeralProvider);
 

src/ui/public/stringify/types/Source.js

@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import noWhiteSpace from 'ui/utils/no_white_space';
 import angular from 'angular';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
-export default function _SourceProvider(Private, shortDotsFilter) {
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+export default function _SourceFormatProvider(Private, shortDotsFilter) {
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
   var template = _.template(noWhiteSpace(require('ui/stringify/types/_source.html')));
 
   _.class(Source).inherits(FieldFormat);

src/ui/public/stringify/types/String.js

@@ -1,8 +1,8 @@
 import _ from 'lodash';
 import 'ui/field_format_editor/samples/samples';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
-export default function _StringProvider(Private) {
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+export default function StringFormatProvider(Private) {
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
 
   _.class(_String).inherits(FieldFormat);

src/ui/public/stringify/types/Url.js

@@ -1,11 +1,11 @@
 import _ from 'lodash';
 import 'ui/field_format_editor/pattern/pattern';
 import 'ui/stringify/icons';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
 import urlTemplate from 'ui/stringify/editors/url.html';
 export default function UrlFormatProvider(Private, highlightFilter) {
 
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
 
 
   _.class(Url).inherits(FieldFormat);

src/ui/public/stringify/types/_Numeral.js

@@ -1,9 +1,9 @@
 import _ from 'lodash';
 import 'ui/field_format_editor/numeral/numeral';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
 import BoundToConfigObjProvider from 'ui/bound_to_config_obj';
 export default function AbstractNumeralFormatProvider(Private) {
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
   var BoundToConfigObj = Private(BoundToConfigObjProvider);
   var numeral = require('numeral')();
 

src/ui/public/stringify/types/truncate.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
-import IndexPatternsFieldFormatFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
+import IndexPatternsFieldFormatProvider from 'ui/index_patterns/_field_format/FieldFormat';
 export default function TruncateFormatProvider(Private) {
-  var FieldFormat = Private(IndexPatternsFieldFormatFieldFormatProvider);
+  var FieldFormat = Private(IndexPatternsFieldFormatProvider);
   var omission = '...';
 
   _.class(Truncate).inherits(FieldFormat);
@@ -31,4 +31,4 @@ export default function TruncateFormatProvider(Private) {
   Truncate.sampleInput = [ require('ui/stringify/samples/large.html') ];
 
   return Truncate;
-};
+};