From 71cbe048c976aa431664cdcd9616aa656d8cd754 Mon Sep 17 00:00:00 2001
From: Timothy Sullivan <tsullivan@elastic.co>
Date: Mon, 29 Feb 2016 15:53:47 -0700
Subject: [PATCH 1/2] [chore] cut trailing whitespace

---
 config/kibana.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/kibana.yml b/config/kibana.yml
index 0f506c91579bc..e513fe4c23b47 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,6 @@
 # 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

From 2c828aedffd5126fb0ebb62066d4a3d5afefcef7 Mon Sep 17 00:00:00 2001
From: Timothy Sullivan <tsullivan@elastic.co>
Date: Mon, 29 Feb 2016 15:55:17 -0700
Subject: [PATCH 2/2] [config] add ops.interval config option

---
 config/kibana.yml           | 4 ++++
 docs/kibana-yml.asciidoc    | 1 +
 src/server/config/schema.js | 4 ++++
 src/server/logging/index.js | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/config/kibana.yml b/config/kibana.yml
index e513fe4c23b47..37c4292d6e425 100644
--- a/config/kibana.yml
+++ b/config/kibana.yml
@@ -79,3 +79,7 @@
 # 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/server/config/schema.js b/src/server/config/schema.js
index 6f000908579fc..e6306282c2fcc 100644
--- a/src/server/config/schema.js
+++ b/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([]),
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: [