SONAR-12686 upgrade ES server binaries to 7.9.3

new sources unpack from ElasticSearch 7.9.3 artifact for Linux OSS only (without bundled JDK and under Apache 2.0 license)
https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-oss-7.9.3-no-jdk-linux-x86_64.tar.gz

sonar-application/src/main/assembly/elasticsearch/LICENSE.txt

@@ -1,223 +1,202 @@
-ELASTIC LICENSE AGREEMENT
-
-PLEASE READ CAREFULLY THIS ELASTIC LICENSE AGREEMENT (THIS "AGREEMENT"), WHICH
-CONSTITUTES A LEGALLY BINDING AGREEMENT AND GOVERNS ALL OF YOUR USE OF ALL OF
-THE ELASTIC SOFTWARE WITH WHICH THIS AGREEMENT IS INCLUDED ("ELASTIC SOFTWARE")
-THAT IS PROVIDED IN OBJECT CODE FORMAT, AND, IN ACCORDANCE WITH SECTION 2 BELOW,
-CERTAIN OF THE ELASTIC SOFTWARE THAT IS PROVIDED IN SOURCE CODE FORMAT. BY
-INSTALLING OR USING ANY OF THE ELASTIC SOFTWARE GOVERNED BY THIS AGREEMENT, YOU
-ARE ASSENTING TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE
-WITH SUCH TERMS AND CONDITIONS, YOU MAY NOT INSTALL OR USE THE ELASTIC SOFTWARE
-GOVERNED BY THIS AGREEMENT. IF YOU ARE INSTALLING OR USING THE SOFTWARE ON
-BEHALF OF A LEGAL ENTITY, YOU REPRESENT AND WARRANT THAT YOU HAVE THE ACTUAL
-AUTHORITY TO AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT ON BEHALF OF
-SUCH ENTITY.
-
-Posted Date: April 20, 2018
-
-This Agreement is entered into by and between Elasticsearch BV ("Elastic") and
-You, or the legal entity on behalf of whom You are acting (as applicable,
-"You").
-
-1. OBJECT CODE END USER LICENSES, RESTRICTIONS AND THIRD PARTY OPEN SOURCE
-SOFTWARE
-
-  1.1 Object Code End User License. Subject to the terms and conditions of
-  Section 1.2 of this Agreement, Elastic hereby grants to You, AT NO CHARGE and
-  for so long as you are not in breach of any provision of this Agreement, a
-  License to the Basic Features and Functions of the Elastic Software.
-
-  1.2 Reservation of Rights; Restrictions. As between Elastic and You, Elastic
-  and its licensors own all right, title and interest in and to the Elastic
-  Software, and except as expressly set forth in Sections 1.1, and 2.1 of this
-  Agreement, no other license to the Elastic Software is granted to You under
-  this Agreement, by implication, estoppel or otherwise. You agree not to: (i)
-  reverse engineer or decompile, decrypt, disassemble or otherwise reduce any
-  Elastic Software provided to You in Object Code, or any portion thereof, to
-  Source Code, except and only to the extent any such restriction is prohibited
-  by applicable law, (ii) except as expressly permitted in this Agreement,
-  prepare derivative works from, modify, copy or use the Elastic Software Object
-  Code or the Commercial Software Source Code in any manner; (iii) except as
-  expressly permitted in Section 1.1 above, transfer, sell, rent, lease,
-  distribute, sublicense, loan or otherwise transfer, Elastic Software Object
-  Code, in whole or in part, to any third party; (iv) use Elastic Software
-  Object Code for providing time-sharing services, any software-as-a-service,
-  service bureau services or as part of an application services provider or
-  other service offering (collectively, "SaaS Offering") where obtaining access
-  to the Elastic Software or the features and functions of the Elastic Software
-  is a primary reason or substantial motivation for users of the SaaS Offering
-  to access and/or use the SaaS Offering ("Prohibited SaaS Offering"); (v)
-  circumvent the limitations on use of Elastic Software provided to You in
-  Object Code format that are imposed or preserved by any License Key, or (vi)
-  alter or remove any Marks and Notices in the Elastic Software. If You have any
-  question as to whether a specific SaaS Offering constitutes a Prohibited SaaS
-  Offering, or are interested in obtaining Elastic's permission to engage in
-  commercial or non-commercial distribution of the Elastic Software, please
-  contact elastic_license@elastic.co.
-
-  1.3 Third Party Open Source Software. The Commercial Software may contain or
-  be provided with third party open source libraries, components, utilities and
-  other open source software (collectively, "Open Source Software"), which Open
-  Source Software may have applicable license terms as identified on a website
-  designated by Elastic. Notwithstanding anything to the contrary herein, use of
-  the Open Source Software shall be subject to the license terms and conditions
-  applicable to such Open Source Software, to the extent required by the
-  applicable licensor (which terms shall not restrict the license rights granted
-  to You hereunder, but may contain additional rights). To the extent any
-  condition of this Agreement conflicts with any license to the Open Source
-  Software, the Open Source Software license will govern with respect to such
-  Open Source Software only. Elastic may also separately provide you with
-  certain open source software that is licensed by Elastic. Your use of such
-  Elastic open source software will not be governed by this Agreement, but by
-  the applicable open source license terms.
-
-2. COMMERCIAL SOFTWARE SOURCE CODE
-
-  2.1 Limited License. Subject to the terms and conditions of Section 2.2 of
-  this Agreement, Elastic hereby grants to You, AT NO CHARGE and for so long as
-  you are not in breach of any provision of this Agreement, a limited,
-  non-exclusive, non-transferable, fully paid up royalty free right and license
-  to the Commercial Software in Source Code format, without the right to grant
-  or authorize sublicenses, to prepare Derivative Works of the Commercial
-  Software, provided You (i) do not hack the licensing mechanism, or otherwise
-  circumvent the intended limitations on the use of Elastic Software to enable
-  features other than Basic Features and Functions or those features You are
-  entitled to as part of a Subscription, and (ii) use the resulting object code
-  only for reasonable testing purposes.
-
-  2.2 Restrictions. Nothing in Section 2.1 grants You the right to (i) use the
-  Commercial Software Source Code other than in accordance with Section 2.1
-  above, (ii) use a Derivative Work of the Commercial Software outside of a
-  Non-production Environment, in any production capacity, on a temporary or
-  permanent basis, or (iii) transfer, sell, rent, lease, distribute, sublicense,
-  loan or otherwise make available the Commercial Software Source Code, in whole
-  or in part, to any third party. Notwithstanding the foregoing, You may
-  maintain a copy of the repository in which the Source Code of the Commercial
-  Software resides and that copy may be publicly accessible, provided that you
-  include this Agreement with Your copy of the repository.
-
-3. TERMINATION
-
-  3.1 Termination. This Agreement will automatically terminate, whether or not
-  You receive notice of such Termination from Elastic, if You breach any of its
-  provisions.
-
-  3.2 Post Termination. Upon any termination of this Agreement, for any reason,
-  You shall promptly cease the use of the Elastic Software in Object Code format
-  and cease use of the Commercial Software in Source Code format. For the
-  avoidance of doubt, termination of this Agreement will not affect Your right
-  to use Elastic Software, in either Object Code or Source Code formats, made
-  available under the Apache License Version 2.0.
-
-  3.3 Survival. Sections 1.2, 2.2. 3.3, 4 and 5 shall survive any termination or
-  expiration of this Agreement.
-
-4. DISCLAIMER OF WARRANTIES AND LIMITATION OF LIABILITY
-
-  4.1 Disclaimer of Warranties. TO THE MAXIMUM EXTENT PERMITTED UNDER APPLICABLE
-  LAW, THE ELASTIC SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND,
-  AND ELASTIC AND ITS LICENSORS MAKE NO WARRANTIES WHETHER EXPRESSED, IMPLIED OR
-  STATUTORY REGARDING OR RELATING TO THE ELASTIC SOFTWARE. TO THE MAXIMUM EXTENT
-  PERMITTED UNDER APPLICABLE LAW, ELASTIC AND ITS LICENSORS SPECIFICALLY
-  DISCLAIM ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-  PURPOSE AND NON-INFRINGEMENT WITH RESPECT TO THE ELASTIC SOFTWARE, AND WITH
-  RESPECT TO THE USE OF THE FOREGOING. FURTHER, ELASTIC DOES NOT WARRANT RESULTS
-  OF USE OR THAT THE ELASTIC SOFTWARE WILL BE ERROR FREE OR THAT THE USE OF THE
-  ELASTIC SOFTWARE WILL BE UNINTERRUPTED.
-
-  4.2 Limitation of Liability. IN NO EVENT SHALL ELASTIC OR ITS LICENSORS BE
-  LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT OR INDIRECT DAMAGES,
-  INCLUDING, WITHOUT LIMITATION, FOR ANY LOSS OF PROFITS, LOSS OF USE, BUSINESS
-  INTERRUPTION, LOSS OF DATA, COST OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY
-  SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES OF ANY KIND, IN CONNECTION WITH
-  OR ARISING OUT OF THE USE OR INABILITY TO USE THE ELASTIC SOFTWARE, OR THE
-  PERFORMANCE OF OR FAILURE TO PERFORM THIS AGREEMENT, WHETHER ALLEGED AS A
-  BREACH OF CONTRACT OR TORTIOUS CONDUCT, INCLUDING NEGLIGENCE, EVEN IF ELASTIC
-  HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-5. MISCELLANEOUS
-
-  This Agreement completely and exclusively states the entire agreement of the
-  parties regarding the subject matter herein, and it supersedes, and its terms
-  govern, all prior proposals, agreements, or other communications between the
-  parties, oral or written, regarding such subject matter. This Agreement may be
-  modified by Elastic from time to time, and any such modifications will be
-  effective upon the "Posted Date" set forth at the top of the modified
-  Agreement. If any provision hereof is held unenforceable, this Agreement will
-  continue without said provision and be interpreted to reflect the original
-  intent of the parties. This Agreement and any non-contractual obligation
-  arising out of or in connection with it, is governed exclusively by Dutch law.
-  This Agreement shall not be governed by the 1980 UN Convention on Contracts
-  for the International Sale of Goods. All disputes arising out of or in
-  connection with this Agreement, including its existence and validity, shall be
-  resolved by the courts with jurisdiction in Amsterdam, The Netherlands, except
-  where mandatory law provides for the courts at another location in The
-  Netherlands to have jurisdiction. The parties hereby irrevocably waive any and
-  all claims and defenses either might otherwise have in any such action or
-  proceeding in any of such courts based upon any alleged lack of personal
-  jurisdiction, improper venue, forum non conveniens or any similar claim or
-  defense. A breach or threatened breach, by You of Section 2 may cause
-  irreparable harm for which damages at law may not provide adequate relief, and
-  therefore Elastic shall be entitled to seek injunctive relief without being
-  required to post a bond. You may not assign this Agreement (including by
-  operation of law in connection with a merger or acquisition), in whole or in
-  part to any third party without the prior written consent of Elastic, which
-  may be withheld or granted by Elastic in its sole and absolute discretion.
-  Any assignment in violation of the preceding sentence is void. Notices to
-  Elastic may also be sent to legal@elastic.co.
-
-6. DEFINITIONS
-
-  The following terms have the meanings ascribed:
-
-  6.1 "Affiliate" means, with respect to a party, any entity that controls, is
-  controlled by, or which is under common control with, such party, where
-  "control" means ownership of at least fifty percent (50%) of the outstanding
-  voting shares of the entity, or the contractual right to establish policy for,
-  and manage the operations of, the entity.
-
-  6.2 "Basic Features and Functions" means those features and functions of the
-  Elastic Software that are eligible for use under a Basic license, as set forth
-  at https://www.elastic.co/subscriptions, as may be modified by Elastic from
-  time to time.
-
-  6.3 "Commercial Software" means the Elastic Software Source Code in any file
-  containing a header stating the contents are subject to the Elastic License or
-  which is contained in the repository folder labeled "x-pack", unless a LICENSE
-  file present in the directory subtree declares a different license.
-
-  6.4 "Derivative Work of the Commercial Software" means, for purposes of this
-  Agreement, any modification(s) or enhancement(s) to the Commercial Software,
-  which represent, as a whole, an original work of authorship.
-
-  6.5 "License" means a limited, non-exclusive, non-transferable, fully paid up,
-  royalty free, right and license, without the right to grant or authorize
-  sublicenses, solely for Your internal business operations to (i) install and
-  use the applicable Features and Functions of the Elastic Software in Object
-  Code, and (ii) permit Contractors and Your Affiliates to use the Elastic
-  software as set forth in (i) above, provided that such use by Contractors must
-  be solely for Your benefit and/or the benefit of Your Affiliates, and You
-  shall be responsible for all acts and omissions of such Contractors and
-  Affiliates in connection with their use of the Elastic software that are
-  contrary to the terms and conditions of this Agreement.
-
-  6.6 "License Key" means a sequence of bytes, including but not limited to a
-  JSON blob, that is used to enable certain features and functions of the
-  Elastic Software.
-
-  6.7 "Marks and Notices" means all Elastic trademarks, trade names, logos and
-  notices present on the Documentation as originally provided by Elastic.
-
-  6.8 "Non-production Environment" means an environment for development, testing
-  or quality assurance, where software is not used for production purposes.
-
-  6.9 "Object Code" means any form resulting from mechanical transformation or
-  translation of Source Code form, including but not limited to compiled object
-  code, generated documentation, and conversions to other media types.
-
-  6.10 "Source Code" means the preferred form of computer software for making
-  modifications, including but not limited to software source code,
-  documentation source, and configuration files.
-
-  6.11 "Subscription" means the right to receive Support Services and a License
-  to the Commercial Software.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

