Merge branch 'master' into runtime_editor/painless_autocomplete

docs/developer/getting-started/index.asciidoc

@@ -110,6 +110,20 @@ View all available options by running `yarn start --help`
 
 Read about more advanced options for <<running-kibana-advanced>>.
 
+[discrete]
+=== Install pre-commit hook (optional)
+
+In case you want to run a couple of checks like linting or check the file casing of the files to commit, we provide 
+a way to install a pre-commit hook. To configure it you just need to run the following:
+
+[source,bash]
+----
+node scripts/register_git_hook
+----
+
+After the script completes the pre-commit hook will be created within the file `.git/hooks/pre-commit`.
+If you choose to not install it, don't worry, we still run a quick ci check to provide feedback earliest as we can about the same checks. 
+
 [discrete]
 === Code away!
 

docs/development/core/public/kibana-plugin-core-public.uisettingsparams.md

@@ -19,7 +19,7 @@ export interface UiSettingsParams<T = unknown>
 |  [category](./kibana-plugin-core-public.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
 |  [deprecation](./kibana-plugin-core-public.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
 |  [description](./kibana-plugin-core-public.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
-|  [metric](./kibana-plugin-core-public.uisettingsparams.metric.md) | <code>{</code><br/><code>        type: UiStatsMetricType;</code><br/><code>        name: string;</code><br/><code>    }</code> | Metric to track once this property changes |
+|  [metric](./kibana-plugin-core-public.uisettingsparams.metric.md) | <code>{</code><br/><code>        type: UiCounterMetricType;</code><br/><code>        name: string;</code><br/><code>    }</code> | Metric to track once this property changes |
 |  [name](./kibana-plugin-core-public.uisettingsparams.name.md) | <code>string</code> | title in the UI |
 |  [optionLabels](./kibana-plugin-core-public.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
 |  [options](./kibana-plugin-core-public.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |

docs/development/core/public/kibana-plugin-core-public.uisettingsparams.metric.md

@@ -15,7 +15,7 @@ Metric to track once this property changes
 
 ```typescript
 metric?: {
-        type: UiStatsMetricType;
+        type: UiCounterMetricType;
         name: string;
     };
 ```

docs/development/core/server/kibana-plugin-core-server.md

@@ -177,6 +177,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsImportSuccess](./kibana-plugin-core-server.savedobjectsimportsuccess.md) | Represents a successful import. |
 |  [SavedObjectsImportUnknownError](./kibana-plugin-core-server.savedobjectsimportunknownerror.md) | Represents a failure to import due to an unknown reason. |
 |  [SavedObjectsImportUnsupportedTypeError](./kibana-plugin-core-server.savedobjectsimportunsupportedtypeerror.md) | Represents a failure to import due to having an unsupported saved object type. |
+|  [SavedObjectsIncrementCounterField](./kibana-plugin-core-server.savedobjectsincrementcounterfield.md) |  |
 |  [SavedObjectsIncrementCounterOptions](./kibana-plugin-core-server.savedobjectsincrementcounteroptions.md) |  |
 |  [SavedObjectsMappingProperties](./kibana-plugin-core-server.savedobjectsmappingproperties.md) | Describe the fields of a [saved object type](./kibana-plugin-core-server.savedobjectstypemappingdefinition.md)<!-- -->. |
 |  [SavedObjectsMigrationLogger](./kibana-plugin-core-server.savedobjectsmigrationlogger.md) |  |

docs/development/core/server/kibana-plugin-core-server.savedobjectsincrementcounterfield.fieldname.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsIncrementCounterField](./kibana-plugin-core-server.savedobjectsincrementcounterfield.md) &gt; [fieldName](./kibana-plugin-core-server.savedobjectsincrementcounterfield.fieldname.md)
+
+## SavedObjectsIncrementCounterField.fieldName property
+
+The field name to increment the counter by.
+
+<b>Signature:</b>
+
+```typescript
+fieldName: string;
+```

docs/development/core/server/kibana-plugin-core-server.savedobjectsincrementcounterfield.incrementby.md

@@ -0,0 +1,13 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsIncrementCounterField](./kibana-plugin-core-server.savedobjectsincrementcounterfield.md) &gt; [incrementBy](./kibana-plugin-core-server.savedobjectsincrementcounterfield.incrementby.md)
+
+## SavedObjectsIncrementCounterField.incrementBy property
+
+The number to increment the field by (defaults to 1).
+
+<b>Signature:</b>
+
+```typescript
+incrementBy?: number;
+```

docs/development/core/server/kibana-plugin-core-server.savedobjectsincrementcounterfield.md

@@ -0,0 +1,20 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsIncrementCounterField](./kibana-plugin-core-server.savedobjectsincrementcounterfield.md)
+
+## SavedObjectsIncrementCounterField interface
+
+
+<b>Signature:</b>
+
+```typescript
+export interface SavedObjectsIncrementCounterField 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [fieldName](./kibana-plugin-core-server.savedobjectsincrementcounterfield.fieldname.md) | <code>string</code> | The field name to increment the counter by. |
+|  [incrementBy](./kibana-plugin-core-server.savedobjectsincrementcounterfield.incrementby.md) | <code>number</code> | The number to increment the field by (defaults to 1). |
+

docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md

@@ -4,12 +4,12 @@
 
 ## SavedObjectsRepository.incrementCounter() method
 
-Increments all the specified counter fields by one. Creates the document if one doesn't exist for the given id.
+Increments all the specified counter fields (by one by default). Creates the document if one doesn't exist for the given id.
 
 <b>Signature:</b>
 
 ```typescript
-incrementCounter<T = unknown>(type: string, id: string, counterFieldNames: string[], options?: SavedObjectsIncrementCounterOptions): Promise<SavedObject<T>>;
+incrementCounter<T = unknown>(type: string, id: string, counterFields: Array<string | SavedObjectsIncrementCounterField>, options?: SavedObjectsIncrementCounterOptions): Promise<SavedObject<T>>;
 ```
 
 ## Parameters
@@ -18,7 +18,7 @@ incrementCounter<T = unknown>(type: string, id: string, counterFieldNames: strin
 |  --- | --- | --- |
 |  type | <code>string</code> | The type of saved object whose fields should be incremented |
 |  id | <code>string</code> | The id of the document whose fields should be incremented |
-|  counterFieldNames | <code>string[]</code> | An array of field names to increment |
+|  counterFields | <code>Array&lt;string &#124; SavedObjectsIncrementCounterField&gt;</code> | An array of field names to increment or an array of [SavedObjectsIncrementCounterField](./kibana-plugin-core-server.savedobjectsincrementcounterfield.md) |
 |  options | <code>SavedObjectsIncrementCounterOptions</code> | [SavedObjectsIncrementCounterOptions](./kibana-plugin-core-server.savedobjectsincrementcounteroptions.md) |
 
 <b>Returns:</b>

docs/development/core/server/kibana-plugin-core-server.savedobjectsrepository.md

@@ -26,7 +26,7 @@ export declare class SavedObjectsRepository
 |  [deleteFromNamespaces(type, id, namespaces, options)](./kibana-plugin-core-server.savedobjectsrepository.deletefromnamespaces.md) |  | Removes one or more namespaces from a given multi-namespace saved object. If no namespaces remain, the saved object is deleted entirely. This method and \[<code>addToNamespaces</code>\][SavedObjectsRepository.addToNamespaces()](./kibana-plugin-core-server.savedobjectsrepository.addtonamespaces.md) are the only ways to change which Spaces a multi-namespace saved object is shared to. |
 |  [find(options)](./kibana-plugin-core-server.savedobjectsrepository.find.md) |  |  |
 |  [get(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.get.md) |  | Gets a single object |
-|  [incrementCounter(type, id, counterFieldNames, options)](./kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md) |  | Increments all the specified counter fields by one. Creates the document if one doesn't exist for the given id. |
+|  [incrementCounter(type, id, counterFields, options)](./kibana-plugin-core-server.savedobjectsrepository.incrementcounter.md) |  | Increments all the specified counter fields (by one by default). Creates the document if one doesn't exist for the given id. |
 |  [removeReferencesTo(type, id, options)](./kibana-plugin-core-server.savedobjectsrepository.removereferencesto.md) |  | Updates all objects containing a reference to the given {<!-- -->type, id<!-- -->} tuple to remove the said reference. |
 |  [update(type, id, attributes, options)](./kibana-plugin-core-server.savedobjectsrepository.update.md) |  | Updates an object |
 

docs/development/core/server/kibana-plugin-core-server.uisettingsparams.md

@@ -19,7 +19,7 @@ export interface UiSettingsParams<T = unknown>
 |  [category](./kibana-plugin-core-server.uisettingsparams.category.md) | <code>string[]</code> | used to group the configured setting in the UI |
 |  [deprecation](./kibana-plugin-core-server.uisettingsparams.deprecation.md) | <code>DeprecationSettings</code> | optional deprecation information. Used to generate a deprecation warning. |
 |  [description](./kibana-plugin-core-server.uisettingsparams.description.md) | <code>string</code> | description provided to a user in UI |
-|  [metric](./kibana-plugin-core-server.uisettingsparams.metric.md) | <code>{</code><br/><code>        type: UiStatsMetricType;</code><br/><code>        name: string;</code><br/><code>    }</code> | Metric to track once this property changes |
+|  [metric](./kibana-plugin-core-server.uisettingsparams.metric.md) | <code>{</code><br/><code>        type: UiCounterMetricType;</code><br/><code>        name: string;</code><br/><code>    }</code> | Metric to track once this property changes |
 |  [name](./kibana-plugin-core-server.uisettingsparams.name.md) | <code>string</code> | title in the UI |
 |  [optionLabels](./kibana-plugin-core-server.uisettingsparams.optionlabels.md) | <code>Record&lt;string, string&gt;</code> | text labels for 'select' type UI element |
 |  [options](./kibana-plugin-core-server.uisettingsparams.options.md) | <code>string[]</code> | array of permitted values for this setting |

docs/development/core/server/kibana-plugin-core-server.uisettingsparams.metric.md

@@ -15,7 +15,7 @@ Metric to track once this property changes
 
 ```typescript
 metric?: {
-        type: UiStatsMetricType;
+        type: UiCounterMetricType;
         name: string;
     };
 ```

package.json

@@ -65,7 +65,7 @@
     "kbn:watch": "node scripts/kibana --dev --logging.json=false",
     "build:types": "rm -rf ./target/types && tsc --p tsconfig.types.json",
     "docs:acceptApiChanges": "node --max-old-space-size=6144 scripts/check_published_api_changes.js --accept",
-    "kbn:bootstrap": "node scripts/build_ts_refs && node scripts/register_git_hook",
+    "kbn:bootstrap": "node scripts/build_ts_refs",
     "spec_to_console": "node scripts/spec_to_console",
     "backport-skip-ci": "backport --prDescription \"[skip-ci]\"",
     "storybook": "node scripts/storybook",
@@ -112,8 +112,10 @@
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
+    "@elastic/react-search-ui": "^1.5.0",
     "@elastic/request-crypto": "1.1.4",
     "@elastic/safer-lodash-set": "link:packages/elastic-safer-lodash-set",
+    "@elastic/search-ui-app-search-connector": "^1.5.0",
     "@hapi/boom": "^7.4.11",
     "@hapi/cookie": "^10.1.2",
     "@hapi/good-squeeze": "5.2.1",
@@ -746,7 +748,7 @@
     "murmurhash3js": "3.0.1",
     "mutation-observer": "^1.0.3",
     "ncp": "^2.0.0",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "null-loader": "^3.0.0",
     "nyc": "^15.0.1",
     "oboe": "^2.1.4",

packages/kbn-analytics/src/index.ts

@@ -18,6 +18,6 @@
  */
 
 export { ReportHTTP, Reporter, ReporterConfig } from './reporter';
-export { UiStatsMetricType, METRIC_TYPE } from './metrics';
+export { UiCounterMetricType, METRIC_TYPE } from './metrics';
 export { Report, ReportManager } from './report';
 export { Storage } from './storage';

packages/kbn-analytics/src/metrics/index.ts

@@ -17,16 +17,15 @@
  * under the License.
  */
 
-import { UiStatsMetric } from './ui_stats';
+import { UiCounterMetric } from './ui_counter';
 import { UserAgentMetric } from './user_agent';
 import { ApplicationUsageCurrent } from './application_usage';
 
-export { UiStatsMetric, createUiStatsMetric, UiStatsMetricType } from './ui_stats';
-export { Stats } from './stats';
+export { UiCounterMetric, createUiCounterMetric, UiCounterMetricType } from './ui_counter';
 export { trackUsageAgent } from './user_agent';
 export { ApplicationUsage, ApplicationUsageCurrent } from './application_usage';
 
-export type Metric = UiStatsMetric | UserAgentMetric | ApplicationUsageCurrent;
+export type Metric = UiCounterMetric | UserAgentMetric | ApplicationUsageCurrent;
 export enum METRIC_TYPE {
   COUNT = 'count',
   LOADED = 'loaded',

packages/kbn-analytics/src/metrics/ui_stats.ts → packages/kbn-analytics/src/metrics/ui_counter.ts

@@ -19,27 +19,27 @@
 
 import { METRIC_TYPE } from './';
 
-export type UiStatsMetricType = METRIC_TYPE.CLICK | METRIC_TYPE.LOADED | METRIC_TYPE.COUNT;
-export interface UiStatsMetricConfig {
-  type: UiStatsMetricType;
+export type UiCounterMetricType = METRIC_TYPE.CLICK | METRIC_TYPE.LOADED | METRIC_TYPE.COUNT;
+export interface UiCounterMetricConfig {
+  type: UiCounterMetricType;
   appName: string;
   eventName: string;
   count?: number;
 }
 
-export interface UiStatsMetric {
-  type: UiStatsMetricType;
+export interface UiCounterMetric {
+  type: UiCounterMetricType;
   appName: string;
   eventName: string;
   count: number;
 }
 
-export function createUiStatsMetric({
+export function createUiCounterMetric({
   type,
   appName,
   eventName,
   count = 1,
-}: UiStatsMetricConfig): UiStatsMetric {
+}: UiCounterMetricConfig): UiCounterMetric {
   return {
     type,
     appName,

packages/kbn-analytics/src/report.ts

@@ -19,19 +19,19 @@
 
 import moment from 'moment-timezone';
 import { UnreachableCaseError, wrapArray } from './util';
-import { Metric, Stats, UiStatsMetricType, METRIC_TYPE } from './metrics';
-const REPORT_VERSION = 1;
+import { Metric, UiCounterMetricType, METRIC_TYPE } from './metrics';
+const REPORT_VERSION = 2;
 
 export interface Report {
   reportVersion: typeof REPORT_VERSION;
-  uiStatsMetrics?: Record<
+  uiCounter?: Record<
     string,
     {
       key: string;
       appName: string;
       eventName: string;
-      type: UiStatsMetricType;
-      stats: Stats;
+      type: UiCounterMetricType;
+      total: number;
     }
   >;
   userAgent?: Record<
@@ -65,25 +65,15 @@ export class ReportManager {
     this.report = ReportManager.createReport();
   }
   public isReportEmpty(): boolean {
-    const { uiStatsMetrics, userAgent, application_usage: appUsage } = this.report;
-    const noUiStats = !uiStatsMetrics || Object.keys(uiStatsMetrics).length === 0;
-    const noUserAgent = !userAgent || Object.keys(userAgent).length === 0;
+    const { uiCounter, userAgent, application_usage: appUsage } = this.report;
+    const noUiCounters = !uiCounter || Object.keys(uiCounter).length === 0;
+    const noUserAgents = !userAgent || Object.keys(userAgent).length === 0;
     const noAppUsage = !appUsage || Object.keys(appUsage).length === 0;
-    return noUiStats && noUserAgent && noAppUsage;
+    return noUiCounters && noUserAgents && noAppUsage;
   }
-  private incrementStats(count: number, stats?: Stats): Stats {
-    const { min = 0, max = 0, sum = 0 } = stats || {};
-    const newMin = Math.min(min, count);
-    const newMax = Math.max(max, count);
-    const newAvg = newMin + newMax / 2;
-    const newSum = sum + count;
-
-    return {
-      min: newMin,
-      max: newMax,
-      avg: newAvg,
-      sum: newSum,
-    };
+  private incrementTotal(count: number, currentTotal?: number): number {
+    const currentTotalNumber = typeof currentTotal === 'number' ? currentTotal : 0;
+    return count + currentTotalNumber;
   }
   assignReports(newMetrics: Metric | Metric[]) {
     wrapArray(newMetrics).forEach((newMetric) => this.assignReport(this.report, newMetric));
@@ -129,14 +119,14 @@ export class ReportManager {
       case METRIC_TYPE.LOADED:
       case METRIC_TYPE.COUNT: {
         const { appName, type, eventName, count } = metric;
-        report.uiStatsMetrics = report.uiStatsMetrics || {};
-        const existingStats = (report.uiStatsMetrics[key] || {}).stats;
-        report.uiStatsMetrics[key] = {
+        report.uiCounter = report.uiCounter || {};
+        const currentTotal = report.uiCounter[key]?.total;
+        report.uiCounter[key] = {
           key,
           appName,
           eventName,
           type,
-          stats: this.incrementStats(count, existingStats),
+          total: this.incrementTotal(count, currentTotal),
         };
         return;
       }

packages/kbn-analytics/src/reporter.ts

@@ -18,7 +18,7 @@
  */
 
 import { wrapArray } from './util';
-import { Metric, createUiStatsMetric, trackUsageAgent, UiStatsMetricType } from './metrics';
+import { Metric, createUiCounterMetric, trackUsageAgent, UiCounterMetricType } from './metrics';
 
 import { Storage, ReportStorageManager } from './storage';
 import { Report, ReportManager } from './report';
@@ -109,15 +109,15 @@ export class Reporter {
     }
   }
 
-  public reportUiStats = (
+  public reportUiCounter = (
     appName: string,
-    type: UiStatsMetricType,
+    type: UiCounterMetricType,
     eventNames: string | string[],
     count?: number
   ) => {
     const metrics = wrapArray(eventNames).map((eventName) => {
       this.log(`${type} Metric -> (${appName}:${eventName}):`);
-      const report = createUiStatsMetric({ type, appName, eventName, count });
+      const report = createUiCounterMetric({ type, appName, eventName, count });
       this.log(report);
       return report;
     });

src/core/public/public.api.md

@@ -38,7 +38,7 @@ import { TransportRequestParams } from '@elastic/elasticsearch/lib/Transport';
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
 import { Type } from '@kbn/config-schema';
 import { TypeOf } from '@kbn/config-schema';
-import { UiStatsMetricType } from '@kbn/analytics';
+import { UiCounterMetricType } from '@kbn/analytics';
 import { UnregisterCallback } from 'history';
 import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/types';
 
@@ -1434,7 +1434,7 @@ export interface UiSettingsParams<T = unknown> {
     description?: string;
     // @deprecated
     metric?: {
-        type: UiStatsMetricType;
+        type: UiCounterMetricType;
         name: string;
     };
     name?: string;

src/core/server/index.ts

@@ -302,6 +302,7 @@ export {
   SavedObjectsRepository,
   SavedObjectsDeleteByNamespaceOptions,
   SavedObjectsIncrementCounterOptions,
+  SavedObjectsIncrementCounterField,
   SavedObjectsComplexFieldMapping,
   SavedObjectsCoreFieldMapping,
   SavedObjectsFieldMapping,

src/core/server/saved_objects/index.ts

@@ -48,6 +48,7 @@ export {
 export {
   ISavedObjectsRepository,
   SavedObjectsIncrementCounterOptions,
+  SavedObjectsIncrementCounterField,
   SavedObjectsDeleteByNamespaceOptions,
 } from './service/lib/repository';