Merge branch '7.x' into backport/7.x/pr-98819

elastic · Apr 30, 2021 · bbea34c · bbea34c
2 parents e7a94bb + 9449ef6
commit bbea34c
Show file tree

Hide file tree

Showing 41 changed files with 1,027 additions and 481 deletions.
diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.links.md
@@ -134,6 +134,9 @@ readonly links: {
         readonly visualize: Record<string, string>;
         readonly apis: Readonly<{
             bulkIndexAlias: string;
+            byteSizeUnits: string;
+            createAutoFollowPattern: string;
+            createFollower: string;
             createIndex: string;
             createSnapshotLifecyclePolicy: string;
             createRoleMapping: string;
@@ -153,6 +156,7 @@ readonly links: {
             putIndexTemplateV1: string;
             putWatch: string;
             simulatePipeline: string;
+            timeUnits: string;
             updateTransform: string;
         }>;
         readonly observability: Record<string, string>;

diff --git a/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md b/docs/development/core/public/kibana-plugin-core-public.doclinksstart.md
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
@@ -311,6 +311,9 @@ export class DocLinksService {
         },
         apis: {
           bulkIndexAlias: `${ELASTICSEARCH_DOCS}indices-aliases.html`,
+          byteSizeUnits: `${ELASTICSEARCH_DOCS}common-options.html#byte-units`,
+          createAutoFollowPattern: `${ELASTICSEARCH_DOCS}ccr-put-auto-follow-pattern.html`,
+          createFollower: `${ELASTICSEARCH_DOCS}ccr-put-follow.html`,
           createIndex: `${ELASTICSEARCH_DOCS}indices-create-index.html`,
           createSnapshotLifecyclePolicy: `${ELASTICSEARCH_DOCS}slm-api-put-policy.html`,
           createRoleMapping: `${ELASTICSEARCH_DOCS}security-api-put-role-mapping.html`,
@@ -331,6 +334,7 @@ export class DocLinksService {
           putSnapshotLifecyclePolicy: `${ELASTICSEARCH_DOCS}slm-api-put-policy.html`,
           putWatch: `${ELASTICSEARCH_DOCS}watcher-api-put-watch.html`,
           simulatePipeline: `${ELASTICSEARCH_DOCS}simulate-pipeline-api.html`,
+          timeUnits: `${ELASTICSEARCH_DOCS}common-options.html#time-units`,
           updateTransform: `${ELASTICSEARCH_DOCS}update-transform.html`,
         },
         plugins: {
@@ -529,6 +533,9 @@ export interface DocLinksStart {
     readonly visualize: Record<string, string>;
     readonly apis: Readonly<{
       bulkIndexAlias: string;
+      byteSizeUnits: string;
+      createAutoFollowPattern: string;
+      createFollower: string;
       createIndex: string;
       createSnapshotLifecyclePolicy: string;
       createRoleMapping: string;
@@ -548,6 +555,7 @@ export interface DocLinksStart {
       putIndexTemplateV1: string;
       putWatch: string;
       simulatePipeline: string;
+      timeUnits: string;
       updateTransform: string;
     }>;
     readonly observability: Record<string, string>;

diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
@@ -619,6 +619,9 @@ export interface DocLinksStart {
         readonly visualize: Record<string, string>;
         readonly apis: Readonly<{
             bulkIndexAlias: string;
+            byteSizeUnits: string;
+            createAutoFollowPattern: string;
+            createFollower: string;
             createIndex: string;
             createSnapshotLifecyclePolicy: string;
             createRoleMapping: string;
@@ -638,6 +641,7 @@ export interface DocLinksStart {
             putIndexTemplateV1: string;
             putWatch: string;
             simulatePipeline: string;
+            timeUnits: string;
             updateTransform: string;
         }>;
         readonly observability: Record<string, string>;

diff --git a/...cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js b/...cross_cluster_replication/public/__jest__/client_integration/helpers/setup_environment.js
@@ -8,7 +8,9 @@
 import axios from 'axios';
 import axiosXhrAdapter from 'axios/lib/adapters/xhr';
 
+import { docLinksServiceMock } from '../../../../../../../src/core/public/mocks';
 import { setHttpClient } from '../../../app/services/api';
+import { init as initDocumentation } from '../../../app/services/documentation_links';
 import { init as initHttpRequests } from './http_requests';
 
 export const setupEnvironment = () => {
@@ -17,6 +19,7 @@ export const setupEnvironment = () => {
   const client = axios.create({ adapter: axiosXhrAdapter });
   client.interceptors.response.use(({ data }) => data);
   setHttpClient(client);
+  initDocumentation(docLinksServiceMock.createStartContract());
 
   const { server, httpRequestsMockHelpers } = initHttpRequests();
 

diff --git a/...plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_page_title.js b/...plugins/cross_cluster_replication/public/app/components/auto_follow_pattern_page_title.js
@@ -18,7 +18,7 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { getAutoFollowPatternUrl } from '../services/documentation_links';
+import { documentationLinks } from '../services/documentation_links';
 
 export const AutoFollowPatternPageTitle = ({ title }) => (
   <Fragment>
@@ -36,7 +36,7 @@ export const AutoFollowPatternPageTitle = ({ title }) => (
           <EuiButtonEmpty
             size="s"
             flush="right"
-            href={getAutoFollowPatternUrl()}
+            href={documentationLinks.apis.createAutoFollowPattern}
             target="_blank"
             iconType="help"
             data-test-subj="docsButton"