Skip to content

Commit 852dbc1

Browse files
authored
Update low level client on 7.x (#4395)
* make sure we generate https:// even if the source says http:// (cherry picked from commit 392680f) * update low level client to latest 7.x
1 parent d66cb08 commit 852dbc1

15 files changed

+298
-99
lines changed

src/ApiGenerator/Domain/Specification/Documentation.cs

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ namespace ApiGenerator.Domain.Specification
88
public class Documentation
99
{
1010
public string Description { get; set; }
11-
public string Url { get; set; }
11+
12+
private string _url;
13+
public string Url
14+
{
15+
get => _url;
16+
set => _url = value?.Replace("http://", "https://");
17+
}
1218
}
1319

1420
public class DocumentationConverter : JsonConverter

src/ApiGenerator/RestSpecification/Core/root.html

+29-24
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919

2020

21-
<link crossorigin="anonymous" media="all" integrity="sha512-Wr5yTs8gD42bv1Ll5KLXr7cXzuVcbKOcuHmifgt/6YlZuluDTyAJnfnYhNYKpgVK1F51ks8Y2QA+XENQoMp/PA==" rel="stylesheet" href="https://github.githubassets.com/assets/frameworks-5abe724ecf200f8d9bbf52e5e4a2d7af.css" />
22-
<link crossorigin="anonymous" media="all" integrity="sha512-DnBQhWGJ7icZU4LPhD6FlaZ9IrBOmbP4/4bEfpGQRbCLwutaFNqbuAaM8Y/w7IygRCMuOybM7fLDGe+UV9TEjQ==" rel="stylesheet" href="https://github.githubassets.com/assets/site-0e7050856189ee27195382cf843e8595.css" />
23-
<link crossorigin="anonymous" media="all" integrity="sha512-/Kdj6P6WRk2SG1AIisQL1y+ZbNnTv1a+pX/4yP0e13VjZ5s+uYXnQOx+NKpXpBPqzyB/JscjxW7D30/a5DneZA==" rel="stylesheet" href="https://github.githubassets.com/assets/github-fca763e8fe96464d921b50088ac40bd7.css" />
21+
<link crossorigin="anonymous" media="all" integrity="sha512-ZUjVod2EvYMDbGqRSyW0rpfgBq3i+gnR/4PfrzLsy5f20oIcRfgFQFVKgi3Ztp917bP1K/kdP5q8+nAlJ3+cFA==" rel="stylesheet" href="https://github.githubassets.com/assets/frameworks-6548d5a1dd84bd83036c6a914b25b4ae.css" />
22+
<link crossorigin="anonymous" media="all" integrity="sha512-HNV7VuXI98SSFimaE7r8eVsgrmzC37AMNXw1GrNbOl4wN3ATov+SdHusRTAAf4NPoRsUcOOQyYsOCA0AcN4m0w==" rel="stylesheet" href="https://github.githubassets.com/assets/site-1cd57b56e5c8f7c49216299a13bafc79.css" />
23+
<link crossorigin="anonymous" media="all" integrity="sha512-CKBn/UfyE+yEuqeavkB8Y5xld809yQJ0Evsa+pOoHP8jlBS0TGBeKIiOs17M57SuJMEZl3wjXuB2pexW8oEeuA==" rel="stylesheet" href="https://github.githubassets.com/assets/github-08a067fd47f213ec84baa79abe407c63.css" />
2424

2525

2626

@@ -42,7 +42,7 @@
4242

4343

4444

45-
<meta name="request-id" content="A9A0:08BB:2CEF9:419E2:5E41BE67" data-pjax-transient="true" /><meta name="html-safe-nonce" content="8f7786a3dc419a21eeeecfb0900ff533a2dea434" data-pjax-transient="true" /><meta name="visitor-payload" content="eyJyZWZlcnJlciI6bnVsbCwicmVxdWVzdF9pZCI6IkE5QTA6MDhCQjoyQ0VGOTo0MTlFMjo1RTQxQkU2NyIsInZpc2l0b3JfaWQiOiI2MTIxNzIxMDM3MjMyMTI3NTkyIiwicmVnaW9uX2VkZ2UiOiJhbXMiLCJyZWdpb25fcmVuZGVyIjoiaWFkIn0=" data-pjax-transient="true" /><meta name="visitor-hmac" content="17cd781361f21cbb2a27a7985ac425820f2562635d654499d006f0e04fd21687" data-pjax-transient="true" />
45+
<meta name="request-id" content="AD5C:38CBA:179189:22AEB7:5E4D132F" data-pjax-transient="true"/><meta name="html-safe-nonce" content="4cad4061a826d42aaa91afcca07fa33b332b4849" data-pjax-transient="true"/><meta name="visitor-payload" content="eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJBRDVDOjM4Q0JBOjE3OTE4OToyMkFFQjc6NUU0RDEzMkYiLCJ2aXNpdG9yX2lkIjoiNzM1NzU3NTg5NTAxNDI0OTI2MyIsInJlZ2lvbl9lZGdlIjoiYW1zIiwicmVnaW9uX3JlbmRlciI6ImFtcyJ9" data-pjax-transient="true"/><meta name="visitor-hmac" content="4f00374cf1c452fbc907133b054e9bba0a8d30582e7e498768f631e2c7f93cae" data-pjax-transient="true"/>
4646

4747

4848

@@ -78,7 +78,7 @@
7878

7979
<meta name="enabled-features" content="MARKETPLACE_FEATURED_BLOG_POSTS,MARKETPLACE_INVOICED_BILLING,MARKETPLACE_SOCIAL_PROOF_CUSTOMERS,MARKETPLACE_TRENDING_SOCIAL_PROOF,MARKETPLACE_RECOMMENDATIONS,MARKETPLACE_PENDING_INSTALLATIONS,RELATED_ISSUES">
8080

81-
<meta http-equiv="x-pjax-version" content="b41dafcb41e2ceb6409cd7968585d6e9">
81+
<meta http-equiv="x-pjax-version" content="2e63e6bd8ece9826eb61af0c1a5496f1">
8282

8383

8484
<link href="https://github.com/elastic/elasticsearch/commits/7.x.atom" rel="alternate" title="Recent Commits to elasticsearch:7.x" type="application/atom+xml">
@@ -260,7 +260,7 @@ <h4 class="text-gray-light text-normal text-mono f5 mb-2 border-top pt-3">Conne
260260
spellcheck="false"
261261
autocomplete="off"
262262
>
263-
<input type="hidden" value="thzO7MbGQ5qHC5ZMwwXZKpUGUy4qH3XZRBolAhVv+T2pDZlf9da9g0OWfMhogwvA94emv3t7bQyET8NHNYWx2A==" data-csrf="true" class="js-data-jump-to-suggestions-path-csrf" />
263+
<input type="hidden" data-csrf="true" class="js-data-jump-to-suggestions-path-csrf" value="jz6eCGjP0AiR9jsfsi/SPEa7EVQ0lsw9eC0LEC6H+UONCIFIyJIXk8odOGbj3abFLB3+xTanZvmhoPLzlLjcgg==" />
264264
<input type="hidden" class="js-site-search-type-field" name="type" >
265265
<img src="https://github.githubassets.com/images/search-key-slash.svg" alt="" class="mr-2 header-search-key-slash">
266266

@@ -409,6 +409,11 @@ <h4 class="text-gray-light text-normal text-mono f5 mb-2 border-top pt-3">Conne
409409
</div>
410410

411411

412+
413+
414+
<div class="js-notification-shelf-not-found-error" hidden></div>
415+
416+
412417

413418

414419
<div class="application-main " data-commit-hovercards-enabled>
@@ -419,6 +424,7 @@ <h4 class="text-gray-light text-normal text-mono f5 mb-2 border-top pt-3">Conne
419424

420425

421426

427+
422428

423429

424430

@@ -429,7 +435,7 @@ <h4 class="text-gray-light text-normal text-mono f5 mb-2 border-top pt-3">Conne
429435

430436

431437

432-
<div class="pagehead repohead readability-menu bg-gray-light pb-0 pt-3 pb-0">
438+
<div class="pagehead repohead hx_repohead readability-menu bg-gray-light pb-0 pt-3 pb-0">
433439

434440
<div class="container-lg mb-4 px-3 d-flex">
435441

@@ -460,7 +466,7 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
460466
<svg class="octicon octicon-eye v-align-text-bottom" viewBox="0 0 16 16" version="1.1" width="16" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M8.06 2C3 2 0 8 0 8s3 6 8.06 6C13 14 16 8 16 8s-3-6-7.94-6zM8 12c-2.2 0-4-1.78-4-4 0-2.2 1.8-4 4-4 2.22 0 4 1.8 4 4 0 2.22-1.78 4-4 4zm2-4c0 1.11-.89 2-2 2-1.11 0-2-.89-2-2 0-1.11.89-2 2-2 1.11 0 2 .89 2 2z"/></svg>
461467
Watch
462468
</a> <a class="social-count" href="/elastic/elasticsearch/watchers"
463-
aria-label="2785 users are watching this repository">
469+
aria-label="2782 users are watching this repository">
464470
2.8k
465471
</a>
466472

@@ -473,8 +479,8 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
473479
Star
474480
</a>
475481
<a class="social-count js-social-count" href="/elastic/elasticsearch/stargazers"
476-
aria-label="46944 users starred this repository">
477-
46.9k
482+
aria-label="47080 users starred this repository">
483+
47.1k
478484
</a>
479485

480486
</li>
@@ -485,8 +491,8 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
485491
Fork
486492
</a>
487493
<a href="/elastic/elasticsearch/network/members" class="social-count"
488-
aria-label="15937 users forked this repository">
489-
15.9k
494+
aria-label="16000 users forked this repository">
495+
16k
490496
</a>
491497
</li>
492498
</ul>
@@ -510,7 +516,7 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
510516
<a itemprop="url" data-hotkey="g i" class="js-selected-navigation-item reponav-item" data-selected-links="repo_issues repo_labels repo_milestones /elastic/elasticsearch/issues" href="/elastic/elasticsearch/issues">
511517
<div class="d-inline"><svg class="octicon octicon-issue-opened" viewBox="0 0 14 16" version="1.1" width="14" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M7 2.3c3.14 0 5.7 2.56 5.7 5.7s-2.56 5.7-5.7 5.7A5.71 5.71 0 011.3 8c0-3.14 2.56-5.7 5.7-5.7zM7 1C3.14 1 0 4.14 0 8s3.14 7 7 7 7-3.14 7-7-3.14-7-7-7zm1 3H6v5h2V4zm0 6H6v2h2v-2z"/></svg></div>
512518
<span itemprop="name">Issues</span>
513-
<span class="Counter">2,166</span>
519+
<span class="Counter">2,197</span>
514520
<meta itemprop="position" content="2">
515521
</a> </span>
516522

@@ -519,7 +525,7 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
519525
<a data-hotkey="g p" data-skip-pjax="true" itemprop="url" class="js-selected-navigation-item reponav-item" data-selected-links="repo_pulls checks /elastic/elasticsearch/pulls" href="/elastic/elasticsearch/pulls">
520526
<div class="d-inline"><svg class="octicon octicon-git-pull-request" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M11 11.28V5c-.03-.78-.34-1.47-.94-2.06C9.46 2.35 8.78 2.03 8 2H7V0L4 3l3 3V4h1c.27.02.48.11.69.31.21.2.3.42.31.69v6.28A1.993 1.993 0 0010 15a1.993 1.993 0 001-3.72zm-1 2.92c-.66 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2zM4 3c0-1.11-.89-2-2-2a1.993 1.993 0 00-1 3.72v6.56A1.993 1.993 0 002 15a1.993 1.993 0 001-3.72V4.72c.59-.34 1-.98 1-1.72zm-.8 10c0 .66-.55 1.2-1.2 1.2-.65 0-1.2-.55-1.2-1.2 0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2zM2 4.2C1.34 4.2.8 3.65.8 3c0-.65.55-1.2 1.2-1.2.65 0 1.2.55 1.2 1.2 0 .65-.55 1.2-1.2 1.2z"/></svg></div>
521527
<span itemprop="name">Pull requests</span>
522-
<span class="Counter">311</span>
528+
<span class="Counter">315</span>
523529
<meta itemprop="position" content="4">
524530
</a> </span>
525531

@@ -549,6 +555,8 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
549555

550556

551557
</div>
558+
559+
552560
<div class="container-lg clearfix new-discussion-timeline px-3">
553561
<div class="repository-content ">
554562

@@ -607,13 +615,13 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
607615
</a>
608616
</span>
609617

610-
This branch is 5536 commits ahead, 6107 commits behind master.
618+
This branch is 5663 commits ahead, 6244 commits behind master.
611619
</div>
612620

613-
<include-fragment src="/elastic/elasticsearch/tree-commit/47255c4fd75105e0704a88b87201d45256cd53fb/rest-api-spec/src/main/resources/rest-api-spec/api" class="commit-tease commit-loader">
621+
<include-fragment src="/elastic/elasticsearch/tree-commit/9d40277d4cb92982f6e29768f60216bf541962c2/rest-api-spec/src/main/resources/rest-api-spec/api" class="commit-tease commit-loader">
614622
<div class="blank loader-loading">
615-
<img alt="" class="loader" src="https://github.githubassets.com/images/spinners/octocat-spinner-32-EAF2F5.gif" width="16" height="16" />
616-
Fetching latest commit…
623+
<img alt="" class="loader" src="https://github.githubassets.com/images/spinners/octocat-spinner-32-EAF2F5.gif" width="16" height="16" />
624+
Fetching latest commit…
617625
</div>
618626
<div class="loader-error">
619627
Cannot retrieve the latest commit at this time.
@@ -622,7 +630,7 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
622630

623631

624632
<include-fragment class="file-wrap" src="/elastic/elasticsearch/file-list/7.x/rest-api-spec/src/main/resources/rest-api-spec/api">
625-
<a class="d-none js-permalink-shortcut" data-hotkey="y" href="/elastic/elasticsearch/tree/47255c4fd75105e0704a88b87201d45256cd53fb/rest-api-spec/src/main/resources/rest-api-spec/api">Permalink</a>
633+
<a class="d-none js-permalink-shortcut" data-hotkey="y" href="/elastic/elasticsearch/tree/9d40277d4cb92982f6e29768f60216bf541962c2/rest-api-spec/src/main/resources/rest-api-spec/api">Permalink</a>
626634

627635
<table class="files js-navigation-container js-active-navigation-container" data-pjax>
628636
<thead>
@@ -2774,9 +2782,9 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
27742782

27752783

27762784
<script crossorigin="anonymous" async="async" integrity="sha512-0ME9ftiuUHsYYdeBdLtPHbeL4j0UjTAy9YxHpX0AaZLPPex/JTS5mmHozk8Bnp2czMkd3FmK8DfVID7zxmD5OA==" type="application/javascript" id="js-conditional-compat" data-src="https://github.githubassets.com/assets/compat-bootstrap-d0c13d7e.js"></script>
2777-
<script crossorigin="anonymous" integrity="sha512-3H5DpgtWsQ6Fe2vBcKjkSmOXvXzISvus5d4D0vQYirHtOTh6xhTJss0rX+7Vvg8ThKo9vOYAGWzZ/P7N9HFqyQ==" type="application/javascript" src="https://github.githubassets.com/assets/frameworks-dc7e43a6.js"></script>
2785+
<script crossorigin="anonymous" integrity="sha512-X05w7XvoTXbYlPzf+7O1zoqnJFmcZglL7ScKn3ntB9SmLg/1n8D/cNKIKDk7gtKSJ5PegWSCl44onkA40k4xuA==" type="application/javascript" src="https://github.githubassets.com/assets/frameworks-5f4e70ed.js"></script>
27782786

2779-
<script crossorigin="anonymous" async="async" integrity="sha512-sZT18rg46eyF0sqSjPYMbuzxyQcNNTo8yunrsoECEUcgmN5WYG4pGy6TfQenjEb+zp4WsKI4MLqIKf/ZL66QJQ==" type="application/javascript" src="https://github.githubassets.com/assets/github-bootstrap-b194f5f2.js"></script>
2787+
<script crossorigin="anonymous" async="async" integrity="sha512-ZP7K9qwdVB2XvLqj5YhjAYr14NLGXPrxxYQpRjyUU0tI1WNahUL1fv5i1eWLMviB3G6t/13jD+F8D96vBK30oA==" type="application/javascript" src="https://github.githubassets.com/assets/github-bootstrap-64fecaf6.js"></script>
27802788

27812789

27822790

@@ -2803,9 +2811,6 @@ <h1 class="public d-flex flex-wrap flex-items-center break-word float-none ">
28032811
</div>
28042812
</div>
28052813

2806-
2807-
<div class="js-notification-shelf-not-found-error" hidden></div>
2808-
28092814
<div aria-live="polite" class="js-global-screen-reader-notice sr-only"></div>
28102815

28112816
</body>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
{
2+
"cat.ml_data_frame_analytics":{
3+
"documentation":{
4+
"url":"http://www.elastic.co/guide/en/elasticsearch/reference/current/get-dfanalytics-stats.html"
5+
},
6+
"stability":"stable",
7+
"url":{
8+
"paths":[
9+
{
10+
"path":"/_cat/ml/data_frame/analytics",
11+
"methods":[
12+
"GET"
13+
]
14+
},
15+
{
16+
"path":"/_cat/ml/data_frame/analytics/{id}",
17+
"methods":[
18+
"GET"
19+
],
20+
"parts":{
21+
"id":{
22+
"type":"string",
23+
"description":"The ID of the data frame analytics to fetch"
24+
}
25+
}
26+
}
27+
]
28+
},
29+
"params":{
30+
"allow_no_match":{
31+
"type":"boolean",
32+
"required":false,
33+
"description":"Whether to ignore if a wildcard expression matches no configs. (This includes `_all` string or when no configs have been specified)"
34+
},
35+
"bytes":{
36+
"type":"enum",
37+
"description":"The unit in which to display byte values",
38+
"options":[
39+
"b",
40+
"k",
41+
"kb",
42+
"m",
43+
"mb",
44+
"g",
45+
"gb",
46+
"t",
47+
"tb",
48+
"p",
49+
"pb"
50+
]
51+
},
52+
"format":{
53+
"type":"string",
54+
"description":"a short version of the Accept header, e.g. json, yaml"
55+
},
56+
"h":{
57+
"type":"list",
58+
"description":"Comma-separated list of column names to display"
59+
},
60+
"help":{
61+
"type":"boolean",
62+
"description":"Return help information",
63+
"default":false
64+
},
65+
"s":{
66+
"type":"list",
67+
"description":"Comma-separated list of column names or column aliases to sort by"
68+
},
69+
"time":{
70+
"type":"enum",
71+
"description":"The unit in which to display time values",
72+
"options":[
73+
"d (Days)",
74+
"h (Hours)",
75+
"m (Minutes)",
76+
"s (Seconds)",
77+
"ms (Milliseconds)",
78+
"micros (Microseconds)",
79+
"nanos (Nanoseconds)"
80+
]
81+
},
82+
"v":{
83+
"type":"boolean",
84+
"description":"Verbose mode. Display column headers",
85+
"default":false
86+
}
87+
}
88+
}
89+
}

src/ApiGenerator/RestSpecification/XPack/eql.search.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"eql.search":{
33
"documentation":{
4-
"url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/eql-search.html"
4+
"url":"https://www.elastic.co/guide/en/elasticsearch/reference/current/eql.html"
55
},
66
"stability": "beta",
77
"url":{

0 commit comments

Comments
 (0)