Alerting/task scheduler

docs/development/security/rbac.asciidoc

@@ -1,7 +1,7 @@
 [[development-security-rbac]]
 === Role-based access control
 
-Role-based access control (RBAC) in {kib} relies upon the {ref}/security-api-privileges.html[privilege APIs] that Elasticsearch exposes. This {kib} to define the privileges that {kib} wishes to grant to users, assign them to the relevant users using roles, and then authorize the user to perform a specific action. This is handled within a secured instance of the `SavedObjectsClient` and available transparently to consumers when using `request.getSavedObjectsClient()` or `savedObjects.getScopedSavedObjectsClient()`.
+Role-based access control (RBAC) in {kib} relies upon the {ref}/security-privileges.html#application-privileges[application privileges] that Elasticsearch exposes. This allows {kib} to define the privileges that {kib} wishes to grant to users, assign them to the relevant users using roles, and then authorize the user to perform a specific action. This is handled within a secured instance of the `SavedObjectsClient` and available transparently to consumers when using `request.getSavedObjectsClient()` or `savedObjects.getScopedSavedObjectsClient()`.
 
 [[development-rbac-privileges]]
 ==== {kib} Privileges
@@ -76,7 +76,7 @@ Roles that grant <<kibana-privileges>> should be managed using the <<role-manage
 [[development-rbac-authorization]]
 ==== Authorization
 
-The {es} {ref}/security-api-privileges.html#security-api-privileges[has privileges API]determines whether the user is authorized to perform a specific action:
+The {es} {ref}/security-api-has-privileges.html[has privileges API] determines whether the user is authorized to perform a specific action:
 
 [source,js]
 ----------------------------------
@@ -104,7 +104,7 @@ Once we have authorized the user to perform a specific action, we can execute th
 [[development-rbac-legacy-fallback]]
 ==== Legacy Fallback
 
-Users have existign roles that rely on index privileges to the `.kibana` index. The legacy fallback uses the `callWithRequest` method when the user doesn't have and application privileges. This relies on the user have index privileges on `.kibana`. The legacy fallback will be available until 7.0.
+Users have existing roles that rely on index privileges to the `.kibana` index. The legacy fallback uses the `callWithRequest` method when the user doesn't have any application privileges. This relies on the user having index privileges on `.kibana`. The legacy fallback will be available until 7.0.
 
 Within the secured instance of the `SavedObjectsClient` the `_has_privileges` check determines if the user has any index privileges on the `.kibana` index:
 

docs/settings/apm-settings.asciidoc

@@ -19,10 +19,10 @@ xpack.apm.ui.enabled:: Set to `false` to hide the APM plugin {kib} from the menu
 
 apm_oss.indexPattern:: Index pattern is used for integrations with Machine Learning and Kuery Bar. It must match all apm indices. Defaults to `apm-*`.
 
-apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-\*-error-*`.
+apm_oss.errorIndices:: Matcher for indices containing error documents. Defaults to `apm-*`.
 
-apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents. Defaults to `apm-\*-onboarding-*`.
+apm_oss.onboardingIndices:: Matcher for indices containing onboarding documents. Defaults to `apm-*`.
 
-apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-\*-span-*`.
+apm_oss.spanIndices:: Matcher for indices containing span documents. Defaults to `apm-*`.
 
-apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-\*-transaction-*`.
+apm_oss.transactionIndices:: Matcher for indices containing transaction documents. Defaults to `apm-*`.

package.json

@@ -157,14 +157,14 @@
     "react-grid-layout": "^0.16.2",
     "react-input-range": "^1.3.0",
     "react-markdown": "^3.1.4",
-    "react-redux": "^5.0.6",
+    "react-redux": "^5.0.7",
     "react-router-dom": "4.2.2",
     "react-sizeme": "^2.3.6",
     "react-toggle": "4.0.2",
     "reactcss": "1.2.3",
-    "redux": "3.7.2",
+    "redux": "4.0.0",
     "redux-actions": "2.2.1",
-    "redux-thunk": "2.2.0",
+    "redux-thunk": "2.3.0",
     "regression": "2.0.0",
     "request": "^2.85.0",
     "reselect": "^3.0.1",
@@ -235,8 +235,7 @@
     "@types/prop-types": "^15.5.3",
     "@types/react": "^16.3.14",
     "@types/react-dom": "^16.0.5",
-    "@types/react-redux": "^5.0.6",
-    "@types/redux": "^3.6.31",
+    "@types/react-redux": "^6.0.6",
     "@types/redux-actions": "^2.2.1",
     "@types/sinon": "^5.0.0",
     "@types/strip-ansi": "^3.0.0",
@@ -245,7 +244,7 @@
     "angular-mocks": "1.4.7",
     "babel-eslint": "8.1.2",
     "babel-jest": "^22.4.3",
-    "backport": "4.2.0",
+    "backport": "4.4.1",
     "chai": "3.5.0",
     "chance": "1.0.10",
     "cheerio": "0.22.0",

packages/kbn-plugin-helpers/tasks/build/__fixtures__/build_action_test_plugin/translations/es.json

@@ -1,4 +1,4 @@
 {
-  "UI-WELCOME_MESSAGE": "Cargando Kibana",
-  "UI-WELCOME_ERROR": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
-}
+  "common.ui.welcomeMessage": "Cargando Kibana",
+  "common.ui.welcomeError": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
+}

packages/kbn-plugin-helpers/tasks/build/__fixtures__/create_build_test_plugin/translations/es.json

@@ -1,4 +1,4 @@
 {
-  "UI-WELCOME_MESSAGE": "Cargando Kibana",
-  "UI-WELCOME_ERROR": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
-}
+  "common.ui.welcomeMessage": "Cargando Kibana",
+  "common.ui.welcomeError": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
+}

packages/kbn-plugin-helpers/tasks/build/__fixtures__/create_package_test_plugin/translations/es.json

@@ -1,4 +1,4 @@
 {
-  "UI-WELCOME_MESSAGE": "Cargando Kibana",
-  "UI-WELCOME_ERROR": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
-}
+  "common.ui.welcomeMessage": "Cargando Kibana",
+  "common.ui.welcomeError": "Kibana no se cargó correctamente. Heck la salida del servidor para obtener más información."
+}

scripts/extract_default_translations.js → scripts/i18n_check.js

@@ -18,4 +18,4 @@
  */
 
 require('../src/setup_node_env');
-require('../src/dev/run_extract_default_translations');
+require('../src/dev/run_i18n_check');

src/cli/serve/integration_tests/reload_logging_config.test.js

@@ -23,7 +23,7 @@ import { relative, resolve } from 'path';
 import { safeDump } from 'js-yaml';
 import es from 'event-stream';
 import stripAnsi from 'strip-ansi';
-import { readYamlConfig } from '../read_yaml_config';
+import { getConfigFromFiles } from '../../../core/server/config';
 
 const testConfigFile = follow('__fixtures__/reload_logging_config/kibana.test.yml');
 const kibanaPath = follow('../../../../scripts/kibana.js');
@@ -33,7 +33,7 @@ function follow(file) {
 }
 
 function setLoggingJson(enabled) {
-  const conf = readYamlConfig(testConfigFile);
+  const conf = getConfigFromFiles([testConfigFile]);
   conf.logging = conf.logging || {};
   conf.logging.json = enabled;
 

src/cli/serve/serve.js

@@ -25,7 +25,7 @@ import { resolve } from 'path';
 import { fromRoot } from '../../utils';
 import { getConfig } from '../../server/path';
 import { Config } from '../../server/config/config';
-import { readYamlConfig } from './read_yaml_config';
+import { getConfigFromFiles } from '../../core/server/config';
 import { readKeystore } from './read_keystore';
 import { transformDeprecations } from '../../server/config/transform_deprecations';
 
@@ -80,7 +80,7 @@ const pluginDirCollector = pathCollector();
 const pluginPathCollector = pathCollector();
 
 function readServerSettings(opts, extraCliOptions) {
-  const settings = readYamlConfig(opts.config);
+  const settings = getConfigFromFiles([].concat(opts.config || []));
   const set = _.partial(_.set, settings);
   const get = _.partial(_.get, settings);
   const has = _.partial(_.has, settings);
@@ -256,7 +256,7 @@ export default function (program) {
 
         // If new platform config subscription is active, let's notify it with the updated config.
         if (kbnServer.newPlatform) {
-          kbnServer.newPlatform.updateConfig(config);
+          kbnServer.newPlatform.updateConfig(config.get());
         }
       });
 

src/core/server/config/__tests__/__fixtures__/one.yml

@@ -0,0 +1,7 @@
+foo: 1
+bar: true
+xyz: ['1', '2']
+abc:
+  def: test
+  qwe: 1
+pom.bom: 3

src/core/server/config/__tests__/__fixtures__/two.yml

@@ -0,0 +1,7 @@
+foo: 2
+baz: bonkers
+xyz: ['3', '4']
+abc:
+  ghi: test2
+  qwe: 2
+pom.mob: 4