sonar-application/src/main/assembly/elasticsearch/README.asciidoc

@@ -0,0 +1,203 @@
+= Elasticsearch
+
+== A Distributed RESTful Search Engine
+
+=== https://www.elastic.co/products/elasticsearch[https://www.elastic.co/products/elasticsearch]
+
+Elasticsearch is a distributed RESTful search engine built for the cloud. Features include:
+
+* Distributed and Highly Available Search Engine.
+** Each index is fully sharded with a configurable number of shards.
+** Each shard can have one or more replicas.
+** Read / Search operations performed on any of the replica shards.
+* Multi Tenant.
+** Support for more than one index.
+** Index level configuration (number of shards, index storage, ...).
+* Various set of APIs
+** HTTP RESTful API
+** All APIs perform automatic node operation rerouting.
+* Document oriented
+** No need for upfront schema definition.
+** Schema can be defined for customization of the indexing process.
+* Reliable, Asynchronous Write Behind for long term persistency.
+* (Near) Real Time Search.
+* Built on top of Apache Lucene
+** Each shard is a fully functional Lucene index
+** All the power of Lucene easily exposed through simple configuration / plugins.
+* Per operation consistency
+** Single document level operations are atomic, consistent, isolated and durable.
+
+== Getting Started
+
+First of all, DON'T PANIC. It will take 5 minutes to get the gist of what Elasticsearch is all about.
+
+=== Installation
+
+* https://www.elastic.co/downloads/elasticsearch[Download] and unpack the Elasticsearch official distribution.
+* Run `bin/elasticsearch` on Linux or macOS. Run `bin\elasticsearch.bat` on Windows.
+* Run `curl -X GET http://localhost:9200/` to verify Elasticsearch is running.
+
+=== Indexing
+
+First, index some sample JSON documents. The first request automatically creates
+the `my-index-000001` index.
+
+----
+curl -X POST 'http://localhost:9200/my-index-000001/_doc?pretty' -H 'Content-Type: application/json' -d '
+{
+  "@timestamp": "2099-11-15T13:12:00",
+  "message": "GET /search HTTP/1.1 200 1070000",
+  "user": {
+    "id": "kimchy"
+  }
+}'
+
+curl -X POST 'http://localhost:9200/my-index-000001/_doc?pretty' -H 'Content-Type: application/json' -d '
+{
+  "@timestamp": "2099-11-15T14:12:12",
+  "message": "GET /search HTTP/1.1 200 1070000",
+  "user": {
+    "id": "elkbee"
+  }
+}'
+
+curl -X POST 'http://localhost:9200/my-index-000001/_doc?pretty' -H 'Content-Type: application/json' -d '
+{
+  "@timestamp": "2099-11-15T01:46:38",
+  "message": "GET /search HTTP/1.1 200 1070000",
+  "user": {
+    "id": "elkbee"
+  }
+}'
+----
+
+=== Search
+
+Next, use a search request to find any documents with a `user.id` of `kimchy`.
+
+----
+curl -X GET 'http://localhost:9200/my-index-000001/_search?q=user.id:kimchy&pretty=true'
+----
+
+Instead of a query string, you can use Elasticsearch's
+https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl.html[Query
+DSL] in the request body.
+
+----
+curl -X GET 'http://localhost:9200/my-index-000001/_search?pretty=true' -H 'Content-Type: application/json' -d '
+{
+  "query" : {
+    "match" : { "user.id": "kimchy" }
+  }
+}'
+----
+
+You can also retrieve all documents in `my-index-000001`.
+
+----
+curl -X GET 'http://localhost:9200/my-index-000001/_search?pretty=true' -H 'Content-Type: application/json' -d '
+{
+  "query" : {
+    "match_all" : {}
+  }
+}'
+----
+
+During indexing, Elasticsearch automatically mapped the `@timestamp` field as a
+date. This lets you run a range search.
+
+----
+curl -X GET 'http://localhost:9200/my-index-000001/_search?pretty=true' -H 'Content-Type: application/json' -d '
+{
+  "query" : {
+    "range" : {
+      "@timestamp": {
+        "from": "2099-11-15T13:00:00",
+        "to": "2099-11-15T14:00:00"
+      }
+    }
+  }
+}'
+----
+
+=== Multiple indices
+
+Elasticsearch supports multiple indices. The previous examples used an index
+called `my-index-000001`. You can create another index, `my-index-000002`, to
+store additional data when `my-index-000001` reaches a certain age or size. You
+can also use separate indices to store different types of data.
+
+You can configure each index differently. The following request
+creates `my-index-000002` with two primary shards rather than the default of
+one. This may be helpful for larger indices.
+
+----
+curl -X PUT 'http://localhost:9200/my-index-000002?pretty' -H 'Content-Type: application/json' -d '
+{
+  "settings" : {
+    "index.number_of_shards" : 2
+  }
+}'
+----
+
+You can then add a document to `my-index-000002`.
+
+----
+curl -X POST 'http://localhost:9200/my-index-000002/_doc?pretty' -H 'Content-Type: application/json' -d '
+{
+  "@timestamp": "2099-11-16T13:12:00",
+  "message": "GET /search HTTP/1.1 200 1070000",
+  "user": {
+    "id": "kimchy"
+  }
+}'
+----
+
+You can search and perform other operations on multiple indices with a single
+request. The following request searches `my-index-000001` and `my-index-000002`.
+
+----
+curl -X GET 'http://localhost:9200/my-index-000001,my-index-000002/_search?pretty=true' -H 'Content-Type: application/json' -d '
+{
+  "query" : {
+    "match_all" : {}
+  }
+}'
+----
+
+You can omit the index from the request path to search all indices.
+
+----
+curl -X GET 'http://localhost:9200/_search?pretty=true' -H 'Content-Type: application/json' -d '
+{
+  "query" : {
+    "match_all" : {}
+  }
+}'
+----
+
+=== Distributed, highly available
+
+Let's face it, things will fail....
+
+Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replicas. By default, an index is created with 1 shard and 1 replica per shard (1/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
+
+In order to play with the distributed nature of Elasticsearch, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
+
+=== Where to go from here?
+
+We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the https://www.elastic.co/products/elasticsearch[elastic.co] website. General questions can be asked on the https://discuss.elastic.co[Elastic Forum] or https://ela.st/slack[on Slack]. The Elasticsearch GitHub repository is reserved for bug reports and feature requests only.
+
+=== Building from source
+
+Elasticsearch uses https://gradle.org[Gradle] for its build system.
+
+In order to create a distribution, simply run the `./gradlew assemble` command in the cloned directory.
+
+The distribution for each project will be created under the `build/distributions` directory in that project.
+
+See the xref:TESTING.asciidoc[TESTING] for more information about running the Elasticsearch test suite.
+
+=== Upgrading from older Elasticsearch versions
+
+In order to ensure a smooth upgrade process from earlier versions of Elasticsearch, please see our https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html[upgrade documentation] for more details on the upgrade process.

sonar-application/src/main/assembly/elasticsearch/README.textile

@@ -1,218 +0,0 @@
-h1. Elasticsearch
-
-h2. A Distributed RESTful Search Engine
-
-h3. "https://www.elastic.co/products/elasticsearch":https://www.elastic.co/products/elasticsearch
-
-Elasticsearch is a distributed RESTful search engine built for the cloud. Features include:
-
-* Distributed and Highly Available Search Engine.
-** Each index is fully sharded with a configurable number of shards.
-** Each shard can have one or more replicas.
-** Read / Search operations performed on any of the replica shards.
-* Multi Tenant.
-** Support for more than one index.
-** Index level configuration (number of shards, index storage, ...).
-* Various set of APIs
-** HTTP RESTful API
-** Native Java API.
-** All APIs perform automatic node operation rerouting.
-* Document oriented
-** No need for upfront schema definition.
-** Schema can be defined for customization of the indexing process.
-* Reliable, Asynchronous Write Behind for long term persistency.
-* (Near) Real Time Search.
-* Built on top of Lucene
-** Each shard is a fully functional Lucene index
-** All the power of Lucene easily exposed through simple configuration / plugins.
-* Per operation consistency
-** Single document level operations are atomic, consistent, isolated and durable.
-
-h2. Getting Started
-
-First of all, DON'T PANIC. It will take 5 minutes to get the gist of what Elasticsearch is all about.
-
-h3. Requirements
-
-You need to have a recent version of Java installed. See the "Setup":http://www.elastic.co/guide/en/elasticsearch/reference/current/setup.html#jvm-version page for more information.
-
-h3. Installation
-
-* "Download":https://www.elastic.co/downloads/elasticsearch and unzip the Elasticsearch official distribution.
-* Run @bin/elasticsearch@ on unix, or @bin\elasticsearch.bat@ on windows.
-* Run @curl -X GET http://localhost:9200/@.
-* Start more servers ...
-
-h3. Indexing
-
-Let's try and index some twitter like information. First, let's index some tweets (the @twitter@ index will be created automatically):
-
-<pre>
-curl -XPUT 'http://localhost:9200/twitter/_doc/1?pretty' -H 'Content-Type: application/json' -d '
-{
-    "user": "kimchy",
-    "post_date": "2009-11-15T13:12:00",
-    "message": "Trying out Elasticsearch, so far so good?"
-}'
-
-curl -XPUT 'http://localhost:9200/twitter/_doc/2?pretty' -H 'Content-Type: application/json' -d '
-{
-    "user": "kimchy",
-    "post_date": "2009-11-15T14:12:12",
-    "message": "Another tweet, will it be indexed?"
-}'
-
-curl -XPUT 'http://localhost:9200/twitter/_doc/3?pretty' -H 'Content-Type: application/json' -d '
-{
-    "user": "elastic",
-    "post_date": "2010-01-15T01:46:38",
-    "message": "Building the site, should be kewl"
-}'
-</pre>
-
-Now, let's see if the information was added by GETting it:
-
-<pre>
-curl -XGET 'http://localhost:9200/twitter/_doc/1?pretty=true'
-curl -XGET 'http://localhost:9200/twitter/_doc/2?pretty=true'
-curl -XGET 'http://localhost:9200/twitter/_doc/3?pretty=true'
-</pre>
-
-h3. Searching
-
-Mmm search..., shouldn't it be elastic?
-Let's find all the tweets that @kimchy@ posted:
-
-<pre>
-curl -XGET 'http://localhost:9200/twitter/_search?q=user:kimchy&pretty=true'
-</pre>
-
-We can also use the JSON query language Elasticsearch provides instead of a query string:
-
-<pre>
-curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -H 'Content-Type: application/json' -d '
-{
-    "query" : {
-        "match" : { "user": "kimchy" }
-    }
-}'
-</pre>
-
-Just for kicks, let's get all the documents stored (we should see the tweet from @elastic@ as well):
-
-<pre>
-curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -H 'Content-Type: application/json' -d '
-{
-    "query" : {
-        "match_all" : {}
-    }
-}'
-</pre>
-
-We can also do range search (the @post_date@ was automatically identified as date)
-
-<pre>
-curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -H 'Content-Type: application/json' -d '
-{
-    "query" : {
-        "range" : {
-            "post_date" : { "from" : "2009-11-15T13:00:00", "to" : "2009-11-15T14:00:00" }
-        }
-    }
-}'
-</pre>
-
-There are many more options to perform search, after all, it's a search product no? All the familiar Lucene queries are available through the JSON query language, or through the query parser.
-
-h3. Multi Tenant - Indices and Types
-
-Man, that twitter index might get big (in this case, index size == valuation). Let's see if we can structure our twitter system a bit differently in order to support such large amounts of data.
-
-Elasticsearch supports multiple indices. In the previous example we used an index called @twitter@ that stored tweets for every user.
-
-Another way to define our simple twitter system is to have a different index per user (note, though that each index has an overhead). Here is the indexing curl's in this case:
-
-<pre>
-curl -XPUT 'http://localhost:9200/kimchy/_doc/1?pretty' -H 'Content-Type: application/json' -d '
-{
-    "user": "kimchy",
-    "post_date": "2009-11-15T13:12:00",
-    "message": "Trying out Elasticsearch, so far so good?"
-}'
-
-curl -XPUT 'http://localhost:9200/kimchy/_doc/2?pretty' -H 'Content-Type: application/json' -d '
-{
-    "user": "kimchy",
-    "post_date": "2009-11-15T14:12:12",
-    "message": "Another tweet, will it be indexed?"
-}'
-</pre>
-
-The above will index information into the @kimchy@ index. Each user will get their own special index.
-
-Complete control on the index level is allowed. As an example, in the above case, we would want to change from the default 5 shards with 1 replica per index, to only 1 shard with 1 replica per index (== per twitter user). Here is how this can be done (the configuration can be in yaml as well):
-
-<pre>
-curl -XPUT http://localhost:9200/another_user?pretty -H 'Content-Type: application/json' -d '
-{
-    "settings" : {
-        "index.number_of_shards" : 1,
-        "index.number_of_replicas" : 1
-    }
-}'
-</pre>
-
-Search (and similar operations) are multi index aware. This means that we can easily search on more than one
-index (twitter user), for example:
-
-<pre>
-curl -XGET 'http://localhost:9200/kimchy,another_user/_search?pretty=true' -H 'Content-Type: application/json' -d '
-{
-    "query" : {
-        "match_all" : {}
-    }
-}'
-</pre>
-
-Or on all the indices:
-
-<pre>
-curl -XGET 'http://localhost:9200/_search?pretty=true' -H 'Content-Type: application/json' -d '
-{
-    "query" : {
-        "match_all" : {}
-    }
-}'
-</pre>
-
-{One liner teaser}: And the cool part about that? You can easily search on multiple twitter users (indices), with different boost levels per user (index), making social search so much simpler (results from my friends rank higher than results from friends of my friends).
-
-h3. Distributed, Highly Available
-
-Let's face it, things will fail....
-
-Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replicas. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
-
-In order to play with the distributed nature of Elasticsearch, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
-
-h3. Where to go from here?
-
-We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the "elastic.co":http://www.elastic.co/products/elasticsearch website. General questions can be asked on the "Elastic Discourse forum":https://discuss.elastic.co or on IRC on Freenode at "#elasticsearch":https://webchat.freenode.net/#elasticsearch. The Elasticsearch GitHub repository is reserved for bug reports and feature requests only.
-
-h3. Building from Source
-
-Elasticsearch uses "Gradle":https://gradle.org for its build system.
-
-In order to create a distribution, simply run the @./gradlew assemble@ command in the cloned directory.
-
-The distribution for each project will be created under the @build/distributions@ directory in that project.
-
-See the "TESTING":TESTING.asciidoc file for more information about running the Elasticsearch test suite.
-
-h3. Upgrading from Elasticsearch 1.x?
-
-In order to ensure a smooth upgrade process from earlier versions of
-Elasticsearch (1.x), it is required to perform a full cluster restart. Please
-see the "setup reference":
-https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html
-for more details on the upgrade process.

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch

@@ -8,43 +8,80 @@
 #   ES_PATH_CONF -- Path to config directory
 #   ES_JAVA_OPTS -- External Java Opts on top of the defaults set
 #
-# Optionally, exact memory values can be set using the `ES_JAVA_OPTS`. Note that
-# the Xms and Xmx lines in the JVM options file must be commented out. Example
+# Optionally, exact memory values can be set using the `ES_JAVA_OPTS`. Example
 # values are "512m", and "10g".
 #
 #   ES_JAVA_OPTS="-Xms8g -Xmx8g" ./bin/elasticsearch
 
 source "`dirname "$0"`"/elasticsearch-env
 
-ES_JVM_OPTIONS="$ES_PATH_CONF"/jvm.options
-JVM_OPTIONS=`"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_JVM_OPTIONS"`
-ES_JAVA_OPTS="${JVM_OPTIONS//\$\{ES_TMPDIR\}/$ES_TMPDIR} $ES_JAVA_OPTS"
+CHECK_KEYSTORE=true
+DAEMONIZE=false
+for option in "$@"; do
+  case "$option" in
+    -h|--help|-V|--version)
+      CHECK_KEYSTORE=false
+      ;;
+    -d|--daemonize)
+      DAEMONIZE=true
+      ;;
+  esac
+done
+
+if [ -z "$ES_TMPDIR" ]; then
+  ES_TMPDIR=`"$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
+fi
+
+# get keystore password before setting java options to avoid
+# conflicting GC configurations for the keystore tools
+unset KEYSTORE_PASSWORD
+KEYSTORE_PASSWORD=
+if [[ $CHECK_KEYSTORE = true ]] \
+    && bin/elasticsearch-keystore has-passwd --silent
+then
+  if ! read -s -r -p "Elasticsearch keystore password: " KEYSTORE_PASSWORD ; then
+    echo "Failed to read keystore password on console" 1>&2
+    exit 1
+  fi
+fi
+
+# The JVM options parser produces the final JVM options to start Elasticsearch.
+# It does this by incorporating JVM options in the following way:
+#   - first, system JVM options are applied (these are hardcoded options in the
+#     parser)
+#   - second, JVM options are read from jvm.options and jvm.options.d/*.options
+#   - third, JVM options from ES_JAVA_OPTS are applied
+#   - fourth, ergonomic JVM options are applied
+ES_JAVA_OPTS=`export ES_TMPDIR; "$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.JvmOptionsParser "$ES_PATH_CONF"`
 
