Updated docs

elastic · Jan 17, 2019 · 38f7574 · 38f7574
1 parent 8b00809
commit 38f7574
Show file tree

Hide file tree

Showing 12 changed files with 6,967 additions and 6,949 deletions.
diff --git a/html/branches.yaml b/html/branches.yaml
@@ -43,31 +43,31 @@ apm-server:
   APM Overview/docs/guide/6.4: 2c112e1ee1907993e56094cd8185ad23c1d74321
   APM Overview/docs/guide/6.5: 3e348a2829202cfda809015795b7f874f86a653f
   APM Overview/docs/guide/6.6: d0067eb4cdde38b763c285ee942c880eb3400896
-  APM Overview/docs/guide/master: 4d73d4f866e83600b43c9068e28fbe15d875dd9f
-  APM Overview/docs/master: 4d73d4f866e83600b43c9068e28fbe15d875dd9f
+  APM Overview/docs/guide/master: e117ca8358d8de2fe1c209a1e190af862e4797eb
+  APM Overview/docs/master: e117ca8358d8de2fe1c209a1e190af862e4797eb
   APM Server Reference/CHANGELOG.asciidoc/6.0: ae191ba5dd9c07cd567cf3f55e7e1433902fb9fc
   APM Server Reference/CHANGELOG.asciidoc/6.1: e5bfd57830cfe07435a1ad057fc61116e6357a06
   APM Server Reference/CHANGELOG.asciidoc/6.2: 9cdb11b74e761c7b5b0a6faae0195f591f57f106
   APM Server Reference/CHANGELOG.asciidoc/6.3: b485c1fe12dcfd9197f3541789aedb2887c14482
   APM Server Reference/CHANGELOG.asciidoc/6.4: 2c112e1ee1907993e56094cd8185ad23c1d74321
   APM Server Reference/CHANGELOG.asciidoc/6.5: 3e348a2829202cfda809015795b7f874f86a653f
   APM Server Reference/CHANGELOG.asciidoc/6.6: d0067eb4cdde38b763c285ee942c880eb3400896
-  APM Server Reference/CHANGELOG.asciidoc/master: 4d73d4f866e83600b43c9068e28fbe15d875dd9f
+  APM Server Reference/CHANGELOG.asciidoc/master: e117ca8358d8de2fe1c209a1e190af862e4797eb
   APM Server Reference/changelogs/6.1: e5bfd57830cfe07435a1ad057fc61116e6357a06
   APM Server Reference/changelogs/6.2: 9cdb11b74e761c7b5b0a6faae0195f591f57f106
   APM Server Reference/changelogs/6.3: b485c1fe12dcfd9197f3541789aedb2887c14482
   APM Server Reference/changelogs/6.4: 2c112e1ee1907993e56094cd8185ad23c1d74321
   APM Server Reference/changelogs/6.5: 3e348a2829202cfda809015795b7f874f86a653f
   APM Server Reference/changelogs/6.6: d0067eb4cdde38b763c285ee942c880eb3400896
-  APM Server Reference/changelogs/master: 4d73d4f866e83600b43c9068e28fbe15d875dd9f
+  APM Server Reference/changelogs/master: e117ca8358d8de2fe1c209a1e190af862e4797eb
   APM Server Reference/docs/6.0: ae191ba5dd9c07cd567cf3f55e7e1433902fb9fc
   APM Server Reference/docs/6.1: e5bfd57830cfe07435a1ad057fc61116e6357a06
   APM Server Reference/docs/6.2: 9cdb11b74e761c7b5b0a6faae0195f591f57f106
   APM Server Reference/docs/6.3: b485c1fe12dcfd9197f3541789aedb2887c14482
   APM Server Reference/docs/6.4: 2c112e1ee1907993e56094cd8185ad23c1d74321
   APM Server Reference/docs/6.5: 3e348a2829202cfda809015795b7f874f86a653f
   APM Server Reference/docs/6.6: d0067eb4cdde38b763c285ee942c880eb3400896
-  APM Server Reference/docs/master: 4d73d4f866e83600b43c9068e28fbe15d875dd9f
+  APM Server Reference/docs/master: e117ca8358d8de2fe1c209a1e190af862e4797eb
 azure-marketplace:
   Deploying with Azure Marketplace and Resource Manager (ARM) template/docs/6.3: 8fe06fb96d2031e7ee16cdd2c65a2f697e2549a6
   Deploying with Azure Marketplace and Resource Manager (ARM) template/docs/6.4: f2f92ae83a316796797cabbf00b50ccdce5ab3cb
@@ -226,7 +226,7 @@ beats:
   Filebeat Reference/CHANGELOG.asciidoc/6.5: 38a485653ad0f2db33e161623da78dd789aa4638
   Filebeat Reference/CHANGELOG.asciidoc/6.6: e05f967b23be71cad20074e47ec6cf0e2de19854
   Filebeat Reference/CHANGELOG.asciidoc/6.x: edc9fbd620f86125f71f646a3a608df3e05bf232
