Merge branch 'main' into Issue-1319

opensearch-project · Jun 30, 2022 · bf04584 · bf04584
2 parents 95aed38 + a9984f6
commit bf04584
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 16 deletions.
diff --git a/src/core/server/core_usage_data/core_usage_data_service.mock.ts b/src/core/server/core_usage_data/core_usage_data_service.mock.ts
@@ -39,7 +39,7 @@ const createStartContractMock = () => {
       new BehaviorSubject<CoreUsageData>({
         config: {
           opensearch: {
-            apiVersion: 'master',
+            apiVersion: 'main',
             customHeadersConfigured: false,
             healthCheckDelayMs: 2500,
             logQueries: false,

diff --git a/src/core/server/opensearch/legacy/api_types.ts b/src/core/server/opensearch/legacy/api_types.ts
@@ -232,6 +232,7 @@ export interface LegacyAPICaller {
   (endpoint: 'cat.help', params: CatHelpParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['help']>;
   (endpoint: 'cat.indices', params: CatIndicesParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['indices']>;
   (endpoint: 'cat.master', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['master']>;
+  (endpoint: 'cat.cluster_manager', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['master']>;
   (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
   (endpoint: 'cat.nodes', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodes']>;
   (endpoint: 'cat.pendingTasks', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['pendingTasks']>;

diff --git a/src/core/server/opensearch/legacy/cluster_client.test.ts b/src/core/server/opensearch/legacy/cluster_client.test.ts
@@ -48,7 +48,7 @@ const logger = loggingSystemMock.create();
 afterEach(() => jest.clearAllMocks());
 
 test('#constructor creates client with parsed config', () => {
-  const mockOpenSearchClientConfig = { apiVersion: 'opensearch-client-master' };
+  const mockOpenSearchClientConfig = { apiVersion: 'opensearch-client-main' };
   mockParseOpenSearchClientConfig.mockReturnValue(mockOpenSearchClientConfig);
 
   const mockOpenSearchConfig = { apiVersion: 'opensearch-version' } as any;

diff --git a/src/core/server/opensearch/legacy/opensearch_client_config.test.ts b/src/core/server/opensearch/legacy/opensearch_client_config.test.ts
@@ -42,19 +42,20 @@ test('parses minimally specified config', () => {
   expect(
     parseOpenSearchClientConfig(
       {
-        apiVersion: 'master',
+        apiVersion: 'main',
         customHeaders: { xsrf: 'something' },
         logQueries: false,
         sniffOnStart: false,
         sniffOnConnectionFault: false,
         hosts: ['http://localhost/opensearch'],
         requestHeadersWhitelist: [],
       },
+
       logger.get()
     )
   ).toMatchInlineSnapshot(`
     Object {
-      "apiVersion": "master",
+      "apiVersion": "main",
       "hosts": Array [
         Object {
           "headers": Object {
@@ -180,7 +181,7 @@ test('parses config timeouts of moment.Duration type', () => {
   expect(
     parseOpenSearchClientConfig(
       {
-        apiVersion: 'master',
+        apiVersion: 'main',
         customHeaders: { xsrf: 'something' },
         logQueries: false,
         sniffOnStart: false,
@@ -191,11 +192,12 @@ test('parses config timeouts of moment.Duration type', () => {
         hosts: ['http://localhost:9200/opensearch'],
         requestHeadersWhitelist: [],
       },
+
       logger.get()
     )
   ).toMatchInlineSnapshot(`
     Object {
-      "apiVersion": "master",
+      "apiVersion": "main",
       "hosts": Array [
         Object {
           "headers": Object {
@@ -359,7 +361,7 @@ describe('#customHeaders', () => {
     const headerKey = Object.keys(DEFAULT_HEADERS)[0];
     const parsedConfig = parseOpenSearchClientConfig(
       {
-        apiVersion: 'master',
+        apiVersion: 'main',
         customHeaders: { [headerKey]: 'foo' },
         logQueries: false,
         sniffOnStart: false,
@@ -379,7 +381,7 @@ describe('#log', () => {
   test('default logger with #logQueries = false', () => {
     const parsedConfig = parseOpenSearchClientConfig(
       {
-        apiVersion: 'master',
+        apiVersion: 'main',
         customHeaders: { xsrf: 'something' },
         logQueries: false,
         sniffOnStart: false,
@@ -423,7 +425,7 @@ describe('#log', () => {
   test('default logger with #logQueries = true', () => {
     const parsedConfig = parseOpenSearchClientConfig(
       {
-        apiVersion: 'master',
+        apiVersion: 'main',
         customHeaders: { xsrf: 'something' },
         logQueries: true,
         sniffOnStart: false,
@@ -482,7 +484,7 @@ describe('#log', () => {
 
     const parsedConfig = parseOpenSearchClientConfig(
       {
-        apiVersion: 'master',
+        apiVersion: 'main',
         customHeaders: { xsrf: 'something' },
         logQueries: true,
         sniffOnStart: false,

diff --git a/src/core/server/opensearch/opensearch_config.ts b/src/core/server/opensearch/opensearch_config.ts
@@ -212,7 +212,7 @@ export class OpenSearchConfig {
   public readonly ignoreVersionMismatch: boolean;
 
   /**
-   * Version of the OpenSearch (6.7, 7.1 or `master`) client will be connecting to.
+   * Version of the OpenSearch (1.1, 2.1 or `main`) client will be connecting to.
    */
   public readonly apiVersion: string;
 

diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
@@ -1041,9 +1041,11 @@ export interface LegacyAPICaller {
     (endpoint: 'cat.help', params: CatHelpParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['help']>;
     // (undocumented)
     (endpoint: 'cat.indices', params: CatIndicesParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['indices']>;
-    // (undocumented)
+    // @deprecated (undocumented)
     (endpoint: 'cat.master', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['master']>;
     // (undocumented)
+    (endpoint: 'cat.cluster_manager', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['master']>;
+    // (undocumented)
     (endpoint: 'cat.nodeattrs', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodeattrs']>;
     // (undocumented)
     (endpoint: 'cat.nodes', params: CatCommonParams, options?: LegacyCallAPIOptions): ReturnType<Client['cat']['nodes']>;

diff --git a/src/plugins/console/server/lib/spec_definitions/json/generated/cat.cluster_manager.json b/src/plugins/console/server/lib/spec_definitions/json/generated/cat.cluster_manager.json
@@ -0,0 +1,21 @@
+{
+  "cat.cluster_manager": {
+    "url_params": {
+      "format": "",
+      "local": "__flag__",
+      "master_timeout": "",
+      "cluster_manager_timeout": "",
+      "h": [],
+      "help": "__flag__",
+      "s": [],
+      "v": "__flag__"
+    },
+    "methods": [
+      "GET"
+    ],
+    "patterns": [
+      "_cat/cluster_manager"
+    ],
+    "documentation": "https://opensearch.org/docs/latest/opensearch/rest-api/cat/cat-master/"
+  }
+}
diff --git a/test/functional/apps/visualize/_metric_chart.js b/test/functional/apps/visualize/_metric_chart.js
@@ -170,12 +170,15 @@ export default function ({ getService, getPageObjects }) {
       await PageObjects.visEditor.clickGo();
       await retry.try(async function tryingForTime() {
         const metricValue = await PageObjects.visChart.getMetric();
-        expect(percentileMachineRam).to.eql(metricValue);
+        // TODO: Restore when inconsistent values are fixed from https://github.com/opensearch-project/OpenSearch/pull/3634
+        // expect(percentileMachineRam).to.eql(metricValue);
+        expect(percentileMachineRam.slice(0, 5)).to.eql(metricValue.slice(0, 5));
+        expect(percentileMachineRam.slice(13, 15)).to.eql(metricValue.slice(13, 15));
       });
     });
 
     it('should show Percentile Ranks', async function () {
-      const percentileRankBytes = ['2.036%', 'Percentile rank 99 of "memory"'];
+      const percentileRankBytes = ['2.029%', 'Percentile rank 99 of "memory"'];
       log.debug('Aggregation = Percentile Ranks');
       await PageObjects.visEditor.selectAggregation('Percentile Ranks', 'metrics');
       log.debug('Field =  bytes');

diff --git a/test/functional/apps/visualize/_tile_map.js b/test/functional/apps/visualize/_tile_map.js
@@ -259,7 +259,7 @@ export default function ({ getService, getPageObjects }) {
         zoomWarningEnabled = await testSubjects.exists('zoomWarningEnabled');
         log.debug(`Zoom warning enabled: ${zoomWarningEnabled}`);
 
-        const zoomLevel = 9;
+        const zoomLevel = 13;
         for (let i = 0; i < zoomLevel; i++) {
           await PageObjects.tileMap.clickMapZoomIn();
         }
@@ -276,7 +276,7 @@ export default function ({ getService, getPageObjects }) {
         }
       });
 
-      it('should show warning at zoom 10', async () => {
+      it('should show warning at zoom 14', async () => {
         await testSubjects.existOrFail('maxZoomWarning');
       });