-cd "$ES_HOME"
 # manual parsing to find out, if process should be detached
-if ! echo $* | grep -E '(^-d |-d$| -d |--daemonize$|--daemonize )' > /dev/null; then
+if [[ $DAEMONIZE = false ]]; then
   exec \
     "$JAVA" \
+    "$XSHARE" \
     $ES_JAVA_OPTS \
     -Des.path.home="$ES_HOME" \
     -Des.path.conf="$ES_PATH_CONF" \
     -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
     -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
+    -Des.bundled_jdk="$ES_BUNDLED_JDK" \
     -cp "$ES_CLASSPATH" \
     org.elasticsearch.bootstrap.Elasticsearch \
-    "$@"
+    "$@" <<<"$KEYSTORE_PASSWORD"
 else
   exec \
     "$JAVA" \
+    "$XSHARE" \
     $ES_JAVA_OPTS \
     -Des.path.home="$ES_HOME" \
     -Des.path.conf="$ES_PATH_CONF" \
     -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
     -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
+    -Des.bundled_jdk="$ES_BUNDLED_JDK" \
     -cp "$ES_CLASSPATH" \
     org.elasticsearch.bootstrap.Elasticsearch \
     "$@" \
-    <&- &
+    <<<"$KEYSTORE_PASSWORD" &
   retval=$?
   pid=$!
   [ $retval -eq 0 ] || exit $retval

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-certgen

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.cli.CertificateGenerateTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-certgen.bat

@@ -1,20 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.cli.CertificateGenerateTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-certutil

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.cli.CertificateTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-certutil.bat

@@ -1,20 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.cli.CertificateTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/security-cli
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli

@@ -7,7 +7,7 @@ source "`dirname "$0"`"/elasticsearch-env
 IFS=';' read -r -a additional_sources <<< "$ES_ADDITIONAL_SOURCES"
 for additional_source in "${additional_sources[@]}"
 do