-  Filebeat Reference/CHANGELOG.asciidoc/master: ac6aa323437a8a428aa96f2b6f0d9c287af448b5
+  Filebeat Reference/CHANGELOG.asciidoc/master: c4b2ad857c012aaab40ab4da433cd510b10cbd7c
   Filebeat Reference/filebeat/1.0.1: b68f15488b173fa58dc3db2ddd7030899474fc9d
   Filebeat Reference/filebeat/1.1: 799a4e57c6e952ebec89d2341c593620451f8685
   Filebeat Reference/filebeat/1.2: 46a4c8c93ca8eb0f4ba702bc2f34cb433f0ccea4
@@ -265,8 +265,8 @@ beats:
   Filebeat Reference/filebeat/docs/6.5: 38a485653ad0f2db33e161623da78dd789aa4638
   Filebeat Reference/filebeat/docs/6.6: e05f967b23be71cad20074e47ec6cf0e2de19854
   Filebeat Reference/filebeat/docs/6.x: edc9fbd620f86125f71f646a3a608df3e05bf232
-  Filebeat Reference/filebeat/docs/master: ac6aa323437a8a428aa96f2b6f0d9c287af448b5
-  Filebeat Reference/filebeat/master: ac6aa323437a8a428aa96f2b6f0d9c287af448b5
+  Filebeat Reference/filebeat/docs/master: c4b2ad857c012aaab40ab4da433cd510b10cbd7c
+  Filebeat Reference/filebeat/master: c4b2ad857c012aaab40ab4da433cd510b10cbd7c
   Filebeat Reference/libbeat/docs/1.0.1: b68f15488b173fa58dc3db2ddd7030899474fc9d
   Filebeat Reference/libbeat/docs/1.1: 799a4e57c6e952ebec89d2341c593620451f8685
   Filebeat Reference/libbeat/docs/1.2: 46a4c8c93ca8eb0f4ba702bc2f34cb433f0ccea4
@@ -286,10 +286,10 @@ beats:
   Filebeat Reference/libbeat/docs/6.5: 38a485653ad0f2db33e161623da78dd789aa4638
   Filebeat Reference/libbeat/docs/6.6: e05f967b23be71cad20074e47ec6cf0e2de19854
   Filebeat Reference/libbeat/docs/6.x: edc9fbd620f86125f71f646a3a608df3e05bf232
-  Filebeat Reference/libbeat/docs/master: ac6aa323437a8a428aa96f2b6f0d9c287af448b5
+  Filebeat Reference/libbeat/docs/master: c4b2ad857c012aaab40ab4da433cd510b10cbd7c
   Filebeat Reference/x-pack/filebeat/docs/6.6: e05f967b23be71cad20074e47ec6cf0e2de19854
   Filebeat Reference/x-pack/filebeat/docs/6.x: edc9fbd620f86125f71f646a3a608df3e05bf232
-  Filebeat Reference/x-pack/filebeat/docs/master: ac6aa323437a8a428aa96f2b6f0d9c287af448b5
+  Filebeat Reference/x-pack/filebeat/docs/master: c4b2ad857c012aaab40ab4da433cd510b10cbd7c
   Functionbeat Reference/CHANGELOG.asciidoc/6.5: f8142f4853237e6d2b1f9b3216ab2491a6fb20b0
   Functionbeat Reference/CHANGELOG.asciidoc/6.6: 14dcb2f72f45a300ef00575ea9730ed37099fe59
   Functionbeat Reference/CHANGELOG.asciidoc/6.x: 6374a9b0581ae3ee212b9475bffa6a41ab543401
@@ -686,8 +686,8 @@ elasticsearch:
   Elasticsearch Reference/docs/Versions.asciidoc/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/docs/Versions.asciidoc/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Elasticsearch Reference/docs/Versions.asciidoc/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Elasticsearch Reference/docs/Versions.asciidoc/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/docs/Versions.asciidoc/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/docs/Versions.asciidoc/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/docs/Versions.asciidoc/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/docs/Versions.asciidoc/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Elasticsearch Reference/docs/painless/5.5: b51ac8a7c9dd1bbf6aadeed220e81e214f0b705d
   Elasticsearch Reference/docs/painless/5.6: 5ae45ba6594d0a3adeac9a715b1085a88997b1f0
@@ -697,8 +697,8 @@ elasticsearch:
   Elasticsearch Reference/docs/painless/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/docs/painless/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Elasticsearch Reference/docs/painless/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Elasticsearch Reference/docs/painless/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/docs/painless/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/docs/painless/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/docs/painless/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/docs/painless/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Elasticsearch Reference/docs/reference/0.90: 2f99ae3bf2eef3b61e57d95a58d815cc861b5e13
   Elasticsearch Reference/docs/reference/1.3: 597499a9886e14e3d5c57fe5df479d4d18ed1700
