Merge branch 'master' into task/rename

elastic · Jul 8, 2020 · 9de9bae · 9de9bae
2 parents ee0c117 + 595e9c2
commit 9de9bae
Show file tree

Hide file tree

Showing 160 changed files with 5,750 additions and 1,946 deletions.
diff --git a/...pment/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md b/...pment/plugins/data/public/kibana-plugin-plugins-data-public.querystringinput.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition">>
+QueryStringInput: React.FC<Pick<Props, "query" | "prepend" | "placeholder" | "onChange" | "onBlur" | "onSubmit" | "indexPatterns" | "dataTestSubj" | "screenTitle" | "disableAutoFocus" | "persistedLog" | "bubbleSubmitEvent" | "languageSwitcherPopoverAnchorPosition" | "onChangeQueryInputFocus">>
 ```
diff --git a/package.json b/package.json
@@ -125,6 +125,7 @@
     "@elastic/apm-rum": "^5.2.0",
     "@elastic/charts": "19.8.1",
     "@elastic/datemath": "5.0.3",
+    "@elastic/elasticsearch": "7.8.0",
     "@elastic/ems-client": "7.9.3",
     "@elastic/eui": "24.1.0",
     "@elastic/filesaver": "1.1.2",
@@ -294,7 +295,6 @@
   "devDependencies": {
     "@babel/parser": "^7.10.2",
     "@babel/types": "^7.10.2",
-    "@elastic/elasticsearch": "^7.4.0",
     "@elastic/eslint-config-kibana": "0.15.0",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",

diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json b/packages/kbn-telemetry-tools/src/tools/__fixture__/mock_schema.json
@@ -17,7 +17,18 @@
               "type": "boolean"
             }
           }
-        }
+        },
+        "my_array": {
+          "properties": {
+            "total": {
+              "type": "number"
+            },
+            "type": {
+              "type": "boolean"
+            }
+          }
+        },
+        "my_str_array": { "type": "keyword" }
       }
     }
   }

diff --git a/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts b/packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_working_collector.ts
@@ -40,6 +40,13 @@ export const parsedWorkingCollector: ParsedUsageCollection = [
             type: 'boolean',
           },
         },
+        my_array: {
+          total: {
+            type: 'number',
+          },
+          type: { type: 'boolean' },
+        },
+        my_str_array: { type: 'keyword' },
       },
     },
     fetch: {
@@ -63,6 +70,20 @@ export const parsedWorkingCollector: ParsedUsageCollection = [
             type: 'BooleanKeyword',
           },
         },
+        my_array: {
+          total: {
+            kind: SyntaxKind.NumberKeyword,
+            type: 'NumberKeyword',
+          },
+          type: {
+            kind: SyntaxKind.BooleanKeyword,
+            type: 'BooleanKeyword',
+          },
+        },
+        my_str_array: {
+          kind: SyntaxKind.StringKeyword,
+          type: 'StringKeyword',
+        },
       },
     },
   },

diff --git a/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap b/packages/kbn-telemetry-tools/src/tools/__snapshots__/extract_collectors.test.ts.snap