Merge branch 'master' into uptime-usage-collector-refactor

elastic · Dec 22, 2020 · 3788b87 · 3788b87
2 parents 6231adb + 42c1414
commit 3788b87
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 157 deletions.
diff --git a/package.json b/package.json
@@ -100,7 +100,7 @@
     "@babel/core": "^7.11.6",
     "@babel/runtime": "^7.11.2",
     "@elastic/datemath": "link:packages/elastic-datemath",
-    "@elastic/elasticsearch": "7.10.0",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary",
     "@elastic/ems-client": "7.11.0",
     "@elastic/eui": "30.6.0",
     "@elastic/filesaver": "1.1.2",

diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
@@ -147,6 +147,7 @@ export class DocLinksService {
           featureImportance: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-feature-importance.html`,
           outlierDetectionRoc: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfanalytics-evaluate.html#ml-dfanalytics-roc`,
           regressionEvaluation: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfanalytics-evaluate.html#ml-dfanalytics-regression-evaluation`,
+          classificationAucRoc: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/ml-dfanalytics-evaluate.html#ml-dfanalytics-class-aucroc`,
         },
         transforms: {
           guide: `${ELASTIC_WEBSITE_URL}guide/en/elasticsearch/reference/${DOC_LINK_VERSION}/transforms.html`,

diff --git a/tasks/check_plugins.js b/tasks/check_plugins.js
diff --git a/tasks/docker_docs.js b/tasks/docker_docs.js
diff --git a/tasks/docker_docs/Dockerfile b/tasks/docker_docs/Dockerfile
diff --git a/tasks/docker_docs/docker-compose.yml b/tasks/docker_docs/docker-compose.yml
diff --git a/test/scripts/jenkins_docs.sh b/test/scripts/jenkins_docs.sh
diff --git a/test/scripts/test/xpack_karma.sh b/test/scripts/test/xpack_karma.sh
diff --git a/.../plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx b/.../plugins/ml/public/application/components/saved_objects_warning/saved_objects_warning.tsx
@@ -53,7 +53,7 @@ export const SavedObjectsWarning: FC<Props> = ({ jobType }) => {
         title={
           <FormattedMessage
             id="xpack.ml.jobsList.missingSavedObjectWarning.title"
-            defaultMessage="ML job synchronization needed"
+            defaultMessage="ML job synchronization required"
           />
         }
         color="warning"
@@ -62,13 +62,13 @@ export const SavedObjectsWarning: FC<Props> = ({ jobType }) => {
         <div>
           <FormattedMessage
             id="xpack.ml.jobsList.missingSavedObjectWarning.description"
-            defaultMessage="All jobs require an accompanying saved object. Some jobs are missing their saved object and require synchronization in the {link}."
+            defaultMessage="Some jobs are missing their saved object and require synchronization in {link}."
             values={{
               link: (
                 <EuiLink href={`${basePath.get()}/app/management/insightsAndAlerting/jobsListLink`}>
                   <FormattedMessage
                     id="xpack.ml.jobsList.missingSavedObjectWarning.linkToManagement.link"
-                    defaultMessage="stack management page"
+                    defaultMessage="Stack Management"
                   />
                 </EuiLink>
               ),

diff --git a/yarn.lock b/yarn.lock
@@ -1411,10 +1411,10 @@
   version "0.0.0"
   uid ""
 
-"@elastic/elasticsearch@7.10.0":
-  version "7.10.0"
-  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch/-/elasticsearch-7.10.0.tgz#da105a9c1f14146f9f2cab4e7026cb7949121b8d"
-  integrity sha512-vXtMAQf5/DwqeryQgRriMtnFppJNLc/R7/R0D8E+wG5/kGM5i7mg+Hi7TM4NZEuXgtzZ2a/Nf7aR0vLyrxOK/w==
+"@elastic/elasticsearch@npm:@elastic/elasticsearch-canary@^8.0.0-canary":
+  version "8.0.0-canary.1"
+  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.0.0-canary.1.tgz#5cd0eda62531b71af66a08da6c3cebc26a73d4c0"
+  integrity sha512-VhQ42wH+0OGmHSlc4It3bqGTL7mLuC2RIionJZBIuY5P6lwUMz7goelfyfTHoo+LStxz5QQ8Zt2xcnAnShTBJg==
   dependencies:
     debug "^4.1.1"
     hpagent "^0.1.1"