Merge branch 'master' into add-query-inputs-to-geo-tracker

Author: kibanamachine

docs/developer/architecture/security/feature-registration.asciidoc

@@ -198,7 +198,10 @@ server.route({
 === Example 3: Discover
 
 Discover takes advantage of subfeature privileges to allow fine-grained access control. In this example,
-a single "Create Short URLs" subfeature privilege is defined, which allows users to grant access to this feature without having to grant the `all` privilege to Discover. In other words, you can grant `read` access to Discover, and also grant the ability to create short URLs.
+two subfeature privileges are defined: "Create Short URLs", and "Generate PDF Reports". These allow users to grant access to this feature without having to grant the `all` privilege to Discover. In other words, you can grant `read` access to Discover, and also grant the ability to create short URLs or generate PDF reports.
+
+Notice the "Generate PDF Reports" subfeature privilege has an additional `minimumPrivilege` option. Kibana will only offer this subfeature privilege if the
+license requirement is satisfied.
 
 ["source","javascript"]
 -----------
@@ -259,6 +262,28 @@ public setup(core, { features }) {
                 },
               ],
             },
+            {
+              groupType: 'independent',
+              privileges: [
+                {
+                  id: 'pdf_generate',
+                  name: i18n.translate(
+                    'xpack.features.ossFeatures.discoverGeneratePDFReportsPrivilegeName',
+                    {
+                      defaultMessage: 'Generate PDF Reports',
+                    }
+                  ),
+                  minimumLicense: 'platinum',
+                  includeIn: 'all',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  api: ['generatePDFReports'],
+                  ui: ['generatePDFReports'],
+                },
+              ],
+            },
           ],
         },
       ],

packages/kbn-telemetry-tools/src/tools/__fixture__/all_extracted_collectors.ts

@@ -0,0 +1,37 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { parsedExternallyDefinedCollector } from './parsed_externally_defined_collector';
+import { parsedImportedSchemaCollector } from './parsed_imported_schema';
+import { parsedImportedUsageInterface } from './parsed_imported_usage_interface';
+import { parsedIndexedInterfaceWithNoMatchingSchema } from './parsed_indexed_interface_with_not_matching_schema';
+import { parsedNestedCollector } from './parsed_nested_collector';
+import { parsedSchemaDefinedWithSpreadsCollector } from './parsed_schema_defined_with_spreads_collector';
+import { parsedWorkingCollector } from './parsed_working_collector';
+import { ParsedUsageCollection } from '../ts_parser';
+
+export const allExtractedCollectors: ParsedUsageCollection[] = [
+  ...parsedExternallyDefinedCollector,
+  ...parsedImportedSchemaCollector,
+  ...parsedImportedUsageInterface,
+  parsedIndexedInterfaceWithNoMatchingSchema,
+  parsedNestedCollector,
+  parsedSchemaDefinedWithSpreadsCollector,
+  parsedWorkingCollector,
+];

packages/kbn-telemetry-tools/src/tools/__fixture__/parsed_indexed_interface_with_not_matching_schema.ts

@@ -36,16 +36,14 @@ export const parsedIndexedInterfaceWithNoMatchingSchema: ParsedUsageCollection =
     fetch: {
       typeName: 'Usage',
       typeDescriptor: {
-        '': {
-          '@@INDEX@@': {
-            count_1: {
-              kind: SyntaxKind.NumberKeyword,
-              type: 'NumberKeyword',
-            },
-            count_2: {
-              kind: SyntaxKind.NumberKeyword,
-              type: 'NumberKeyword',
-            },
+        '@@INDEX@@': {
+          count_1: {
+            kind: SyntaxKind.NumberKeyword,
+            type: 'NumberKeyword',
+          },
+          count_2: {
+            kind: SyntaxKind.NumberKeyword,
+            type: 'NumberKeyword',
           },
         },
       },