@@ -724,8 +724,8 @@ elasticsearch:
   Elasticsearch Reference/docs/reference/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/docs/reference/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Elasticsearch Reference/docs/reference/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Elasticsearch Reference/docs/reference/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/docs/reference/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/docs/reference/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/docs/reference/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/docs/reference/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Elasticsearch Reference/docs/src/test/cluster/config/5.3: e291e353b34ebb80a7637a0af72e7512164a5674
   Elasticsearch Reference/docs/src/test/cluster/config/5.4: 58267b1343538ff8d1ae4ded4b5ffc84276a6ed8
@@ -737,8 +737,8 @@ elasticsearch:
   Elasticsearch Reference/docs/src/test/cluster/config/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/docs/src/test/cluster/config/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Elasticsearch Reference/docs/src/test/cluster/config/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Elasticsearch Reference/docs/src/test/cluster/config/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/docs/src/test/cluster/config/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/docs/src/test/cluster/config/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/docs/src/test/cluster/config/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/docs/src/test/cluster/config/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Elasticsearch Reference/plugins/examples/5.5: b51ac8a7c9dd1bbf6aadeed220e81e214f0b705d
   Elasticsearch Reference/plugins/examples/5.6: 5ae45ba6594d0a3adeac9a715b1085a88997b1f0
@@ -748,17 +748,17 @@ elasticsearch:
   Elasticsearch Reference/plugins/examples/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/plugins/examples/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Elasticsearch Reference/plugins/examples/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Elasticsearch Reference/plugins/examples/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/plugins/examples/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/plugins/examples/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/plugins/examples/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/plugins/examples/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Elasticsearch Reference/x-pack/docs/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/x-pack/docs/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Elasticsearch Reference/x-pack/docs/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Elasticsearch Reference/x-pack/docs/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/x-pack/docs/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/x-pack/docs/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/x-pack/docs/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/x-pack/docs/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
-  Elasticsearch Reference/x-pack/plugin/sql/qa/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Elasticsearch Reference/x-pack/plugin/sql/qa/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Elasticsearch Reference/x-pack/plugin/sql/qa/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Elasticsearch Reference/x-pack/plugin/sql/qa/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Elasticsearch Reference/x-pack/plugin/sql/qa/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Elasticsearch Reference/x-pack/qa/sql/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Elasticsearch Reference/x-pack/qa/sql/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
@@ -798,8 +798,8 @@ elasticsearch:
   Installation and Upgrade Guide/docs/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Installation and Upgrade Guide/docs/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Installation and Upgrade Guide/docs/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Installation and Upgrade Guide/docs/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Installation and Upgrade Guide/docs/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Installation and Upgrade Guide/docs/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Installation and Upgrade Guide/docs/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Installation and Upgrade Guide/docs/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/6.0: 938c99b9ddec6ad16c9390b97465da327ea8dd53
   Java API/client/rest-high-level/src/test/java/org/elasticsearch/client/6.1: 76e9a6dec1be1bf9529735ac7ba617dd700aca36
@@ -987,14 +987,14 @@ elasticsearch:
   Stack Overview/docs/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Stack Overview/docs/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Stack Overview/docs/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Stack Overview/docs/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Stack Overview/docs/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Stack Overview/docs/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Stack Overview/docs/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Stack Overview/docs/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
   Stack Overview/x-pack/docs/6.3: c61490958ff4ec5474c03dffd1b73c7e9bb26891
   Stack Overview/x-pack/docs/6.4: 36e800d5c33f9c64c283399837436eb8a7aec795
   Stack Overview/x-pack/docs/6.5: ffae246d14e54dfe9cbbcdef30b2a851c7975324
-  Stack Overview/x-pack/docs/6.6: 58899abe59b152d388664cf090cff85c8076ffaa
-  Stack Overview/x-pack/docs/6.x: 25a64bc46699a3193af5560140e678508363559e
+  Stack Overview/x-pack/docs/6.6: 01da8dabddf6bc10a212811fc8cc1387927eed2a
+  Stack Overview/x-pack/docs/6.x: e42b57a8b03a0c82f9d577e8799950fcc72495e7
   Stack Overview/x-pack/docs/master: 6dcb3af4c8300d2d5f5fc9848c2a039956edda5d
 elasticsearch-hadoop:
   Elasticsearch for Apache Hadoop and Spark/docs/src/reference/asciidoc/2.0: a939a9ab102f3cba1e3f23cbab091b5927466e2f
