Merge branch 'master' into expression_repeat_image

# Conflicts: # x-pack/plugins/translations/translations/ja-JP.json # x-pack/plugins/translations/translations/zh-CN.json
elastic · Jul 22, 2021 · b0d2106 · b0d2106
2 parents 3c4bad5 + 1a7469f
commit b0d2106
Show file tree

Hide file tree

Showing 374 changed files with 13,699 additions and 7,573 deletions.
diff --git a/api_docs/alerting.json b/api_docs/alerting.json
@@ -669,19 +669,19 @@
         "children": [
           {
             "parentPluginId": "alerting",
-            "id": "def-server.AlertingApiRequestHandlerContext.getAlertsClient",
+            "id": "def-server.AlertingApiRequestHandlerContext.getRulesClient",
             "type": "Function",
             "tags": [],
-            "label": "getAlertsClient",
+            "label": "getRulesClient",
             "description": [],
             "signature": [
               "() => ",
               {
                 "pluginId": "alerting",
                 "scope": "server",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-server.AlertsClient",
-                "text": "AlertsClient"
+                "section": "def-server.RulesClient",
+                "text": "RulesClient"
               }
             ],
             "source": {
@@ -1170,7 +1170,7 @@
           "<Params>"
         ],
         "source": {
-          "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+          "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
           "lineNumber": 140
         },
         "deprecated": false,
@@ -1183,7 +1183,7 @@
             "label": "page",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 141
             },
             "deprecated": false
@@ -1196,7 +1196,7 @@
             "label": "perPage",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 142
             },
             "deprecated": false
@@ -1209,7 +1209,7 @@
             "label": "total",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 143
             },
             "deprecated": false
@@ -1233,7 +1233,7 @@
               "<Params>, \"enabled\" | \"id\" | \"name\" | \"params\" | \"actions\" | \"tags\" | \"alertTypeId\" | \"consumer\" | \"schedule\" | \"scheduledTaskId\" | \"createdBy\" | \"updatedBy\" | \"createdAt\" | \"updatedAt\" | \"apiKeyOwner\" | \"throttle\" | \"notifyWhen\" | \"muteAll\" | \"mutedInstanceIds\" | \"executionStatus\">[]"
             ],
             "source": {
-              "path": "x-pack/plugins/alerting/server/alerts_client/alerts_client.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client/rules_client.ts",
               "lineNumber": 144
             },
             "deprecated": false
@@ -1343,10 +1343,10 @@
           },
           {
             "parentPluginId": "alerting",
-            "id": "def-server.PluginStartContract.getAlertsClientWithRequest",
+            "id": "def-server.PluginStartContract.getRulesClientWithRequest",
             "type": "Function",
             "tags": [],
-            "label": "getAlertsClientWithRequest",
+            "label": "getRulesClientWithRequest",
             "description": [],
             "signature": [
               "(request: ",
@@ -1362,8 +1362,8 @@
                 "pluginId": "alerting",
                 "scope": "server",
                 "docId": "kibAlertingPluginApi",
-                "section": "def-server.AlertsClient",
-                "text": "AlertsClient"
+                "section": "def-server.RulesClient",
+                "text": "RulesClient"
               },
               ", \"get\" | \"delete\" | \"create\" | \"find\" | \"update\" | \"aggregate\" | \"enable\" | \"disable\" | \"muteAll\" | \"getAlertState\" | \"getAlertInstanceSummary\" | \"updateApiKey\" | \"unmuteAll\" | \"muteInstance\" | \"unmuteInstance\" | \"listAlertTypes\">"
             ],
