diff --git a/config/kibana.yml b/config/kibana.yml index 0f506c91579bc..37c4292d6e425 100644 --- a/config/kibana.yml +++ b/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 diff --git a/docs/kibana-yml.asciidoc b/docs/kibana-yml.asciidoc index 310ca2005f00d..3e0e4ded41a85 100644 --- a/docs/kibana-yml.asciidoc +++ b/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. diff --git a/src/plugins/kibana/public/dashboard/index.html b/src/plugins/kibana/public/dashboard/index.html index 9a3f94fa3832e..6a4353e0bc29e 100644 --- a/src/plugins/kibana/public/dashboard/index.html +++ b/src/plugins/kibana/public/dashboard/index.html @@ -1,6 +1,6 @@
- +
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([]), diff --git a/src/server/logging/index.js b/src/server/logging/index.js index ba3bbe3ece35d..7164216e15a6e 100644 --- a/src/server/logging/index.js +++ b/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: [ diff --git a/src/ui/public/index_patterns/_mapper.js b/src/ui/public/index_patterns/_mapper.js index adfaef46b48bb..16bdce7d4958b 100644 --- a/src/ui/public/index_patterns/_mapper.js +++ b/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) { diff --git a/src/ui/public/stringify/__tests__/_ip.js b/src/ui/public/stringify/__tests__/_ip.js index 9ac9d11728930..034206c8f3b81 100644 --- a/src/ui/public/stringify/__tests__/_ip.js +++ b/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'); }); diff --git a/src/ui/public/stringify/types/Color.js b/src/ui/public/stringify/types/Color.js index 645a94ef84ac0..3ce45193f585b 100644 --- a/src/ui/public/stringify/types/Color.js +++ b/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', diff --git a/src/ui/public/stringify/types/Date.js b/src/ui/public/stringify/types/Date.js index 70ae1b3873f7e..66c955270f978 100644 --- a/src/ui/public/stringify/types/Date.js +++ b/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); diff --git a/src/ui/public/stringify/types/Ip.js b/src/ui/public/stringify/types/Ip.js index b2e1d2bdf319d..a23fd8c36b646 100644 --- a/src/ui/public/stringify/types/Ip.js +++ b/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) { diff --git a/src/ui/public/stringify/types/Percent.js b/src/ui/public/stringify/types/Percent.js index 3709d0419f7bc..0f94b18daa826 100644 --- a/src/ui/public/stringify/types/Percent.js +++ b/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); diff --git a/src/ui/public/stringify/types/Source.js b/src/ui/public/stringify/types/Source.js index c874b2b483f8f..7e80a0e2304bc 100644 --- a/src/ui/public/stringify/types/Source.js +++ b/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); diff --git a/src/ui/public/stringify/types/String.js b/src/ui/public/stringify/types/String.js index e5b11c918680f..b955aebcd9192 100644 --- a/src/ui/public/stringify/types/String.js +++ b/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); diff --git a/src/ui/public/stringify/types/Url.js b/src/ui/public/stringify/types/Url.js index d8d6c01c2779a..b2c4a635adb98 100644 --- a/src/ui/public/stringify/types/Url.js +++ b/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); diff --git a/src/ui/public/stringify/types/_Numeral.js b/src/ui/public/stringify/types/_Numeral.js index 7769319d9d353..f979ed6c8f207 100644 --- a/src/ui/public/stringify/types/_Numeral.js +++ b/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')(); diff --git a/src/ui/public/stringify/types/truncate.js b/src/ui/public/stringify/types/truncate.js index 05d650dbe7a4d..4f96235b1f338 100644 --- a/src/ui/public/stringify/types/truncate.js +++ b/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; -}; \ No newline at end of file +};