@@ -1079,7 +1079,7 @@ kibana:
   Stack Overview/docs/6.4: 4e7a7f4d31a940e3c71283d919197508a9b88581
   Stack Overview/docs/6.5: 72a2f4e615f29dcde8de00e59888483696665e08
   Stack Overview/docs/6.6: 75a6af377d521401ec94d948db62816c292178fe
-  Stack Overview/docs/6.x: 5aa4b96da60c1e13f798f39062e2c47e8a0ccd5e
+  Stack Overview/docs/6.x: 2c9bfd373913a78cb6b768388ef84708ad4b07fb
   Stack Overview/docs/master: d05fa32f1981829848f0987f75eb0ed25c8367b4
 kibana-cn:
   Kibana 用户手册/docs/cn: 141ff97c8ff1b62c831d2be98741b8e9c905affa
@@ -1124,9 +1124,9 @@ logstash-docs:
   Logstash Reference/docs/5.4: 42ea5f6f9a6fe7867d03444064b3fdca55dd6aff
   Logstash Reference/docs/5.5: af3d5bbada0b8d29a878ac55296669ffb6bbe3a2
   Logstash Reference/docs/5.6: fff661a40d74c4f5ae80cb609f15a8689ef12a68
-  Logstash Reference/docs/6.0: d0b35f4397b537c5ad71999c17f922eb6cb84383
-  Logstash Reference/docs/6.1: b645260c95005ac18b0566a19352bca3b73fbc1b
-  Logstash Reference/docs/6.2: 189584805c285569fdfe404c2deba30fc56bb7f2
+  Logstash Reference/docs/6.0: b58bd68212cd1dd40488490882d0c4160e95867e
+  Logstash Reference/docs/6.1: be926f76fd5c3d1f7532cf6dd56d483097a4a207
+  Logstash Reference/docs/6.2: 2048d6244c411dcc38b6fb37a3afb0f7324673de
   Logstash Reference/docs/6.3: 321e4f695681431fda47e0628fd3bf13cd3e32e9
   Logstash Reference/docs/6.4: ce200bd2a6264e631d90058fb4775c513fbd626e
   Logstash Reference/docs/6.5: 8d762c7e4f94cb9e50d772c99f67d631c3613f84

diff --git a/html/en/apm/server/master/exported-fields-apm-transaction.html b/html/en/apm/server/master/exported-fields-apm-transaction.html
@@ -720,7 +720,7 @@ <h2 class="page-title">Guide template</h2>
 </span></dt><dd><p class="simpara">type: object</p><p class="simpara">A user-defined mapping of groups of marks in milliseconds.</p></dd><dt><span class="term">
 <span class="strong strong"><strong><code class="literal">transaction.marks.*.*</code></strong></span>
 </span></dt><dd>type: object</dd><dt><span class="term">
-<span class="strong strong"><strong><code class="literal">transaction.span_count.dropped.total</code></strong></span>
+<span class="strong strong"><strong><code class="literal">transaction.span_count.dropped</code></strong></span>
 </span></dt><dd><p class="simpara">type: long</p><p class="simpara">The total amount of dropped spans for this transaction.</p></dd></dl></div></div><div class="navfooter"><span class="prev"><a href="exported-fields-apm-span.html">
               « 
               APM Span fields</a>

diff --git a/html/en/apm/server/master/release-notes-head.html b/html/en/apm/server/master/release-notes-head.html
@@ -717,6 +717,8 @@ <h2 class="page-title">Guide template</h2>
 Update response format of the healthcheck handler and prettyfy all JSON responses <a class="ulink" href="https://github.com/elastic/apm-server/pull/1748" target="_top">1748</a>.
 </li><li class="listitem">
 Add transaction.type to error data <a class="ulink" href="https://github.com/elastic/apm-server/pull/1781" target="_top">1781</a>.
+</li><li class="listitem">
+Rename transaction.span_count.dropped.total to transaction.span_count.dropped <a class="ulink" href="https://github.com/elastic/apm-server/pull/1809" target="_top">1809</a>.
 </li></ul></div><h4><a id="_removed"></a>Removed<a href="https://github.com/elastic/apm-server/edit/master/changelogs/head.asciidoc" class="edit_me" title="Edit this page on GitHub" rel="nofollow">edit</a></h4><div class="itemizedlist"><ul class="itemizedlist" type="disc"><li class="listitem">
 Remove support for using dots in tags for experimental metricset endpoint <a class="ulink" href="https://github.com/elastic/apm-server/pull/1712" target="_top">1712</a>.
 </li><li class="listitem">

diff --git a/html/en/apm/server/master/transaction-indices.html b/html/en/apm/server/master/transaction-indices.html
@@ -1029,9 +1029,7 @@ <h2 class="page-title">Guide template</h2>
                 },
                 "sampled": true,
                 "span_count": {
-                    "dropped": {
-                        "total": 55
-                    },
+                    "dropped": 55,
                     "started": 436
                 },
                 "type": "request"