@@ -1375,7 +1375,7 @@
             "children": [
               {
                 "parentPluginId": "alerting",
-                "id": "def-server.PluginStartContract.getAlertsClientWithRequest.$1",
+                "id": "def-server.PluginStartContract.getRulesClientWithRequest.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "request",
@@ -1571,10 +1571,10 @@
       },
       {
         "parentPluginId": "alerting",
-        "id": "def-server.AlertsClient",
+        "id": "def-server.RulesClient",
         "type": "Type",
         "tags": [],
-        "label": "AlertsClient",
+        "label": "RulesClient",
         "description": [],
         "signature": [
           "{ get: <Params extends Record<string, unknown> = never>({ id, }: { id: string; }) => Promise<Pick<",

diff --git a/api_docs/deprecations.mdx b/api_docs/deprecations.mdx
@@ -26,8 +26,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L8) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L21) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [audit_logger.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/authorization/audit_logger.ts#L23) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L23) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [alerts_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/alerts_client_factory.test.ts#L98) | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L23](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L23) | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.LegacyAuditLogger" text="LegacyAuditLogger"/> | [rules_client_factory.test.ts#L98](https://github.com/elastic/kibana/tree/master/x-pack/plugins/alerting/server/rules_client_factory.test.ts#L98) | - |
 
 
 

diff --git a/api_docs/security.json b/api_docs/security.json
@@ -1739,14 +1739,14 @@
           {
             "plugin": "alerting",
             "link": {
-              "path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
               "lineNumber": 23
             }
           },
           {
             "plugin": "alerting",
             "link": {
-              "path": "x-pack/plugins/alerting/server/alerts_client_factory.test.ts",
+              "path": "x-pack/plugins/alerting/server/rules_client_factory.test.ts",
               "lineNumber": 98
             }
           }

diff --git a/...lopment/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md b/...lopment/plugins/data/public/kibana-plugin-plugins-data-public.es_field_types.md
@@ -50,4 +50,5 @@ export declare enum ES_FIELD_TYPES
 |  TEXT | <code>&quot;text&quot;</code> |  |
 |  TOKEN\_COUNT | <code>&quot;token_count&quot;</code> |  |
 |  UNSIGNED\_LONG | <code>&quot;unsigned_long&quot;</code> |  |
+|  VERSION | <code>&quot;version&quot;</code> |  |
 
diff --git a/...lopment/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md b/...lopment/plugins/data/server/kibana-plugin-plugins-data-server.es_field_types.md
@@ -50,4 +50,5 @@ export declare enum ES_FIELD_TYPES
 |  TEXT | <code>&quot;text&quot;</code> |  |
 |  TOKEN\_COUNT | <code>&quot;token_count&quot;</code> |  |
 |  UNSIGNED\_LONG | <code>&quot;unsigned_long&quot;</code> |  |
+|  VERSION | <code>&quot;version&quot;</code> |  |
 
diff --git a/packages/kbn-rule-data-utils/src/technical_field_names.ts b/packages/kbn-rule-data-utils/src/technical_field_names.ts
@@ -31,6 +31,7 @@ const ALERT_STATUS = `${ALERT_NAMESPACE}.status` as const;
 const SPACE_IDS = 'kibana.space_ids' as const;
 const ALERT_EVALUATION_THRESHOLD = `${ALERT_NAMESPACE}.evaluation.threshold` as const;
 const ALERT_EVALUATION_VALUE = `${ALERT_NAMESPACE}.evaluation.value` as const;
+const ALERT_REASON = `${ALERT_NAMESPACE}.reason` as const;
 
 const fields = {
   TIMESTAMP,
@@ -53,6 +54,7 @@ const fields = {
   ALERT_STATUS,
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
+  ALERT_REASON,
   SPACE_IDS,
 };
 
@@ -77,6 +79,7 @@ export {
   ALERT_STATUS,
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
+  ALERT_REASON,
   SPACE_IDS,
 };
 

diff --git a/packages/kbn-test/src/jest/utils/get_url.ts b/packages/kbn-test/src/jest/utils/get_url.ts
@@ -22,11 +22,6 @@ interface UrlParam {
   username?: string;
 }
 
-interface App {
-  pathname?: string;
-  hash?: string;
-}
-
 /**
  * Converts a config and a pathname to a url
  * @param {object} config A url config
@@ -46,11 +41,11 @@ interface App {
  * @return {string}
  */
 
-function getUrl(config: UrlParam, app: App) {
+function getUrl(config: UrlParam, app: UrlParam) {
   return url.format(_.assign({}, config, app));
 }
 
-getUrl.noAuth = function getUrlNoAuth(config: UrlParam, app: App) {
+getUrl.noAuth = function getUrlNoAuth(config: UrlParam, app: UrlParam) {
   config = _.pickBy(config, function (val, param) {
     return param !== 'auth';
   });

diff --git a/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts b/src/plugins/data/common/kbn_field_types/kbn_field_types_factory.ts
@@ -22,6 +22,7 @@ export const createKbnFieldTypes = (): KbnFieldType[] => [
       ES_FIELD_TYPES.STRING,
       ES_FIELD_TYPES.TEXT,
       ES_FIELD_TYPES.KEYWORD,
+      ES_FIELD_TYPES.VERSION,
       ES_FIELD_TYPES._TYPE,
       ES_FIELD_TYPES._ID,
     ],

diff --git a/src/plugins/data/common/kbn_field_types/types.ts b/src/plugins/data/common/kbn_field_types/types.ts
@@ -24,6 +24,7 @@ export enum ES_FIELD_TYPES {
   STRING = 'string',
   TEXT = 'text',
   KEYWORD = 'keyword',
+  VERSION = 'version',
 
   BOOLEAN = 'boolean',
   OBJECT = 'object',

diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
@@ -785,7 +785,9 @@ export enum ES_FIELD_TYPES {
     // (undocumented)
     _TYPE = "_type",
     // (undocumented)
-    UNSIGNED_LONG = "unsigned_long"
+    UNSIGNED_LONG = "unsigned_long",
+    // (undocumented)
+    VERSION = "version"
 }
 
 // Warning: (ae-missing-release-tag) "ES_SEARCH_STRATEGY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)

diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
@@ -430,7 +430,9 @@ export enum ES_FIELD_TYPES {
     // (undocumented)
     _TYPE = "_type",
     // (undocumented)
-    UNSIGNED_LONG = "unsigned_long"
+    UNSIGNED_LONG = "unsigned_long",
+    // (undocumented)
+    VERSION = "version"
 }
 
 // Warning: (ae-missing-release-tag) "ES_SEARCH_STRATEGY" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)

diff --git a/src/plugins/discover/public/application/angular/doc_table/_doc_table.scss b/src/plugins/discover/public/application/angular/doc_table/_doc_table.scss
@@ -33,10 +33,6 @@ doc-table {
   th {
     white-space: nowrap;
     padding-right: $euiSizeS;
-
-    .fa {
-      font-size: 1.1em;
-    }
   }
 }
 
@@ -134,25 +130,3 @@ doc-table {
     }
   }
 }
-
-table {
-  th {
-    i.fa-sort {
-      color: $euiColorLightShade;
-    }
-
-    button.fa-sort-asc,
-    button.fa-sort-down,
-    i.fa-sort-asc,
-    i.fa-sort-down {
-      color: $euiColorPrimary;
-    }
-
-    button.fa-sort-desc,
-    button.fa-sort-up,
-    i.fa-sort-desc,
-    i.fa-sort-up {
-      color: $euiColorPrimary;
-    }
-  }
-}
diff --git a/src/plugins/discover/public/application/angular/doc_table/components/_table_header.scss b/src/plugins/discover/public/application/angular/doc_table/components/_table_header.scss
@@ -2,7 +2,7 @@
   white-space: nowrap;
 }
 .kbnDocTableHeader button {
-  margin-left: $euiSizeXS;
+  margin-left: $euiSizeXS * .5;
 }
 .kbnDocTableHeader__move,
 .kbnDocTableHeader__sortChange {
@@ -12,3 +12,7 @@
     opacity: 1;
   }
 }
+.kbnDocTableHeader__actions {
+  display: flex;
+  align-items: center;
+}
diff --git a/...ion/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap b/...ion/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_buttons.test.tsx.snap
diff --git a/...cation/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap b/...cation/angular/doc_table/components/pager/__snapshots__/tool_bar_pager_text.test.tsx.snap