-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature] Support ElasticSearch 7 as backend storage (#3870)
* [Feature] Officially support ElasticSearch 7 as backend storage * Extract bootstrap module to be shared by multiple starters * Add missing configuration file and distinguish different version in test * Update known-oap-backend-dependencies-es7.txt Update the dependency lib * Fix missing adaptation to ElasticSearch 7 * Rename ElasticSearch 7 specific class with Es7 infix * Fix miss-adapted ElasticSearch DAO API * Add ES7 specific configuration and polish documentations * Polish documentations * Polish documentations
- Loading branch information
1 parent
6c4cca8
commit 9b408e8
Showing
79 changed files
with
2,928 additions
and
418 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
<!-- | ||
~ Licensed to the Apache Software Foundation (ASF) under one or more | ||
~ contributor license agreements. See the NOTICE file distributed with | ||
~ this work for additional information regarding copyright ownership. | ||
~ The ASF licenses this file to You 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. | ||
~ | ||
--> | ||
|
||
<assembly | ||
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> | ||
<id>dist</id> | ||
<formats> | ||
<format>zip</format> | ||
<format>tar.gz</format> | ||
</formats> | ||
<fileSets> | ||
<fileSet> | ||
<directory>${project.basedir}/bin</directory> | ||
<outputDirectory>/bin</outputDirectory> | ||
<includes> | ||
<include>*.sh</include> | ||
<include>*.bat</include> | ||
</includes> | ||
<fileMode>0755</fileMode> | ||
</fileSet> | ||
<fileSet> | ||
<directory>src/main/assembly</directory> | ||
<outputDirectory>/config</outputDirectory> | ||
<includes> | ||
<include>log4j2.xml</include> | ||
<include>application.yml</include> | ||
<include>alarm-settings.yml</include> | ||
<include>alarm-settings-sample.yml</include> | ||
</includes> | ||
</fileSet> | ||
<fileSet> | ||
<directory>${project.basedir}/../oap-server/server-bootstrap/src/main/resources</directory> | ||
<includes> | ||
<include>component-libraries.yml</include> | ||
<include>official_analysis.oal</include> | ||
<include>gateways.yml</include> | ||
</includes> | ||
<outputDirectory>/config</outputDirectory> | ||
</fileSet> | ||
<fileSet> | ||
<directory>${project.basedir}/../oap-server/server-starter-es7/target/skywalking-oap-assembly/skywalking-oap/config</directory> | ||
<outputDirectory>/config</outputDirectory> | ||
<includes> | ||
<include>*.yml</include> | ||
<include>*.xml</include> | ||
<include>*.properties</include> | ||
<include>*.oal</include> | ||
</includes> | ||
</fileSet> | ||
<fileSet> | ||
<directory>${project.basedir}/../oap-server/server-starter-es7/target/skywalking-oap-assembly/skywalking-oap/libs</directory> | ||
<outputDirectory>/oap-libs</outputDirectory> | ||
</fileSet> | ||
|
||
<!-- Agent repackage into the dist --> | ||
<fileSet> | ||
<directory>${project.basedir}/../skywalking-agent</directory> | ||
<outputDirectory>/agent</outputDirectory> | ||
</fileSet> | ||
|
||
<!-- Release docs and licenses --> | ||
<fileSet> | ||
<directory>${project.basedir}/../</directory> | ||
<outputDirectory>/</outputDirectory> | ||
<includes> | ||
<include>DISCLAIMER</include> | ||
<include>CHANGES</include> | ||
</includes> | ||
</fileSet> | ||
|
||
<fileSet> | ||
<directory>${project.basedir}/release-docs</directory> | ||
<outputDirectory>/</outputDirectory> | ||
</fileSet> | ||
</fileSets> | ||
<files> | ||
<file> | ||
<source>${project.basedir}/../apm-webapp/target/skywalking-webapp.jar</source> | ||
<outputDirectory>/webapp</outputDirectory> | ||
<fileMode>0644</fileMode> | ||
</file> | ||
<file> | ||
<source>${project.basedir}/../apm-webapp/src/main/assembly/webapp.yml</source> | ||
<outputDirectory>/webapp</outputDirectory> | ||
<fileMode>0644</fileMode> | ||
</file> | ||
</files> | ||
</assembly> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.