Merge remote-tracking branch 'upstream/7.x' into backport/7.x/pr-83899

Author: mshustov

package.json

@@ -89,6 +89,7 @@
     "**/load-grunt-config/lodash": "^4.17.20",
     "**/minimist": "^1.2.5",
     "**/node-jose/node-forge": "^0.10.0",
+    "**/prismjs": "1.22.0",
     "**/request": "^2.88.2",
     "**/trim": "0.0.3",
     "**/typescript": "4.0.2"

src/plugins/telemetry/public/services/telemetry_service.test.ts

@@ -17,31 +17,20 @@
  * under the License.
  */
 
+// ESLint disabled dot-notation we can access the private key telemetryService['http']
 /* eslint-disable dot-notation */
-const mockMomentValueOf = jest.fn();
-
-jest.mock('moment', () => {
-  return jest.fn().mockImplementation(() => {
-    return {
-      valueOf: mockMomentValueOf,
-    };
-  });
-});
 
 import { mockTelemetryService } from '../mocks';
 
 describe('TelemetryService', () => {
   describe('fetchTelemetry', () => {
     it('calls expected URL with 20 minutes - now', async () => {
-      const timestamp = Date.now();
-      mockMomentValueOf.mockReturnValueOnce(timestamp);
       const telemetryService = mockTelemetryService();
 
       await telemetryService.fetchTelemetry();
       expect(telemetryService['http'].post).toBeCalledWith('/api/telemetry/v2/clusters/_stats', {
-        body: JSON.stringify({ unencrypted: false, timestamp }),
+        body: JSON.stringify({ unencrypted: false }),
       });
-      expect(mockMomentValueOf).toBeCalled();
     });
   });
 

src/plugins/telemetry/public/services/telemetry_service.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import { CoreStart } from 'kibana/public';
 import { TelemetryPluginConfig } from '../plugin';
@@ -124,7 +123,6 @@ export class TelemetryService {
     return this.http.post('/api/telemetry/v2/clusters/_stats', {
       body: JSON.stringify({
         unencrypted,
-        timestamp: moment().valueOf(),
       }),
     });
   };

src/plugins/telemetry/server/routes/telemetry_opt_in.ts

@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import moment from 'moment';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { schema } from '@kbn/config-schema';
@@ -86,7 +85,6 @@ export function registerTelemetryOptInRoutes({
       }
 
       const statsGetterConfig: StatsGetterConfig = {
-        timestamp: moment().valueOf(),
         unencrypted: false,
       };
 

src/plugins/telemetry/server/routes/telemetry_opt_in_stats.ts

@@ -19,7 +19,6 @@
 
 // @ts-ignore
 import fetch from 'node-fetch';
-import moment from 'moment';
 
 import { IRouter } from 'kibana/server';
 import { schema } from '@kbn/config-schema';
@@ -72,7 +71,6 @@ export function registerTelemetryOptInStatsRoutes(
         const unencrypted = req.body.unencrypted;
 
         const statsGetterConfig: StatsGetterConfig = {
-          timestamp: moment().valueOf(),
           unencrypted,
           request: req,
         };

src/plugins/telemetry/server/routes/telemetry_usage_stats.ts

@@ -17,21 +17,13 @@
  * under the License.
  */
 
-import moment from 'moment';
 import { schema } from '@kbn/config-schema';
-import { TypeOptions } from '@kbn/config-schema/target/types/types';
 import { IRouter } from 'kibana/server';
 import {
   TelemetryCollectionManagerPluginSetup,
   StatsGetterConfig,
 } from 'src/plugins/telemetry_collection_manager/server';
 
-const validate: TypeOptions<string | number>['validate'] = (value) => {
-  if (!moment(value).isValid()) {
-    return `${value} is not a valid date`;
-  }
-};
-
 export function registerTelemetryUsageStatsRoutes(
   router: IRouter,
   telemetryCollectionManager: TelemetryCollectionManagerPluginSetup,
@@ -43,16 +35,14 @@ export function registerTelemetryUsageStatsRoutes(
       validate: {
         body: schema.object({
           unencrypted: schema.boolean({ defaultValue: false }),
-          timestamp: schema.oneOf([schema.string({ validate }), schema.number({ validate })]),
         }),
       },
     },
     async (context, req, res) => {
-      const { unencrypted, timestamp } = req.body;
+      const { unencrypted } = req.body;
 
       try {
         const statsConfig: StatsGetterConfig = {
-          timestamp: moment(timestamp).valueOf(),
           request: req,
           unencrypted,
         };

src/plugins/telemetry_collection_manager/server/plugin.ts

@@ -144,7 +144,7 @@ export class TelemetryCollectionManagerPlugin
     collectionSoService: SavedObjectsServiceStart,
     usageCollection: UsageCollectionSetup
   ): StatsCollectionConfig {
-    const { timestamp, request } = config;
+    const { request } = config;
 
     const callCluster = config.unencrypted
       ? collection.esCluster.asScoped(request).callAsCurrentUser
@@ -160,7 +160,7 @@ export class TelemetryCollectionManagerPlugin
     // Provide the kibanaRequest so opted-in plugins can scope their custom clients only if the request is not encrypted
     const kibanaRequest = config.unencrypted ? request : void 0;
 
-    return { callCluster, timestamp, usageCollection, esClient, soClient, kibanaRequest };
+    return { callCluster, usageCollection, esClient, soClient, kibanaRequest };
   }
 
   private async getOptInStats(optInStatus: boolean, config: StatsGetterConfig) {

src/plugins/telemetry_collection_manager/server/types.ts

@@ -56,7 +56,6 @@ export interface TelemetryOptInStats {
 
 export interface BaseStatsGetterConfig {
   unencrypted: boolean;
-  timestamp: number;
   request?: KibanaRequest;
 }
 
@@ -76,7 +75,6 @@ export interface ClusterDetails {
 export interface StatsCollectionConfig {
   usageCollection: UsageCollectionSetup;
   callCluster: LegacyAPICaller;
-  timestamp: number;
   esClient: ElasticsearchClient;
   soClient: SavedObjectsClientContract | ISavedObjectsRepository;
   kibanaRequest: KibanaRequest | undefined; // intentionally `| undefined` to enforce providing the parameter

test/api_integration/apis/telemetry/telemetry_local.js

@@ -53,12 +53,10 @@ export default function ({ getService }) {
     });
 
     it('should pull local stats and validate data types', async () => {
-      const timestamp = '2018-07-23T22:13:00Z';
-
       const { body } = await supertest
         .post('/api/telemetry/v2/clusters/_stats')
         .set('kbn-xsrf', 'xxx')
-        .send({ timestamp, unencrypted: true })
+        .send({ unencrypted: true })
         .expect(200);
 
       expect(body.length).to.be(1);
@@ -95,12 +93,10 @@ export default function ({ getService }) {
     });
 
     it('should pull local stats and validate fields', async () => {
-      const timestamp = '2018-07-23T22:13:00Z';
-
       const { body } = await supertest
         .post('/api/telemetry/v2/clusters/_stats')
         .set('kbn-xsrf', 'xxx')
-        .send({ timestamp, unencrypted: true })
+        .send({ unencrypted: true })
         .expect(200);
 
       const stats = body[0];
@@ -150,8 +146,6 @@ export default function ({ getService }) {
     });
 
     describe('application usage limits', () => {
-      const timestamp = '2018-07-23T22:13:00Z';
-
       function createSavedObject() {
         return supertest
           .post('/api/saved_objects/application_usage_transactional')
@@ -182,7 +176,7 @@ export default function ({ getService }) {
           const { body } = await supertest
             .post('/api/telemetry/v2/clusters/_stats')
             .set('kbn-xsrf', 'xxx')
-            .send({ timestamp, unencrypted: true })
+            .send({ unencrypted: true })
             .expect(200);
 
           expect(body.length).to.be(1);
@@ -233,7 +227,7 @@ export default function ({ getService }) {
           const { body } = await supertest
             .post('/api/telemetry/v2/clusters/_stats')
             .set('kbn-xsrf', 'xxx')
-            .send({ timestamp, unencrypted: true })
+            .send({ unencrypted: true })
             .expect(200);
 
           expect(body.length).to.be(1);

test/functional/services/common/browser.ts

@@ -197,6 +197,18 @@ export async function BrowserProvider({ getService }: FtrProviderContext) {
       return await driver.get(url);
     }
 
+    /**
+     * Retrieves the cookie with the given name. Returns null if there is no such cookie. The cookie will be returned as
+     * a JSON object as described by the WebDriver wire protocol.
+     * https://www.selenium.dev/selenium/docs/api/javascript/module/selenium-webdriver/lib/webdriver_exports_Options.html
+     *
+     * @param {string} cookieName
+     * @return {Promise<IWebDriverCookie>}
+     */
+    public async getCookie(cookieName: string) {
+      return await driver.manage().getCookie(cookieName);
+    }
+
     /**
      * Moves the remote environment’s mouse cursor to the specified point {x, y} which is
      * offset to browser page top left corner.