-  source "`dirname "$0"`"/$additional_source
+  source "$ES_HOME"/bin/$additional_source
 done
 
 IFS=';' read -r -a additional_classpath_directories <<< "$ES_ADDITIONAL_CLASSPATH_DIRECTORIES"
@@ -22,6 +22,7 @@ ES_JAVA_OPTS="-Xms4m -Xmx64m -XX:+UseSerialGC ${ES_JAVA_OPTS}"
 
 exec \
   "$JAVA" \
+  "$XSHARE" \
   $ES_JAVA_OPTS \
   -Des.path.home="$ES_HOME" \
   -Des.path.conf="$ES_PATH_CONF" \

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-cli.bat

@@ -1,29 +0,0 @@
-call "%~dp0elasticsearch-env.bat" || exit /b 1
-
-if defined ES_ADDITIONAL_SOURCES (
-  for %%a in ("%ES_ADDITIONAL_SOURCES:;=","%") do (
-    call "%~dp0%%a"
-  )
-)
-
-if defined ES_ADDITIONAL_CLASSPATH_DIRECTORIES (
-  for %%a in ("%ES_ADDITIONAL_CLASSPATH_DIRECTORIES:;=","%") do (
-    set ES_CLASSPATH=!ES_CLASSPATH!;!ES_HOME!/%%a/*
-  )
-)
-
-rem use a small heap size for the CLI tools, and thus the serial collector to
-rem avoid stealing many CPU cycles; a user can override by setting ES_JAVA_OPTS
-set ES_JAVA_OPTS=-Xms4m -Xmx64m -XX:+UseSerialGC %ES_JAVA_OPTS%
-
-%JAVA% ^
-  %ES_JAVA_OPTS% ^
-  -Des.path.home="%ES_HOME%" ^
-  -Des.path.conf="%ES_PATH_CONF%" ^
-  -Des.distribution.flavor="%ES_DISTRIBUTION_FLAVOR%" ^
-  -Des.distribution.type="%ES_DISTRIBUTION_TYPE%" ^
-  -cp "%ES_CLASSPATH%" ^
-  "%ES_MAIN_CLASS%" ^
-  %*
-  
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-croneval

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-watcher-env" \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-croneval.bat

@@ -1,19 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-watcher-env
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-env

@@ -36,19 +36,23 @@ ES_HOME=`dirname "$ES_HOME"`
 ES_CLASSPATH="$ES_HOME/lib/*"
 
 # now set the path to java
-if [ -x "$JAVA_HOME/bin/java" ]; then
+if [ ! -z "$JAVA_HOME" ]; then
   JAVA="$JAVA_HOME/bin/java"
+  JAVA_TYPE="JAVA_HOME"
 else
-  set +e
-  JAVA=`which java`
-  echo "warning: Falling back to java on path. This behavior is deprecated. Specify JAVA_HOME"
-  set -e
+  if [ "$(uname -s)" = "Darwin" ]; then
+    # macOS has a different structure
+    JAVA="$ES_HOME/jdk.app/Contents/Home/bin/java"
+  else
+    JAVA="$ES_HOME/jdk/bin/java"
+  fi
+  JAVA_TYPE="bundled jdk"
 fi
 
 if [ ! -x "$JAVA" ]; then
-  echo "could not find java; set JAVA_HOME" >&2
-  exit 1
-fi
+    echo "could not find java in $JAVA_TYPE at $JAVA" >&2
+    exit 1
+  fi
 
 # do not let JAVA_TOOL_OPTIONS slip in (as the JVM does by default)
 if [ ! -z "$JAVA_TOOL_OPTIONS" ]; then
@@ -63,8 +67,14 @@ if [ ! -z "$JAVA_OPTS" ]; then
   echo "pass JVM parameters via ES_JAVA_OPTS"
 fi
 
+if [[ "$("$JAVA" -version 2>/dev/null)" =~ "Unable to map CDS archive" ]]; then
+  XSHARE="-Xshare:off"
+else
+  XSHARE="-Xshare:auto"
+fi
+
 # check the Java version
-"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.java_version_checker.JavaVersionChecker
+"$JAVA" "$XSHARE" -cp "$ES_CLASSPATH" org.elasticsearch.tools.java_version_checker.JavaVersionChecker
 
 export HOSTNAME=$HOSTNAME
 
@@ -78,9 +88,55 @@ fi
 # now make ES_PATH_CONF absolute
 ES_PATH_CONF=`cd "$ES_PATH_CONF"; pwd`
 
-ES_DISTRIBUTION_FLAVOR=default
+ES_DISTRIBUTION_FLAVOR=oss
 ES_DISTRIBUTION_TYPE=tar
-
-if [ -z "$ES_TMPDIR" ]; then
-  ES_TMPDIR=`"$JAVA" -cp "$ES_CLASSPATH" org.elasticsearch.tools.launchers.TempDirectory`
+ES_BUNDLED_JDK=false
+
+if [[ "$ES_DISTRIBUTION_TYPE" == "docker" ]]; then
+  # Allow environment variables to be set by creating a file with the
+  # contents, and setting an environment variable with the suffix _FILE to
+  # point to it. This can be used to provide secrets to a container, without
+  # the values being specified explicitly when running the container.
+  source "$ES_HOME/bin/elasticsearch-env-from-file"
+
+  # Parse Docker env vars to customize Elasticsearch
+  #
+  # e.g. Setting the env var cluster.name=testcluster
+  #
+  # will cause Elasticsearch to be invoked with -Ecluster.name=testcluster
+  #
+  # see https://www.elastic.co/guide/en/elasticsearch/reference/current/settings.html#_setting_default_settings
+
+  declare -a es_arg_array
+
+  while IFS='=' read -r envvar_key envvar_value
+  do
+    # Elasticsearch settings need to have at least two dot separated lowercase
+    # words, e.g. `cluster.name`
+    if [[ "$envvar_key" =~ ^[a-z0-9_]+\.[a-z0-9_]+ ]]; then
+      if [[ ! -z $envvar_value ]]; then
+        es_opt="-E${envvar_key}=${envvar_value}"
+        es_arg_array+=("${es_opt}")
+      fi
+    fi
+  done < <(env)
+
+  # Reset the positional parameters to the es_arg_array values and any existing positional params
+  set -- "$@" "${es_arg_array[@]}"
+
+  # The virtual file /proc/self/cgroup should list the current cgroup
+  # membership. For each hierarchy, you can follow the cgroup path from
+  # this file to the cgroup filesystem (usually /sys/fs/cgroup/) and
+  # introspect the statistics for the cgroup for the given
+  # hierarchy. Alas, Docker breaks this by mounting the container
+  # statistics at the root while leaving the cgroup paths as the actual
+  # paths. Therefore, Elasticsearch provides a mechanism to override
+  # reading the cgroup path from /proc/self/cgroup and instead uses the
+  # cgroup path defined the JVM system property
+  # es.cgroups.hierarchy.override. Therefore, we set this value here so
+  # that cgroup statistics are available for the container this process
+  # will run in.
+  export ES_JAVA_OPTS="-Des.cgroups.hierarchy.override=/ $ES_JAVA_OPTS"
 fi
+
+cd "$ES_HOME"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-env-from-file

@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+# Allow environment variables to be set by creating a file with the
+# contents, and setting an environment variable with the suffix _FILE to
+# point to it. This can be used to provide secrets to a container, without
+# the values being specified explicitly when running the container.
+#
+# Note that only supported environment variables are processed, in order
+# to avoid unexpected failures when an environment sets a "*_FILE" variable
+# that doesn't contain a filename.
+#
+# This script is intended to be sourced, not executed, and modifies the
+# environment.
+
+for VAR_NAME_FILE in ELASTIC_PASSWORD_FILE KEYSTORE_PASSWORD_FILE ; do
+  if [[ -n "${!VAR_NAME_FILE}" ]]; then
+    VAR_NAME="${VAR_NAME_FILE%_FILE}"
+
+    if env | grep "^${VAR_NAME}="; then
+      echo "ERROR: Both $VAR_NAME_FILE and $VAR_NAME are set. These are mutually exclusive." >&2
+      exit 1
+    fi
+
+    if [[ ! -e "${!VAR_NAME_FILE}" ]]; then
+      echo "ERROR: File ${!VAR_NAME_FILE} from $VAR_NAME_FILE does not exist" >&2
+      exit 1
+    fi
+
+    FILE_PERMS="$(stat -L -c '%a' ${!VAR_NAME_FILE})"
+
+    if [[ "$FILE_PERMS" != "400" && "$FILE_PERMS" != "600" ]]; then
+        if [[ -h "${!VAR_NAME_FILE}" ]]; then
+            echo "ERROR: File $(readlink "${!VAR_NAME_FILE}") (target of symlink ${!VAR_NAME_FILE} from $VAR_NAME_FILE) must have file permissions 400 or 600, but actually has: $FILE_PERMS" >&2
+        else
+            echo "ERROR: File ${!VAR_NAME_FILE} from $VAR_NAME_FILE must have file permissions 400 or 600, but actually has: $FILE_PERMS" >&2
+        fi
+        exit 1
+    fi
+
+    echo "Setting $VAR_NAME from $VAR_NAME_FILE at ${!VAR_NAME_FILE}" >&2
+    export "$VAR_NAME"="$(cat ${!VAR_NAME_FILE})"
+
+    unset VAR_NAME
+    # Unset the suffixed environment variable
+    unset "$VAR_NAME_FILE"
+  fi
+done
+

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-env.bat

@@ -1,62 +0,0 @@
-set SCRIPT=%0
-
-rem determine Elasticsearch home; to do this, we strip from the path until we
-rem find bin, and then strip bin (there is an assumption here that there is no
-rem nested directory under bin also named bin)
-for %%I in (%SCRIPT%) do set ES_HOME=%%~dpI
-
-:es_home_loop
-for %%I in ("%ES_HOME:~1,-1%") do set DIRNAME=%%~nxI
-if not "%DIRNAME%" == "bin" (
-  for %%I in ("%ES_HOME%..") do set ES_HOME=%%~dpfI
-  goto es_home_loop
-)
-for %%I in ("%ES_HOME%..") do set ES_HOME=%%~dpfI
-
-rem now set the classpath
-set ES_CLASSPATH=!ES_HOME!\lib\*
-
-rem now set the path to java
-if defined JAVA_HOME (
-  set JAVA="%JAVA_HOME%\bin\java.exe"
-) else (
-  echo warning: Falling back to java on path. This behavior is deprecated. Specify JAVA_HOME
-  for %%I in (java.exe) do set JAVA="%%~$PATH:I"
-)
-
-if not exist %JAVA% (
-  echo could not find java; set JAVA_HOME 1>&2
-  exit /b 1
-)
-
-rem do not let JAVA_TOOL_OPTIONS slip in (as the JVM does by default)
-if defined JAVA_TOOL_OPTIONS (
-  echo warning: ignoring JAVA_TOOL_OPTIONS=%JAVA_TOOL_OPTIONS%
-  set JAVA_TOOL_OPTIONS=
-)
-
-rem JAVA_OPTS is not a built-in JVM mechanism but some people think it is so we
-rem warn them that we are not observing the value of %JAVA_OPTS%
-if defined JAVA_OPTS (
-  (echo|set /p=warning: ignoring JAVA_OPTS=%JAVA_OPTS%; )
-  echo pass JVM parameters via ES_JAVA_OPTS
-)
-
-rem check the Java version
-%JAVA% -cp "%ES_CLASSPATH%" "org.elasticsearch.tools.java_version_checker.JavaVersionChecker" || exit /b 1
-
-set HOSTNAME=%COMPUTERNAME%
-
-if not defined ES_PATH_CONF (
-  set ES_PATH_CONF=!ES_HOME!\config
-)
-
-rem now make ES_PATH_CONF absolute
-for %%I in ("%ES_PATH_CONF%..") do set ES_PATH_CONF=%%~dpfI
-
-set ES_DISTRIBUTION_FLAVOR=default
-set ES_DISTRIBUTION_TYPE=tar
-
-if not defined ES_TMPDIR (
-  for /f "tokens=* usebackq" %%a in (`CALL %JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.TempDirectory"`) do set  ES_TMPDIR=%%a
-)

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-keystore

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 ES_MAIN_CLASS=org.elasticsearch.common.settings.KeyStoreCli \
+  ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/keystore-cli \
   "`dirname "$0"`"/elasticsearch-cli \
   "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-keystore.bat

@@ -1,14 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.common.settings.KeyStoreCli
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-migrate

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmMigrateTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-migrate.bat

@@ -1,19 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmMigrateTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-node

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+ES_MAIN_CLASS=org.elasticsearch.cluster.coordination.NodeToolCli \
+  "`dirname "$0"`"/elasticsearch-cli \
+  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-plugin.bat

@@ -1,16 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.plugins.PluginCli
-set ES_ADDITIONAL_CLASSPATH_DIRECTORIES=lib/tools/plugin-cli
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-  
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-saml-metadata

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.saml.SamlMetadataCommand \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-saml-metadata.bat

@@ -1,19 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.saml.SamlMetadataCommand
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-service.bat

@@ -1,256 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-call "%~dp0elasticsearch-env.bat" || exit /b 1
-
-set EXECUTABLE=%ES_HOME%\bin\elasticsearch-service-x64.exe
-if "%SERVICE_ID%" == "" set SERVICE_ID=elasticsearch-service-x64
-set ARCH=64-bit
-
-if EXIST "%EXECUTABLE%" goto okExe
-echo elasticsearch-service-x64.exe was not found...
-exit /B 1
-
-:okExe
-set ES_VERSION=6.8.4
-
-if "%SERVICE_LOG_DIR%" == "" set SERVICE_LOG_DIR=%ES_HOME%\logs
-
-if "x%1x" == "xx" goto displayUsage
-set SERVICE_CMD=%1
-shift
-if "x%1x" == "xx" goto checkServiceCmd
-set SERVICE_ID=%1
-
-:checkServiceCmd
-
-if "%LOG_OPTS%" == "" set LOG_OPTS=--LogPath "%SERVICE_LOG_DIR%" --LogPrefix "%SERVICE_ID%" --StdError auto --StdOutput auto
-
-if /i %SERVICE_CMD% == install goto doInstall
-if /i %SERVICE_CMD% == remove goto doRemove
-if /i %SERVICE_CMD% == start goto doStart
-if /i %SERVICE_CMD% == stop goto doStop
-if /i %SERVICE_CMD% == manager goto doManagment
-echo Unknown option "%SERVICE_CMD%"
-
-:displayUsage
-echo.
-echo Usage: elasticsearch-service.bat install^|remove^|start^|stop^|manager [SERVICE_ID]
-goto:eof
-
-:doStart
-"%EXECUTABLE%" //ES//%SERVICE_ID% %LOG_OPTS%
-if not errorlevel 1 goto started
-echo Failed starting '%SERVICE_ID%' service
-goto:eof
-:started
-echo The service '%SERVICE_ID%' has been started
-goto:eof
-
-:doStop
-"%EXECUTABLE%" //SS//%SERVICE_ID% %LOG_OPTS%
-if not errorlevel 1 goto stopped
-echo Failed stopping '%SERVICE_ID%' service
-goto:eof
-:stopped
-echo The service '%SERVICE_ID%' has been stopped
-goto:eof
-
-:doManagment
-set EXECUTABLE_MGR=%ES_HOME%\bin\elasticsearch-service-mgr.exe
-"%EXECUTABLE_MGR%" //ES//%SERVICE_ID%
-if not errorlevel 1 goto managed
-echo Failed starting service manager for '%SERVICE_ID%'
-goto:eof
-:managed
-echo Successfully started service manager for '%SERVICE_ID%'.
-goto:eof
-
-:doRemove
-rem Remove the service
-"%EXECUTABLE%" //DS//%SERVICE_ID% %LOG_OPTS%
-if not errorlevel 1 goto removed
-echo Failed removing '%SERVICE_ID%' service
-goto:eof
-:removed
-echo The service '%SERVICE_ID%' has been removed
-goto:eof
-
-:doInstall
-echo Installing service      :  "%SERVICE_ID%"
-echo Using JAVA_HOME (%ARCH%):  "%JAVA_HOME%"
-
-rem Check JVM server dll first
-if exist "%JAVA_HOME%\jre\bin\server\jvm.dll" (
-	set JVM_DLL=\jre\bin\server\jvm.dll
-	goto foundJVM
-)
-
-rem Check 'server' JRE (JRE installed on Windows Server)
-if exist "%JAVA_HOME%\bin\server\jvm.dll" (
-	set JVM_DLL=\bin\server\jvm.dll
-	goto foundJVM
-) else (
-  	echo JAVA_HOME points to an invalid Java installation (no jvm.dll found in "%JAVA_HOME%"^). Exiting...
-  	goto:eof
-)
-
-:foundJVM
-set ES_JVM_OPTIONS=%ES_PATH_CONF%\jvm.options
-
-if not "%ES_JAVA_OPTS%" == "" set ES_JAVA_OPTS=%ES_JAVA_OPTS: =;%
-
-@setlocal
-for /F "usebackq delims=" %%a in (`"%JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.JvmOptionsParser" "!ES_JVM_OPTIONS!" || echo jvm_options_parser_failed"`) do set JVM_OPTIONS=%%a
-@endlocal & set "MAYBE_JVM_OPTIONS_PARSER_FAILED=%JVM_OPTIONS%" & set ES_JAVA_OPTS=%JVM_OPTIONS:${ES_TMPDIR}=!ES_TMPDIR!% %ES_JAVA_OPTS%
-
-if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
-  exit /b 1
-)
-
-if not "%ES_JAVA_OPTS%" == "" set ES_JAVA_OPTS=%ES_JAVA_OPTS: =;%
-
-if "%ES_JAVA_OPTS:~-1%"==";" set ES_JAVA_OPTS=%ES_JAVA_OPTS:~0,-1%
-
-echo %ES_JAVA_OPTS%
-
-@setlocal EnableDelayedExpansion
-for %%a in ("%ES_JAVA_OPTS:;=","%") do (
-  set var=%%a
-  if "!var:~1,4!" == "-Xms" (
-    set XMS=!var:~5,-1!
-    call:convertxm !XMS! JVM_MS
-  )
-  if "!var:~1,16!" == "-XX:MinHeapSize=" (
-    set XMS=!var:~17,-1!
-    call:convertxm !XMS! JVM_MS
-  )
-  if "!var:~1,4!" == "-Xmx" (
-    set XMX=!var:~5,-1!
-    call:convertxm !XMX! JVM_MX
-  )
-  if "!var:~1,16!" == "-XX:MaxHeapSize=" (
-    set XMX=!var:~17,-1!
-    call:convertxm !XMX! JVM_MX
-  )
-  if "!var:~1,4!" == "-Xss" (
-    set XSS=!var:~5,-1!
-    call:convertxk !XSS! JVM_SS
-  )
-  if "!var:~1,20!" == "-XX:ThreadStackSize=" (
-    set XSS=!var:~21,-1!
-    call:convertxk !XSS! JVM_SS
-  )
-)
-@endlocal & set JVM_MS=%JVM_MS% & set JVM_MX=%JVM_MX% & set JVM_SS=%JVM_SS%
-
-if "%JVM_MS%" == "" (
-  echo minimum heap size not set; configure using -Xms via "%ES_JVM_OPTIONS%" or ES_JAVA_OPTS
-  goto:eof
-)
-if "%JVM_MX%" == "" (
-  echo maximum heap size not set; configure using -Xmx via "%ES_JVM_OPTIONS%" or ES_JAVA_OPTS
-  goto:eof
-)
-if "%JVM_SS%" == "" (
-  echo thread stack size not set; configure using -Xss via "%ES_JVM_OPTIONS%" or ES_JAVA_OPTS
-  goto:eof
-)
-
-set ES_PARAMS=-Delasticsearch;-Des.path.home="%ES_HOME%";-Des.path.conf="%ES_PATH_CONF%";-Des.distribution.flavor="%ES_DISTRIBUTION_FLAVOR%";-Des.distribution.type="%ES_DISTRIBUTION_TYPE%"
-
-if "%ES_START_TYPE%" == "" set ES_START_TYPE=manual
-if "%ES_STOP_TIMEOUT%" == "" set ES_STOP_TIMEOUT=0
-
-if "%SERVICE_DISPLAY_NAME%" == "" set SERVICE_DISPLAY_NAME=Elasticsearch %ES_VERSION% (%SERVICE_ID%)
-if "%SERVICE_DESCRIPTION%" == "" set SERVICE_DESCRIPTION=Elasticsearch %ES_VERSION% Windows Service - https://elastic.co
-
-if not "%SERVICE_USERNAME%" == "" (
-	if not "%SERVICE_PASSWORD%" == "" (
-		set SERVICE_PARAMS=%SERVICE_PARAMS% --ServiceUser "%SERVICE_USERNAME%" --ServicePassword "%SERVICE_PASSWORD%"
-	)
-)
-
-"%EXECUTABLE%" //IS//%SERVICE_ID% --Startup %ES_START_TYPE% --StopTimeout %ES_STOP_TIMEOUT% --StartClass org.elasticsearch.bootstrap.Elasticsearch --StartMethod main ++StartParams --quiet --StopClass org.elasticsearch.bootstrap.Elasticsearch --StopMethod close --Classpath "%ES_CLASSPATH%" --JvmMs %JVM_MS% --JvmMx %JVM_MX% --JvmSs %JVM_SS% --JvmOptions %ES_JAVA_OPTS% ++JvmOptions %ES_PARAMS% %LOG_OPTS% --PidFile "%SERVICE_ID%.pid" --DisplayName "%SERVICE_DISPLAY_NAME%" --Description "%SERVICE_DESCRIPTION%" --Jvm "%%JAVA_HOME%%%JVM_DLL%" --StartMode jvm --StopMode jvm --StartPath "%ES_HOME%" %SERVICE_PARAMS% ++Environment HOSTNAME="%%COMPUTERNAME%%"
-
-if not errorlevel 1 goto installed
-echo Failed installing '%SERVICE_ID%' service
-goto:eof
-
-:installed
-echo The service '%SERVICE_ID%' has been installed.
-goto:eof
-
-:err
-echo JAVA_HOME environment variable must be set!
-pause
-goto:eof
-
-rem ---
-rem Function for converting Xm[s|x] values into MB which Commons Daemon accepts
-rem ---
-:convertxm
-set value=%~1
-rem extract last char (unit)
-set unit=%value:~-1%
-rem assume the unit is specified
-set conv=%value:~0,-1%
-
-if "%unit%" == "k" goto kilo
-if "%unit%" == "K" goto kilo
-if "%unit%" == "m" goto mega
-if "%unit%" == "M" goto mega
-if "%unit%" == "g" goto giga
-if "%unit%" == "G" goto giga
-
-rem no unit found, must be bytes; consider the whole value
-set conv=%value%
-rem convert to KB
-set /a conv=%conv% / 1024
-:kilo
-rem convert to MB
-set /a conv=%conv% / 1024
-goto mega
-:giga
-rem convert to MB
-set /a conv=%conv% * 1024
-:mega
-set "%~2=%conv%"
-goto:eof
-
-:convertxk
-set value=%~1
-rem extract last char (unit)
-set unit=%value:~-1%
-rem assume the unit is specified
-set conv=%value:~0,-1%
-
-if "%unit%" == "k" goto kilo
-if "%unit%" == "K" goto kilo
-if "%unit%" == "m" goto mega
-if "%unit%" == "M" goto mega
-if "%unit%" == "g" goto giga
-if "%unit%" == "G" goto giga
-
-rem no unit found, must be bytes; consider the whole value
-set conv=%value%
-rem convert to KB
-set /a conv=%conv% / 1024
-goto kilo
-:mega
-rem convert to KB
-set /a conv=%conv% * 1024
-goto kilo
-:giga
-rem convert to KB
-set /a conv=%conv% * 1024 * 1024
-:kilo
-set "%~2=%conv%"
-goto:eof
-
-endlocal
-endlocal
-
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-setup-passwords

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.tool.SetupPasswordTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-setup-passwords.bat

@@ -1,19 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.esnative.tool.SetupPasswordTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-shard.bat

@@ -1,14 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.index.shard.ShardToolCli
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-env
-
-CLI_JAR=$(ls $ES_HOME/bin/elasticsearch-sql-cli-*.jar)
-
-exec \
-  "$JAVA" \
-  -jar "$CLI_JAR" \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-sql-cli.bat

@@ -1,25 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-call "%~dp0elasticsearch-env.bat" || exit /b 1
-
-call "%~dp0x-pack-env.bat" || exit /b 1
-
-set CLI_JAR=%ES_HOME%/bin/*
-
-%JAVA% ^
-  -cp "%CLI_JAR%" ^
-  -Des.distribution.flavor="%ES_DISTRIBUTION_FLAVOR%" ^
-  -Des.distribution.type="%ES_DISTRIBUTION_TYPE%" ^
-  org.elasticsearch.xpack.sql.cli.Cli ^
-  %*
-
-endlocal
-endlocal
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-syskeygen

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-syskeygen.bat

@@ -1,19 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-translog

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-ES_MAIN_CLASS=org.elasticsearch.index.translog.TranslogToolCli \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-translog.bat

@@ -1,14 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.index.translog.TranslogToolCli
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-users

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.file.tool.UsersTool \
-  ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
-  "`dirname "$0"`"/elasticsearch-cli \
-  "$@"

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch-users.bat

@@ -1,19 +0,0 @@
-@echo off
-
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set ES_MAIN_CLASS=org.elasticsearch.xpack.security.authc.file.tool.UsersTool
-set ES_ADDITIONAL_SOURCES=x-pack-env;x-pack-security-env
-call "%~dp0elasticsearch-cli.bat" ^
-  %%* ^
-  || goto exit
-
-endlocal
-endlocal
-:exit
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/elasticsearch.bat

@@ -1,58 +0,0 @@
-@echo off
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-SET params='%*'
-
-:loop
-FOR /F "usebackq tokens=1* delims= " %%A IN (!params!) DO (
-    SET current=%%A
-    SET params='%%B'
-	SET silent=N
-
-	IF "!current!" == "-s" (
-		SET silent=Y
-	)
-	IF "!current!" == "--silent" (
-		SET silent=Y
-	)
-
-	IF "!silent!" == "Y" (
-		SET nopauseonerror=Y
-	) ELSE (
-	    IF "x!newparams!" NEQ "x" (
-	        SET newparams=!newparams! !current!
-        ) ELSE (
-            SET newparams=!current!
-        )
-	)
-
-    IF "x!params!" NEQ "x" (
-		GOTO loop
-	)
-)
-
-CALL "%~dp0elasticsearch-env.bat" || exit /b 1
-IF ERRORLEVEL 1 (
-	IF NOT DEFINED nopauseonerror (
-		PAUSE
-	)
-	EXIT /B %ERRORLEVEL%
-)
-
-set ES_JVM_OPTIONS=%ES_PATH_CONF%\jvm.options
-@setlocal
-for /F "usebackq delims=" %%a in (`CALL %JAVA% -cp "!ES_CLASSPATH!" "org.elasticsearch.tools.launchers.JvmOptionsParser" "!ES_JVM_OPTIONS!" ^|^| echo jvm_options_parser_failed`) do set JVM_OPTIONS=%%a
-@endlocal & set "MAYBE_JVM_OPTIONS_PARSER_FAILED=%JVM_OPTIONS%" & set ES_JAVA_OPTS=%JVM_OPTIONS:${ES_TMPDIR}=!ES_TMPDIR!% %ES_JAVA_OPTS%
-
-if "%MAYBE_JVM_OPTIONS_PARSER_FAILED%" == "jvm_options_parser_failed" (
-  exit /b 1
-)
-
-cd /d "%ES_HOME%"
-%JAVA% %ES_JAVA_OPTS% -Delasticsearch -Des.path.home="%ES_HOME%" -Des.path.conf="%ES_PATH_CONF%" -Des.distribution.flavor="%ES_DISTRIBUTION_FLAVOR%" -Des.distribution.type="%ES_DISTRIBUTION_TYPE%" -cp "%ES_CLASSPATH%" "org.elasticsearch.bootstrap.Elasticsearch" !newparams!
-
-endlocal
-endlocal
-exit /b %ERRORLEVEL%

sonar-application/src/main/assembly/elasticsearch/bin/x-pack-env

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/modules/x-pack-core/*"

sonar-application/src/main/assembly/elasticsearch/bin/x-pack-env.bat

@@ -1,5 +0,0 @@
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-set ES_CLASSPATH=!ES_CLASSPATH!;!ES_HOME!/modules/x-pack-core/*

sonar-application/src/main/assembly/elasticsearch/bin/x-pack-security-env

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-# include x-pack-security jars in classpath
-ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/modules/x-pack-security/*"

sonar-application/src/main/assembly/elasticsearch/bin/x-pack-security-env.bat

@@ -1,5 +0,0 @@
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-set ES_CLASSPATH=!ES_CLASSPATH!;!ES_HOME!/modules/x-pack-security/*

sonar-application/src/main/assembly/elasticsearch/bin/x-pack-watcher-env

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-# include x-pack-security jars in classpath
-ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/modules/x-pack-watcher/*"

sonar-application/src/main/assembly/elasticsearch/bin/x-pack-watcher-env.bat

@@ -1,5 +0,0 @@
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-
-set ES_CLASSPATH=!ES_CLASSPATH!;!ES_HOME!/modules/x-pack-watcher/*

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/certgen

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/certgen
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-certgen
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/certgen.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%certgen.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-certgen.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/certutil

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/certutil
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-certutil
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/certutil.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%certutil.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-certutil.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/croneval

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/croneval
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-croneval
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/croneval.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%croneval.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-croneval.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/migrate

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/migrate
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-migrate
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/migrate.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%migrate.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-migrate.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/saml-metadata

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/saml-metadata
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-saml-metadata
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/saml-metadata.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%saml-metadata.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-saml-metadata.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/setup-passwords

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/setup-passwords
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-setup-passwords
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/setup-passwords.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%setup-passwords.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-setup-passwords.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/sql-cli

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/sql-cli
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-sql-cli
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/sql-cli.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%sql-cli.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-sql-cli.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/syskeygen

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/syskeygen
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-syskeygen
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/syskeygen.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%syskeygen.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-syskeygen.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/users

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License;
-# you may not use this file except in compliance with the Elastic License.
-
-SCRIPT=$0
-DEPRECATED_DIRECTORY=`dirname "$SCRIPT"`
-DEPRECATED_PATH=$DEPRECATED_DIRECTORY/users
-ELASTICSEARCH_PATH="`dirname "$DEPRECATED_DIRECTORY"`"/elasticsearch-users
-echo "$DEPRECATED_PATH is deprecated, use $ELASTICSEARCH_PATH"
-
-$ELASTICSEARCH_PATH

sonar-application/src/main/assembly/elasticsearch/bin/x-pack/users.bat

@@ -1,21 +0,0 @@
-@echo off
-
-rem
-rem Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-rem or more contributor license agreements. Licensed under the Elastic License;
-rem you may not use this file except in compliance with the Elastic License.
-rem
-
-setlocal enabledelayedexpansion
-setlocal enableextensions
-
-set SCRIPT=%0
-for %%I in (%SCRIPT%) do set DEPRECATED_DIRECTORY=%%~dpI
-set DEPRECATED_PATH=%DEPRECATED_DIRECTORY%users.bat
-for %%I in ("%DEPRECATED_DIRECTORY%..") do set ELASTICSEARCH_PATH=%%~dpfI\elasticsearch-users.bat
-echo %DEPRECATED_PATH% is deprecated, use %ELASTICSEARCH_PATH%
-
-call "%ELASTICSEARCH_PATH%" || exit /b 1
-
-endlocal
-endlocal

sonar-application/src/main/assembly/elasticsearch/config/elasticsearch.yml

@@ -62,16 +62,16 @@
 #
 # --------------------------------- Discovery ----------------------------------
 #
-# Pass an initial list of hosts to perform discovery when new node is started:
+# Pass an initial list of hosts to perform discovery when this node is started:
 # The default list of hosts is ["127.0.0.1", "[::1]"]
 #
-#discovery.zen.ping.unicast.hosts: ["host1", "host2"]
+#discovery.seed_hosts: ["host1", "host2"]
 #
-# Prevent the "split brain" by configuring the majority of nodes (total number of master-eligible nodes / 2 + 1):
+# Bootstrap the cluster using an initial set of master-eligible nodes:
 #
-#discovery.zen.minimum_master_nodes: 
+#cluster.initial_master_nodes: ["node-1", "node-2"]
 #
-# For more information, consult the zen discovery module documentation.
+# For more information, consult the discovery and cluster formation module documentation.
 #
 # ---------------------------------- Gateway -----------------------------------
 #

sonar-application/src/main/assembly/elasticsearch/config/jvm.options

@@ -33,59 +33,21 @@
 ################################################################
 
 ## GC configuration
--XX:+UseConcMarkSweepGC
--XX:CMSInitiatingOccupancyFraction=75
--XX:+UseCMSInitiatingOccupancyOnly
+8-13:-XX:+UseConcMarkSweepGC
+8-13:-XX:CMSInitiatingOccupancyFraction=75
+8-13:-XX:+UseCMSInitiatingOccupancyOnly
 
 ## G1GC Configuration
-# NOTE: G1GC is only supported on JDK version 10 or later.
-# To use G1GC uncomment the lines below.
-# 10-:-XX:-UseConcMarkSweepGC
-# 10-:-XX:-UseCMSInitiatingOccupancyOnly
-# 10-:-XX:+UseG1GC
-# 10-:-XX:InitiatingHeapOccupancyPercent=75
-
-## DNS cache policy
-# cache ttl in seconds for positive DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.ttl; set to -1 to cache forever
--Des.networkaddress.cache.ttl=60
-# cache ttl in seconds for negative DNS lookups noting that this overrides the
-# JDK security property networkaddress.cache.negative ttl; set to -1 to cache
-# forever
--Des.networkaddress.cache.negative.ttl=10
-
-## optimizations
-
-# pre-touch memory pages used by the JVM during initialization
--XX:+AlwaysPreTouch
-
-## basic
-
-# explicitly set the stack size
--Xss1m
-
-# set to headless, just in case
--Djava.awt.headless=true
-
-# ensure UTF-8 encoding by default (e.g. filenames)
--Dfile.encoding=UTF-8
-
-# use our provided JNA always versus the system one
--Djna.nosys=true
-
-# turn off a JDK optimization that throws away stack traces for common
-# exceptions because stack traces are important for debugging
--XX:-OmitStackTraceInFastThrow
-
-# flags to configure Netty
--Dio.netty.noUnsafe=true
--Dio.netty.noKeySetOptimization=true
--Dio.netty.recycler.maxCapacityPerThread=0
-
-# log4j 2
--Dlog4j.shutdownHookEnabled=false
--Dlog4j2.disable.jmx=true
-
+# NOTE: G1 GC is only supported on JDK version 10 or later
+# to use G1GC, uncomment the next two lines and update the version on the
+# following three lines to your version of the JDK
+# 10-13:-XX:-UseConcMarkSweepGC
+# 10-13:-XX:-UseCMSInitiatingOccupancyOnly
+14-:-XX:+UseG1GC
+14-:-XX:G1ReservePercent=25
+14-:-XX:InitiatingHeapOccupancyPercent=30
+
+## JVM temporary directory
 -Djava.io.tmpdir=${ES_TMPDIR}
 
 ## heap dumps
@@ -102,7 +64,6 @@
 -XX:ErrorFile=logs/hs_err_pid%p.log
 
 ## JDK 8 GC logging
-
 8:-XX:+PrintGCDetails
 8:-XX:+PrintGCDateStamps
 8:-XX:+PrintTenuringDistribution
@@ -114,9 +75,3 @@
 
 # JDK 9+ GC logging
 9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
-# due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
-# time/date parsing will break in an incompatible way for some date patterns and locals
-9-:-Djava.locale.providers=COMPAT
-
-# temporary workaround for C2 bug with JDK 10 on hardware with AVX-512
-10-:-XX:UseAVX=2

sonar-application/src/main/assembly/elasticsearch/config/log4j2.properties

@@ -1,20 +1,18 @@
 status = error
 
-# log action execution errors for easier debugging
-logger.action.name = org.elasticsearch.action
-logger.action.level = debug
-
 appender.console.type = Console
 appender.console.name = console
 appender.console.layout.type = PatternLayout
 appender.console.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
 
+######## Server JSON ############################
 appender.rolling.type = RollingFile
 appender.rolling.name = rolling
-appender.rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}.log
-appender.rolling.layout.type = PatternLayout
-appender.rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %.-10000m%n
-appender.rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_server.json
+appender.rolling.layout.type = ESJsonLayout
+appender.rolling.layout.type_name = server
+
+appender.rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}-%d{yyyy-MM-dd}-%i.json.gz
 appender.rolling.policies.type = Policies
 appender.rolling.policies.time.type = TimeBasedTriggeringPolicy
 appender.rolling.policies.time.interval = 1
@@ -29,160 +27,147 @@ appender.rolling.strategy.action.condition.type = IfFileName
 appender.rolling.strategy.action.condition.glob = ${sys:es.logs.cluster_name}-*
 appender.rolling.strategy.action.condition.nested_condition.type = IfAccumulatedFileSize
 appender.rolling.strategy.action.condition.nested_condition.exceeds = 2GB
+################################################
+######## Server -  old style pattern ###########
+appender.rolling_old.type = RollingFile
+appender.rolling_old.name = rolling_old
+appender.rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}.log
+appender.rolling_old.layout.type = PatternLayout
+appender.rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}-%d{yyyy-MM-dd}-%i.log.gz
+appender.rolling_old.policies.type = Policies
+appender.rolling_old.policies.time.type = TimeBasedTriggeringPolicy
+appender.rolling_old.policies.time.interval = 1
+appender.rolling_old.policies.time.modulate = true
+appender.rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.rolling_old.policies.size.size = 128MB
+appender.rolling_old.strategy.type = DefaultRolloverStrategy
+appender.rolling_old.strategy.fileIndex = nomax
+appender.rolling_old.strategy.action.type = Delete
+appender.rolling_old.strategy.action.basepath = ${sys:es.logs.base_path}
+appender.rolling_old.strategy.action.condition.type = IfFileName
+appender.rolling_old.strategy.action.condition.glob = ${sys:es.logs.cluster_name}-*
+appender.rolling_old.strategy.action.condition.nested_condition.type = IfAccumulatedFileSize
+appender.rolling_old.strategy.action.condition.nested_condition.exceeds = 2GB
+################################################
 
 rootLogger.level = info
 rootLogger.appenderRef.console.ref = console
 rootLogger.appenderRef.rolling.ref = rolling
+rootLogger.appenderRef.rolling_old.ref = rolling_old
 
+######## Deprecation JSON #######################
 appender.deprecation_rolling.type = RollingFile
 appender.deprecation_rolling.name = deprecation_rolling
-appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.log
-appender.deprecation_rolling.layout.type = PatternLayout
-appender.deprecation_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %.-10000m%n
-appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.log.gz
+appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.json
+appender.deprecation_rolling.layout.type = ESJsonLayout
+appender.deprecation_rolling.layout.type_name = deprecation
+appender.deprecation_rolling.layout.esmessagefields=x-opaque-id
+
+appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.json.gz
 appender.deprecation_rolling.policies.type = Policies
 appender.deprecation_rolling.policies.size.type = SizeBasedTriggeringPolicy
 appender.deprecation_rolling.policies.size.size = 1GB
 appender.deprecation_rolling.strategy.type = DefaultRolloverStrategy
 appender.deprecation_rolling.strategy.max = 4
-
+#################################################
+######## Deprecation -  old style pattern #######
+appender.deprecation_rolling_old.type = RollingFile
+appender.deprecation_rolling_old.name = deprecation_rolling_old
+appender.deprecation_rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.log
+appender.deprecation_rolling_old.layout.type = PatternLayout
+appender.deprecation_rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.deprecation_rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _deprecation-%i.log.gz
+appender.deprecation_rolling_old.policies.type = Policies
+appender.deprecation_rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.deprecation_rolling_old.policies.size.size = 1GB
+appender.deprecation_rolling_old.strategy.type = DefaultRolloverStrategy
+appender.deprecation_rolling_old.strategy.max = 4
+#################################################
 logger.deprecation.name = org.elasticsearch.deprecation
 logger.deprecation.level = warn
 logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
+logger.deprecation.appenderRef.deprecation_rolling_old.ref = deprecation_rolling_old
 logger.deprecation.additivity = false
 
+######## Search slowlog JSON ####################
 appender.index_search_slowlog_rolling.type = RollingFile
 appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
-appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_search_slowlog.log
-appender.index_search_slowlog_rolling.layout.type = PatternLayout
-appender.index_search_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] [%node_name]%marker %.-10000m%n
-appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_search_slowlog-%d{yyyy-MM-dd}.log
+appender.index_search_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs\
+  .cluster_name}_index_search_slowlog.json
+appender.index_search_slowlog_rolling.layout.type = ESJsonLayout
+appender.index_search_slowlog_rolling.layout.type_name = index_search_slowlog
+appender.index_search_slowlog_rolling.layout.esmessagefields=message,took,took_millis,total_hits,types,stats,search_type,total_shards,source,id
+
+appender.index_search_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs\
+  .cluster_name}_index_search_slowlog-%i.json.gz
 appender.index_search_slowlog_rolling.policies.type = Policies
-appender.index_search_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.index_search_slowlog_rolling.policies.time.interval = 1
-appender.index_search_slowlog_rolling.policies.time.modulate = true
-
+appender.index_search_slowlog_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_search_slowlog_rolling.policies.size.size = 1GB
+appender.index_search_slowlog_rolling.strategy.type = DefaultRolloverStrategy
+appender.index_search_slowlog_rolling.strategy.max = 4
+#################################################
+######## Search slowlog -  old style pattern ####
+appender.index_search_slowlog_rolling_old.type = RollingFile
+appender.index_search_slowlog_rolling_old.name = index_search_slowlog_rolling_old
+appender.index_search_slowlog_rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_search_slowlog.log
+appender.index_search_slowlog_rolling_old.layout.type = PatternLayout
+appender.index_search_slowlog_rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.index_search_slowlog_rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_search_slowlog-%i.log.gz
+appender.index_search_slowlog_rolling_old.policies.type = Policies
+appender.index_search_slowlog_rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_search_slowlog_rolling_old.policies.size.size = 1GB
+appender.index_search_slowlog_rolling_old.strategy.type = DefaultRolloverStrategy
+appender.index_search_slowlog_rolling_old.strategy.max = 4
+#################################################
 logger.index_search_slowlog_rolling.name = index.search.slowlog
 logger.index_search_slowlog_rolling.level = trace
 logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling.ref = index_search_slowlog_rolling
+logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling_old.ref = index_search_slowlog_rolling_old
 logger.index_search_slowlog_rolling.additivity = false
 
+######## Indexing slowlog JSON ##################
 appender.index_indexing_slowlog_rolling.type = RollingFile
 appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
-appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_indexing_slowlog.log
-appender.index_indexing_slowlog_rolling.layout.type = PatternLayout
-appender.index_indexing_slowlog_rolling.layout.pattern = [%d{ISO8601}][%-5p][%-25c] [%node_name]%marker %.-10000m%n
-appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_index_indexing_slowlog-%d{yyyy-MM-dd}.log
+appender.index_indexing_slowlog_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog.json
+appender.index_indexing_slowlog_rolling.layout.type = ESJsonLayout
+appender.index_indexing_slowlog_rolling.layout.type_name = index_indexing_slowlog
+appender.index_indexing_slowlog_rolling.layout.esmessagefields=message,took,took_millis,doc_type,id,routing,source
+
+appender.index_indexing_slowlog_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog-%i.json.gz
 appender.index_indexing_slowlog_rolling.policies.type = Policies
-appender.index_indexing_slowlog_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.index_indexing_slowlog_rolling.policies.time.interval = 1
-appender.index_indexing_slowlog_rolling.policies.time.modulate = true
+appender.index_indexing_slowlog_rolling.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_indexing_slowlog_rolling.policies.size.size = 1GB
+appender.index_indexing_slowlog_rolling.strategy.type = DefaultRolloverStrategy
+appender.index_indexing_slowlog_rolling.strategy.max = 4
+#################################################
+######## Indexing slowlog -  old style pattern ##
+appender.index_indexing_slowlog_rolling_old.type = RollingFile
+appender.index_indexing_slowlog_rolling_old.name = index_indexing_slowlog_rolling_old
+appender.index_indexing_slowlog_rolling_old.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog.log
+appender.index_indexing_slowlog_rolling_old.layout.type = PatternLayout
+appender.index_indexing_slowlog_rolling_old.layout.pattern = [%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n
+
+appender.index_indexing_slowlog_rolling_old.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}\
+  _index_indexing_slowlog-%i.log.gz
+appender.index_indexing_slowlog_rolling_old.policies.type = Policies
+appender.index_indexing_slowlog_rolling_old.policies.size.type = SizeBasedTriggeringPolicy
+appender.index_indexing_slowlog_rolling_old.policies.size.size = 1GB
+appender.index_indexing_slowlog_rolling_old.strategy.type = DefaultRolloverStrategy
+appender.index_indexing_slowlog_rolling_old.strategy.max = 4
+#################################################
 
 logger.index_indexing_slowlog.name = index.indexing.slowlog.index
 logger.index_indexing_slowlog.level = trace
 logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling.ref = index_indexing_slowlog_rolling
+logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling_old.ref = index_indexing_slowlog_rolling_old
 logger.index_indexing_slowlog.additivity = false
-
-
-appender.audit_rolling.type = RollingFile
-appender.audit_rolling.name = audit_rolling
-appender.audit_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_audit.log
-appender.audit_rolling.layout.type = PatternLayout
-appender.audit_rolling.layout.pattern = {\
-                "@timestamp":"%d{ISO8601}"\
-                %varsNotEmpty{, "node.name":"%enc{%map{node.name}}{JSON}"}\
-                %varsNotEmpty{, "node.id":"%enc{%map{node.id}}{JSON}"}\
-                %varsNotEmpty{, "host.name":"%enc{%map{host.name}}{JSON}"}\
-                %varsNotEmpty{, "host.ip":"%enc{%map{host.ip}}{JSON}"}\
-                %varsNotEmpty{, "event.type":"%enc{%map{event.type}}{JSON}"}\
-                %varsNotEmpty{, "event.action":"%enc{%map{event.action}}{JSON}"}\
-                %varsNotEmpty{, "user.name":"%enc{%map{user.name}}{JSON}"}\
-                %varsNotEmpty{, "user.run_by.name":"%enc{%map{user.run_by.name}}{JSON}"}\
-                %varsNotEmpty{, "user.run_as.name":"%enc{%map{user.run_as.name}}{JSON}"}\
-                %varsNotEmpty{, "user.realm":"%enc{%map{user.realm}}{JSON}"}\
-                %varsNotEmpty{, "user.run_by.realm":"%enc{%map{user.run_by.realm}}{JSON}"}\
-                %varsNotEmpty{, "user.run_as.realm":"%enc{%map{user.run_as.realm}}{JSON}"}\
-                %varsNotEmpty{, "user.roles":%map{user.roles}}\
-                %varsNotEmpty{, "origin.type":"%enc{%map{origin.type}}{JSON}"}\
-                %varsNotEmpty{, "origin.address":"%enc{%map{origin.address}}{JSON}"}\
-                %varsNotEmpty{, "realm":"%enc{%map{realm}}{JSON}"}\
-                %varsNotEmpty{, "url.path":"%enc{%map{url.path}}{JSON}"}\
-                %varsNotEmpty{, "url.query":"%enc{%map{url.query}}{JSON}"}\
-                %varsNotEmpty{, "request.method":"%enc{%map{request.method}}{JSON}"}\
-                %varsNotEmpty{, "request.body":"%enc{%map{request.body}}{JSON}"}\
-                %varsNotEmpty{, "request.id":"%enc{%map{request.id}}{JSON}"}\
-                %varsNotEmpty{, "action":"%enc{%map{action}}{JSON}"}\
-                %varsNotEmpty{, "request.name":"%enc{%map{request.name}}{JSON}"}\
-                %varsNotEmpty{, "indices":%map{indices}}\
-                %varsNotEmpty{, "opaque_id":"%enc{%map{opaque_id}}{JSON}"}\
-                %varsNotEmpty{, "x_forwarded_for":"%enc{%map{x_forwarded_for}}{JSON}"}\
-                %varsNotEmpty{, "transport.profile":"%enc{%map{transport.profile}}{JSON}"}\
-                %varsNotEmpty{, "rule":"%enc{%map{rule}}{JSON}"}\
-                %varsNotEmpty{, "event.category":"%enc{%map{event.category}}{JSON}"}\
-                }%n
-# "node.name" node name from the `elasticsearch.yml` settings
-# "node.id" node id which should not change between cluster restarts
-# "host.name" unresolved hostname of the local node
-# "host.ip" the local bound ip (i.e. the ip listening for connections)
-# "event.type" a received REST request is translated into one or more transport requests. This indicates which processing layer generated the event "rest" or "transport" (internal)
-# "event.action" the name of the audited event, eg. "authentication_failed", "access_granted", "run_as_granted", etc.
-# "user.name" the subject name as authenticated by a realm
-# "user.run_by.name" the original authenticated subject name that is impersonating another one.
-# "user.run_as.name" if this "event.action" is of a run_as type, this is the subject name to be impersonated as.
-# "user.realm" the name of the realm that authenticated "user.name"
-# "user.run_by.realm" the realm name of the impersonating subject ("user.run_by.name")
-# "user.run_as.realm" if this "event.action" is of a run_as type, this is the realm name the impersonated user is looked up from
-# "user.roles" the roles array of the user; these are the roles that are granting privileges
-# "origin.type" it is "rest" if the event is originating (is in relation to) a REST request; possible other values are "transport" and "ip_filter"
-# "origin.address" the remote address and port of the first network hop, i.e. a REST proxy or another cluster node
-# "realm" name of a realm that has generated an "authentication_failed" or an "authentication_successful"; the subject is not yet authenticated
-# "url.path" the URI component between the port and the query string; it is percent (URL) encoded
-# "url.query" the URI component after the path and before the fragment; it is percent (URL) encoded
-# "request.method" the method of the HTTP request, i.e. one of GET, POST, PUT, DELETE, OPTIONS, HEAD, PATCH, TRACE, CONNECT
-# "request.body" the content of the request body entity, JSON escaped
-# "request.id" a synthentic identifier for the incoming request, this is unique per incoming request, and consistent across all audit events generated by that request
-# "action" an action is the most granular operation that is authorized and this identifies it in a namespaced way (internal)
-# "request.name" if the event is in connection to a transport message this is the name of the request class, similar to how rest requests are identified by the url path (internal)
-# "indices" the array of indices that the "action" is acting upon
-# "opaque_id" opaque value conveyed by the "X-Opaque-Id" request header
-# "x_forwarded_for" the addresses from the "X-Forwarded-For" request header, as a verbatim string value (not an array)
-# "transport.profile" name of the transport profile in case this is a "connection_granted" or "connection_denied" event
-# "rule" name of the applied rulee if the "origin.type" is "ip_filter"
-# "event.category" fixed value "elasticsearch-audit"
-
-appender.audit_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_audit-%d{yyyy-MM-dd}.log
-appender.audit_rolling.policies.type = Policies
-appender.audit_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.audit_rolling.policies.time.interval = 1
-appender.audit_rolling.policies.time.modulate = true
-
-appender.deprecated_audit_rolling.type = RollingFile
-appender.deprecated_audit_rolling.name = deprecated_audit_rolling
-appender.deprecated_audit_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_access.log
-appender.deprecated_audit_rolling.layout.type = PatternLayout
-appender.deprecated_audit_rolling.layout.pattern = [%d{ISO8601}] %m%n
-appender.deprecated_audit_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_access-%d{yyyy-MM-dd}.log
-appender.deprecated_audit_rolling.policies.type = Policies
-appender.deprecated_audit_rolling.policies.time.type = TimeBasedTriggeringPolicy
-appender.deprecated_audit_rolling.policies.time.interval = 1
-appender.deprecated_audit_rolling.policies.time.modulate = true
-
-logger.xpack_security_audit_logfile.name = org.elasticsearch.xpack.security.audit.logfile.LoggingAuditTrail
-logger.xpack_security_audit_logfile.level = info
-logger.xpack_security_audit_logfile.appenderRef.audit_rolling.ref = audit_rolling
-logger.xpack_security_audit_logfile.additivity = false
-
-logger.xpack_security_audit_deprecated_logfile.name = org.elasticsearch.xpack.security.audit.logfile.DeprecatedLoggingAuditTrail
-# set this to "off" instead of "info" to disable the deprecated appender
-# in the 6.x releases both the new and the previous appenders are enabled
-# for the logfile auditing
-logger.xpack_security_audit_deprecated_logfile.level = info
-logger.xpack_security_audit_deprecated_logfile.appenderRef.deprecated_audit_rolling.ref = deprecated_audit_rolling
-logger.xpack_security_audit_deprecated_logfile.additivity = false
-
-logger.xmlsig.name = org.apache.xml.security.signature.XMLSignature
-logger.xmlsig.level = error
-logger.samlxml_decrypt.name = org.opensaml.xmlsec.encryption.support.Decrypter
-logger.samlxml_decrypt.level = fatal
-logger.saml2_decrypt.name = org.opensaml.saml.saml2.encryption.Decrypter
-logger.saml2_decrypt.level = fatal

sonar-application/src/main/assembly/elasticsearch/config/role_mapping.yml

@@ -1,14 +0,0 @@
-# Role mapping configuration file which has elasticsearch roles as keys
-# that map to one or more user or group distinguished names
-
-#roleA:   this is an elasticsearch role
-#  - groupA-DN  this is a group distinguished name
-#  - groupB-DN
-#  - user1-DN   this is the full user distinguished name
-
-#power_user:
-#  - "cn=admins,dc=example,dc=com"
-#user:
-#  - "cn=users,dc=example,dc=com"
-#  - "cn=admins,dc=example,dc=com"
-#  - "cn=John Doe,cn=other users,dc=example,dc=com"

sonar-application/src/main/assembly/elasticsearch/config/roles.yml

@@ -1,3 +0,0 @@
-# The default roles file is empty as the preferred method of defining roles is
-# through the API/UI. File based roles are useful in error scenarios when the
-# API based roles may not be available.