Merge branch 'master' of github.com:elastic/elasticsearch-py

elastic · Sep 17, 2019 · edb4de7 · edb4de7
2 parents 4244f88 + 243e214
commit edb4de7
Show file tree

Hide file tree

Showing 53 changed files with 889 additions and 1 deletion.
diff --git a/elasticsearch/client/indices.py b/elasticsearch/client/indices.py
@@ -80,7 +80,8 @@ def flush(self, index=None, params=None):
 
     @query_params(
         "master_timeout",
-        "timeout" "request_timeout",
+        "timeout",
+        "request_timeout",
         "wait_for_active_shards",
         "include_type_name",
     )

diff --git a/example/docs/asciidoc/.gitignore b/example/docs/asciidoc/.gitignore
@@ -0,0 +1,2 @@
+_*.asciidoc
+_*.adoc
diff --git a/example/docs/asciidoc/Docs/Delete/47b5ff897f26e9c943cee5c06034181d.adoc b/example/docs/asciidoc/Docs/Delete/47b5ff897f26e9c943cee5c06034181d.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Delete.py[tag=47b5ff897f26e9c943cee5c06034181d,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Delete/c5e5873783246c7b1c01d8464fed72c4.adoc b/example/docs/asciidoc/Docs/Delete/c5e5873783246c7b1c01d8464fed72c4.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Delete.py[tag=c5e5873783246c7b1c01d8464fed72c4,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Delete/d90a84a24a407731dfc1929ac8327746.adoc b/example/docs/asciidoc/Docs/Delete/d90a84a24a407731dfc1929ac8327746.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Delete.py[tag=d90a84a24a407731dfc1929ac8327746,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/0ba0b2db24852abccb7c0fc1098d566e.adoc b/example/docs/asciidoc/Docs/Get/0ba0b2db24852abccb7c0fc1098d566e.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=0ba0b2db24852abccb7c0fc1098d566e,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/138ccd89f72aa7502dd9578403dcc589.adoc b/example/docs/asciidoc/Docs/Get/138ccd89f72aa7502dd9578403dcc589.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=138ccd89f72aa7502dd9578403dcc589,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/1d65cb6d055c46a1bde809687d835b71.adoc b/example/docs/asciidoc/Docs/Get/1d65cb6d055c46a1bde809687d835b71.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=1d65cb6d055c46a1bde809687d835b71,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/5eabcdbf61bfcb484dc694f25c2bba36.adoc b/example/docs/asciidoc/Docs/Get/5eabcdbf61bfcb484dc694f25c2bba36.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=5eabcdbf61bfcb484dc694f25c2bba36,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/69a7be47f85138b10437113ab2f0d72d.adoc b/example/docs/asciidoc/Docs/Get/69a7be47f85138b10437113ab2f0d72d.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=69a7be47f85138b10437113ab2f0d72d,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/710c7871f20f176d51209b1574b0d61b.adoc b/example/docs/asciidoc/Docs/Get/710c7871f20f176d51209b1574b0d61b.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=710c7871f20f176d51209b1574b0d61b,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/745f9b8cdb8e91073f6e520e1d9f8c05.adoc b/example/docs/asciidoc/Docs/Get/745f9b8cdb8e91073f6e520e1d9f8c05.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=745f9b8cdb8e91073f6e520e1d9f8c05,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/89a8ac1509936acc272fc2d72907bc45.adoc b/example/docs/asciidoc/Docs/Get/89a8ac1509936acc272fc2d72907bc45.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=89a8ac1509936acc272fc2d72907bc45,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/8fdf2344c4fb3de6902ad7c5735270df.adoc b/example/docs/asciidoc/Docs/Get/8fdf2344c4fb3de6902ad7c5735270df.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=8fdf2344c4fb3de6902ad7c5735270df,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/98234499cfec70487cec5d013e976a84.adoc b/example/docs/asciidoc/Docs/Get/98234499cfec70487cec5d013e976a84.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=98234499cfec70487cec5d013e976a84,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/d222c6a6ec7a3beca6c97011b0874512.adoc b/example/docs/asciidoc/Docs/Get/d222c6a6ec7a3beca6c97011b0874512.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=d222c6a6ec7a3beca6c97011b0874512,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Get/fbcf5078a6a9e09790553804054c36b3.adoc b/example/docs/asciidoc/Docs/Get/fbcf5078a6a9e09790553804054c36b3.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Get.py[tag=fbcf5078a6a9e09790553804054c36b3,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/048d8abd42d094bbdcf4452a58ccb35b.adoc b/example/docs/asciidoc/Docs/Index/048d8abd42d094bbdcf4452a58ccb35b.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=048d8abd42d094bbdcf4452a58ccb35b,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/1f336ecc62480c1d56351cc2f82d0d08.adoc b/example/docs/asciidoc/Docs/Index/1f336ecc62480c1d56351cc2f82d0d08.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=1f336ecc62480c1d56351cc2f82d0d08,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/36818c6d9f434d387819c30bd9addb14.adoc b/example/docs/asciidoc/Docs/Index/36818c6d9f434d387819c30bd9addb14.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=36818c6d9f434d387819c30bd9addb14,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/625dc94df1f9affb49a082fd99d41620.adoc b/example/docs/asciidoc/Docs/Index/625dc94df1f9affb49a082fd99d41620.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=625dc94df1f9affb49a082fd99d41620,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/b918d6b798da673a33e49b94f61dcdc0.adoc b/example/docs/asciidoc/Docs/Index/b918d6b798da673a33e49b94f61dcdc0.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=b918d6b798da673a33e49b94f61dcdc0,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/bb143628fd04070683eeeadc9406d9cc.adoc b/example/docs/asciidoc/Docs/Index/bb143628fd04070683eeeadc9406d9cc.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=bb143628fd04070683eeeadc9406d9cc,indent=0]
+----
diff --git a/example/docs/asciidoc/Docs/Index/d718b63cf1b6591a1d59a0cf4fd995eb.adoc b/example/docs/asciidoc/Docs/Index/d718b63cf1b6591a1d59a0cf4fd995eb.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../src/Examples/Docs/Docs/Index.py[tag=d718b63cf1b6591a1d59a0cf4fd995eb,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/0caf6b6b092ecbcf6f996053678a2384.adoc b/example/docs/asciidoc/GettingStarted/0caf6b6b092ecbcf6f996053678a2384.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=0caf6b6b092ecbcf6f996053678a2384,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/193864342d9f0a36ec84a91ca325f5ec.adoc b/example/docs/asciidoc/GettingStarted/193864342d9f0a36ec84a91ca325f5ec.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=193864342d9f0a36ec84a91ca325f5ec,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/1c0f3b0bc4b7e53b53755fd3bda5b8cf.adoc b/example/docs/asciidoc/GettingStarted/1c0f3b0bc4b7e53b53755fd3bda5b8cf.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=1c0f3b0bc4b7e53b53755fd3bda5b8cf,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/21fe98843fe0b5473f515d21803db409.adoc b/example/docs/asciidoc/GettingStarted/21fe98843fe0b5473f515d21803db409.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=21fe98843fe0b5473f515d21803db409,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/345ea7e9cb5af9e052ce0cf6f1f52c23.adoc b/example/docs/asciidoc/GettingStarted/345ea7e9cb5af9e052ce0cf6f1f52c23.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=345ea7e9cb5af9e052ce0cf6f1f52c23,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/37a3b66b555aed55618254f50d572cd6.adoc b/example/docs/asciidoc/GettingStarted/37a3b66b555aed55618254f50d572cd6.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=37a3b66b555aed55618254f50d572cd6,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/37c778346eb67042df5e8edf2485e40a.adoc b/example/docs/asciidoc/GettingStarted/37c778346eb67042df5e8edf2485e40a.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=37c778346eb67042df5e8edf2485e40a,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/3c31f9eb032861bff64abd8b14758991.adoc b/example/docs/asciidoc/GettingStarted/3c31f9eb032861bff64abd8b14758991.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=3c31f9eb032861bff64abd8b14758991,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/3d7527bb7ac3b0e1f97b22bdfeb99070.adoc b/example/docs/asciidoc/GettingStarted/3d7527bb7ac3b0e1f97b22bdfeb99070.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=3d7527bb7ac3b0e1f97b22bdfeb99070,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/506844befdc5691d835771bcbb1c1a60.adoc b/example/docs/asciidoc/GettingStarted/506844befdc5691d835771bcbb1c1a60.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=506844befdc5691d835771bcbb1c1a60,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/6a8d7b34f2b42d5992aaa1ff147062d9.adoc b/example/docs/asciidoc/GettingStarted/6a8d7b34f2b42d5992aaa1ff147062d9.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=6a8d7b34f2b42d5992aaa1ff147062d9,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/731621af937d66170347b9cc6b4a3c48.adoc b/example/docs/asciidoc/GettingStarted/731621af937d66170347b9cc6b4a3c48.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=731621af937d66170347b9cc6b4a3c48,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/75bda7da7fefff2c16f0423a9aa41c6e.adoc b/example/docs/asciidoc/GettingStarted/75bda7da7fefff2c16f0423a9aa41c6e.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=75bda7da7fefff2c16f0423a9aa41c6e,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/7d32a32357b5ea8819b72608fcc6fd07.adoc b/example/docs/asciidoc/GettingStarted/7d32a32357b5ea8819b72608fcc6fd07.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=7d32a32357b5ea8819b72608fcc6fd07,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/92e3c75133dc4fdb2cc65f149001b40b.adoc b/example/docs/asciidoc/GettingStarted/92e3c75133dc4fdb2cc65f149001b40b.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=92e3c75133dc4fdb2cc65f149001b40b,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/9c5ef83db886840355ff662b6e9ae8ab.adoc b/example/docs/asciidoc/GettingStarted/9c5ef83db886840355ff662b6e9ae8ab.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=9c5ef83db886840355ff662b6e9ae8ab,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/b8459547da50aebddbcdd1aaaac02b5f.adoc b/example/docs/asciidoc/GettingStarted/b8459547da50aebddbcdd1aaaac02b5f.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=b8459547da50aebddbcdd1aaaac02b5f,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/c181969ef91c3b4a2513c1885be98e26.adoc b/example/docs/asciidoc/GettingStarted/c181969ef91c3b4a2513c1885be98e26.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=c181969ef91c3b4a2513c1885be98e26,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/c3fa04519df668d6c27727a12ab09648.adoc b/example/docs/asciidoc/GettingStarted/c3fa04519df668d6c27727a12ab09648.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=c3fa04519df668d6c27727a12ab09648,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/db20adb70a8e8d0709d15ba0daf18d23.adoc b/example/docs/asciidoc/GettingStarted/db20adb70a8e8d0709d15ba0daf18d23.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=db20adb70a8e8d0709d15ba0daf18d23,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/e8035a7476601ad4b136edb250f92d53.adoc b/example/docs/asciidoc/GettingStarted/e8035a7476601ad4b136edb250f92d53.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=e8035a7476601ad4b136edb250f92d53,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/f8cc4b331a19ff4df8e4a490f906ee69.adoc b/example/docs/asciidoc/GettingStarted/f8cc4b331a19ff4df8e4a490f906ee69.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=f8cc4b331a19ff4df8e4a490f906ee69,indent=0]
+----
diff --git a/example/docs/asciidoc/GettingStarted/fa5f618ced25ed2e67a1439bb77ba340.adoc b/example/docs/asciidoc/GettingStarted/fa5f618ced25ed2e67a1439bb77ba340.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../src/Examples/Docs/GettingStarted.py[tag=fa5f618ced25ed2e67a1439bb77ba340,indent=0]
+----
diff --git a/.../docs/asciidoc/Setup/Install/CheckRunning/3d1ff6097e2359f927c88c2ccdb36252.adoc b/.../docs/asciidoc/Setup/Install/CheckRunning/3d1ff6097e2359f927c88c2ccdb36252.adoc
@@ -0,0 +1,4 @@
+[source,python]
+----
+include::./../../../../src/Examples/Docs/Setup/Install/CheckRunning.py[tag=3d1ff6097e2359f927c88c2ccdb36252,indent=0]
+----
diff --git a/example/docs/src/Examples/Docs/Docs/Delete.py b/example/docs/src/Examples/Docs/Docs/Delete.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+
+'''
+Licensed to Elasticsearch B.V under one or more agreements.
+Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
+See the LICENSE file in the project root for more information
+'''
+
+from elasticsearch import Elasticsearch
+
+es = Elasticsearch()
+
+print("c5e5873783246c7b1c01d8464fed72c4 - L:9")
+# tag::c5e5873783246c7b1c01d8464fed72c4[]
+response = es.delete(
+    index='twitter',
+    id=1,
+)
+# end::c5e5873783246c7b1c01d8464fed72c4[]
+print("---------------------------------------")
+print(response)
+print("---------------------------------------")
+
+print("47b5ff897f26e9c943cee5c06034181d - L:84")
+# tag::47b5ff897f26e9c943cee5c06034181d[]
+response = es.delete(
+    index='twitter',
+    id=1,
+    routing='kimchy',
+)
+# end::47b5ff897f26e9c943cee5c06034181d[]
+print("---------------------------------------")
+print(response)
+print("---------------------------------------")
+
+print("d90a84a24a407731dfc1929ac8327746 - L:147")
+# tag::d90a84a24a407731dfc1929ac8327746[]
+response = es.delete(
+    index='twitter',
+    id=1,
+    timeout='5m',
+)
+# end::d90a84a24a407731dfc1929ac8327746[]
+print("---------------------------------------")
+print(response)
+print("---------------------------------------")