elastic · nik9000 · Jun 18, 2018 · Jun 5, 2018 · Jun 11, 2018 · Jun 11, 2018
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy
@@ -32,6 +32,8 @@ public class DocsTestPlugin extends RestTestPlugin {
     public void apply(Project project) {
         project.pluginManager.apply('elasticsearch.standalone-rest-test')
         super.apply(project)
+        // The distribution can be configured with -Dtests.distribution on the command line
+        project.integTestCluster.distribution = System.getProperty('tests.distribution', 'zip')
         // Docs are published separately so no need to assemble
         project.tasks.remove(project.assemble)
         project.build.dependsOn.remove('assemble')
@@ -43,6 +45,8 @@ public class DocsTestPlugin extends RestTestPlugin {
             '\\{version\\}':
                 VersionProperties.elasticsearch.toString().replace('-SNAPSHOT', ''),
             '\\{lucene_version\\}' : VersionProperties.lucene.replaceAll('-snapshot-\\w+$', ''),
+            '\\{build_flavor\\}' :
+                project.integTestCluster.distribution.startsWith('oss-') ? 'oss' : 'default',
         ]
         Task listSnippets = project.tasks.create('listSnippets', SnippetsTask)
         listSnippets.group 'Docs'

diff --git a/docs/Versions.asciidoc b/docs/Versions.asciidoc
@@ -5,6 +5,7 @@
 :branch:                master
 :jdk:                   1.8.0_131
 :jdk_major:             8
+:build_flavor:          default
 
 //////////
 release-state can be: released | prerelease | unreleased

diff --git a/docs/build.gradle b/docs/build.gradle
@@ -20,7 +20,6 @@
 apply plugin: 'elasticsearch.docs-test'
 
 integTestCluster {
-  distribution = 'oss-zip'
   /* Enable regexes in painless so our tests don't complain about example
    * snippets that use them. */
   setting 'script.painless.regex.enabled', 'true'

diff --git a/docs/plugins/discovery-azure-classic.asciidoc b/docs/plugins/discovery-azure-classic.asciidoc
@@ -372,7 +372,7 @@ This command should give you a JSON result:
   "cluster_uuid" : "AT69_T_DTp-1qgIJlatQqA",
   "version" : {
     "number" : "{version}",
-    "build_flavor" : "oss",
+    "build_flavor" : "{build_flavor}",
     "build_type" : "zip",
     "build_hash" : "f27399d",
     "build_date" : "2016-03-30T09:51:41.449Z",

diff --git a/docs/reference/cat/nodeattrs.asciidoc b/docs/reference/cat/nodeattrs.asciidoc
@@ -9,15 +9,18 @@ For example:
 GET /_cat/nodeattrs?v
 --------------------------------------------------
 // CONSOLE
+// TEST[s/\?v/\?v&s=node,attr/]
 
 Could look like:
 
 [source,txt]
 --------------------------------------------------
 node    host      ip        attr     value
-EK_AsJb 127.0.0.1 127.0.0.1 testattr test
+...
+node-0 127.0.0.1 127.0.0.1 testattr test
+...
 --------------------------------------------------
-// TESTRESPONSE[s/EK_AsJb/.+/ _cat]
+// TESTRESPONSE[s/\.\.\.\n$/\n(.+ xpack\\.installed true\n)?\n/ s/\.\.\.\n/(.+ ml\\..+\n)*/ _cat]
 
 The first few columns (`node`, `host`, `ip`) give you basic info per node
 and the `attr` and `value` columns give you the custom node attributes,
@@ -46,6 +49,7 @@ mode (`v`). The header name will match the supplied value (e.g.,
 GET /_cat/nodeattrs?v&h=name,pid,attr,value
 --------------------------------------------------
 // CONSOLE
+// TEST[s/,value/,value&s=node,attr/]
 
 Might look like:
 
@@ -54,7 +58,8 @@ Might look like:
 name    pid   attr     value
 EK_AsJb 19566 testattr test
 --------------------------------------------------
-// TESTRESPONSE[s/EK_AsJb/.+/ s/19566/\\d*/ _cat]
+// TESTRESPONSE[s/19566/\\d*/]
+// TESTRESPONSE[s/EK_AsJb/(.+ml\\..+\n)*.+/ s/\n$/\n(.+xpack\\.installed true\n)?\n/ _cat]
 
 [cols="<,<,<,<,<",options="header",subs="normal"]
 |=======================================================================

diff --git a/docs/reference/cat/templates.asciidoc b/docs/reference/cat/templates.asciidoc
@@ -8,6 +8,7 @@ The `templates` command provides information about existing templates.
 GET /_cat/templates?v&s=name
 --------------------------------------------------
 // CONSOLE
+// TEST[s/templates/templates\/template*/]
 // TEST[s/^/PUT _template\/template0\n{"index_patterns": "te*", "order": 0}\n/]
 // TEST[s/^/PUT _template\/template1\n{"index_patterns": "tea*", "order": 1}\n/]
 // TEST[s/^/PUT _template\/template2\n{"index_patterns": "teak*", "order": 2, "version": 7}\n/]

diff --git a/docs/reference/cat/thread_pool.asciidoc b/docs/reference/cat/thread_pool.asciidoc
@@ -18,17 +18,10 @@ node-0 analyze             0 0 0
 node-0 fetch_shard_started 0 0 0
 node-0 fetch_shard_store   0 0 0
 node-0 flush               0 0 0
-node-0 force_merge         0 0 0
-node-0 generic             0 0 0
-node-0 get                 0 0 0
-node-0 listener            0 0 0
-node-0 management          1 0 0
-node-0 refresh             0 0 0
-node-0 search              0 0 0
-node-0 snapshot            0 0 0
-node-0 warmer              0 0 0
+...
 node-0 write               0 0 0
 --------------------------------------------------
+// TESTRESPONSE[s/\.\.\./(node-0 .+ 0 0 0\n)+/]
 // TESTRESPONSE[s/\d+/\\d+/ _cat]
 
 The first column is the node name
@@ -52,10 +45,16 @@ generic
 get
 listener
 management
+ml_autodetect (default distro only)
+ml_datafeed (default distro only)
+ml_utility (default distro only)
 refresh
+rollup_indexing (default distro only)`
 search
+security-token-key (default distro only)
 snapshot
 warmer
+watcher (default distro only)
 write
 --------------------------------------------------
 

diff --git a/docs/reference/cluster/nodes-info.asciidoc b/docs/reference/cluster/nodes-info.asciidoc
@@ -142,7 +142,7 @@ The result will look similar to:
       "host": "node-0.elastic.co",
       "ip": "192.168.17",
       "version": "{version}",
-      "build_flavor": "oss",
+      "build_flavor": "{build_flavor}",
       "build_type": "zip",
       "build_hash": "587409e",
       "roles": [
@@ -237,7 +237,7 @@ The result will look similar to:
       "host": "node-0.elastic.co",
       "ip": "192.168.17",
       "version": "{version}",
-      "build_flavor": "oss",
+      "build_flavor": "{build_flavor}",
       "build_type": "zip",
       "build_hash": "587409e",
       "roles": [],

diff --git a/docs/reference/cluster/stats.asciidoc b/docs/reference/cluster/stats.asciidoc
@@ -192,23 +192,18 @@ Will return, for example:
           "description": "Ingest processor that extracts information from a user agent",
           "classname": "org.elasticsearch.ingest.useragent.IngestUserAgentPlugin",
           "has_native_controller": false
-        }
+        },
+        ...
       ],
-      "network_types" : {
-         "transport_types" : {
-            "netty4" : 1
-         },
-         "http_types" : {
-            "netty4" : 1
-         }
-      }
+      ...
    }
 }
 --------------------------------------------------
 // TESTRESPONSE[s/"plugins": \[[^\]]*\]/"plugins": $body.$_path/]
 // TESTRESPONSE[s/: (\-)?[0-9]+/: $body.$_path/]
+// TESTRESPONSE[s/\.\.\./"network_types": "replace_me"/]
 // TESTRESPONSE[s/: "[^"]*"/: $body.$_path/]
 ////
 The TESTRESPONSE above replace all the fields values by the expected ones in the test,
 because we don't really care about the field values but we want to check the fields names.
-////
+////
diff --git a/docs/reference/setup/install/check-running.asciidoc b/docs/reference/setup/install/check-running.asciidoc
@@ -19,7 +19,7 @@ which should give you a response something like this:
   "cluster_uuid" : "AT69_T_DTp-1qgIJlatQqA",
   "version" : {
     "number" : "{version}",
-    "build_flavor" : "oss",
+    "build_flavor" : "{build_flavor}",
     "build_type" : "zip",
     "build_hash" : "f27399d",
     "build_date" : "2016-03-30T09:51:41.449Z",