ssl fixes and tests

x-pack/plugins/apm/common/elasticsearch_fieldnames.test.ts

@@ -23,6 +23,11 @@ describe('Transaction', () => {
       name: 'java',
       version: 'agent version',
     },
+    cloud: {
+      availability_zone: 'europe-west1-c',
+      provider: 'gcp',
+      region: 'europe-west1',
+    },
     http: {
       request: { method: 'GET' },
       response: { status_code: 200 },
@@ -74,6 +79,11 @@ describe('Span', () => {
       name: 'java',
       version: 'agent version',
     },
+    cloud: {
+      availability_zone: 'europe-west1-c',
+      provider: 'gcp',
+      region: 'europe-west1',
+    },
     processor: {
       name: 'transaction',
       event: 'span',
@@ -121,6 +131,11 @@ describe('Error', () => {
       name: 'java',
       version: 'agent version',
     },
+    cloud: {
+      availability_zone: 'europe-west1-c',
+      provider: 'gcp',
+      region: 'europe-west1',
+    },
     error: {
       exception: [
         {

x-pack/plugins/apm/dev_docs/telemetry.md

@@ -40,6 +40,9 @@ and/or config/kibana.dev.yml files.
 
 Running the script with `--clear` will delete the index first.
 
+If you're using an Elasticsearch instance without TLS verification (if you have `elasticsearch.ssl.verificationMode: none` set in your kibana.yml)
+you can run the script with `env NODE_TLS_REJECT_UNAUTHORIZED=0` to avoid TLS connection errors.
+
 After running the script you should see sample telemetry data in the "xpack-phone-home" index.
 
 ### Updating Data Telemetry Mappings

x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts

@@ -49,9 +49,8 @@ async function uploadData() {
     ...(httpAuth
       ? {
           auth: { ...httpAuth, username: 'elastic' },
-          ssl: { rejectUnauthorized: false },
         }
-      : { ssl: { rejectUnauthorized: false } }),
+      : {}),
   });
 
   // The new template is the template downloaded from the telemetry repo, with

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.test.ts

@@ -0,0 +1,68 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { tasks } from './tasks';
+import { ApmIndicesConfig } from '../../settings/apm_indices/get_apm_indices';
+
+describe('data telemetry collection tasks', () => {
+  const indices = {
+    'apm_oss.errorIndices': 'apm-8.0.0-error',
+    'apm_oss.metricsIndices': 'apm-8.0.0-metric',
+    'apm_oss.spanIndices': 'apm-8.0.0-span',
+    'apm_oss.transactionIndices': 'apm-8.0.0-transaction',
+  } as ApmIndicesConfig;
+
+  describe('cloud', () => {
+    const cloudTask = tasks.find((task) => task.name === 'cloud');
+
+    it('returns a map of cloud provider data', async () => {
+      const search = jest.fn().mockResolvedValueOnce({
+        aggregations: {
+          availability_zone: {
+            buckets: [
+              { doc_count: 1, key: 'us-west-1' },
+              { doc_count: 1, key: 'europe-west1-c' },
+            ],
+          },
+          provider: {
+            buckets: [
+              { doc_count: 1, key: 'aws' },
+              { doc_count: 1, key: 'gcp' },
+            ],
+          },
+          region: {
+            buckets: [
+              { doc_count: 1, key: 'us-west' },
+              { doc_count: 1, key: 'europe-west1' },
+            ],
+          },
+        },
+      });
+
+      expect(await cloudTask?.executor({ indices, search } as any)).toEqual({
+        cloud: {
+          availability_zone: ['us-west-1', 'europe-west1-c'],
+          provider: ['aws', 'gcp'],
+          region: ['us-west', 'europe-west1'],
+        },
+      });
+    });
+
+    describe('with no results', () => {
+      it('returns an empty map', async () => {
+        const search = jest.fn().mockResolvedValueOnce({});
+
+        expect(await cloudTask?.executor({ indices, search } as any)).toEqual({
+          cloud: {
+            availability_zone: [],
+            provider: [],
+            region: [],
+          },
+        });
+      });
+    });
+  });
+});

x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts

@@ -85,7 +85,7 @@ export const tasks: TelemetryTask[] = [
       const { aggregations } = response;
 
       if (!aggregations) {
-        return { [az]: [], [provider]: [], [region]: [] };
+        return { cloud: { [az]: [], [provider]: [], [region]: [] } };
       }
       const cloud = {
         [az]: getBucketKeys(aggregations[az]),