diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 77320281142..8e6cc657432 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -261,15 +261,6 @@ Or more simply, if your AWS credentials are already stored in `~/.aws/credential -Dtest.elasticsearch.connection.aws.region= ``` -When building Hibernate Search with new JDKs, -you may want to run Elasticsearch with a different JDK than the one used by Maven. -This can be done by setting a property -(**this will only work with the profiles for Elasticsearch 5 and above**): - -```bash -./mvnw clean install -Dtest.elasticsearch.run.java_home=/path/to/my/jdk -``` - ### JQAssistant You can request static analysis and sanity checks with the `jqassistant` profile. diff --git a/Jenkinsfile b/Jenkinsfile index fdacdb946bc..6d26b830e94 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -207,54 +207,42 @@ stage('Configure') { ], esLocal: [ new EsLocalBuildEnvironment(versionRange: '[5.6,6.0)', mavenProfile: 'elasticsearch-5.6', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.AFTER_MERGE), // ES 6.2, 6.3.0, 6.3.1 and 6.3.2 and below have a bug that prevents double-nested // sorts from working: https://github.com/elastic/elasticsearch/issues/32130 new EsLocalBuildEnvironment(versionRange: '[6.0,6.2)', mavenProfile: 'elasticsearch-6.0', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.ON_DEMAND), // ES 6.3 has a bug that prevents IndexingIT from passing. // See https://github.com/elastic/elasticsearch/issues/32395 new EsLocalBuildEnvironment(versionRange: '[6.3,6.4)', mavenProfile: 'elasticsearch-6.3', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.ON_DEMAND), new EsLocalBuildEnvironment(versionRange: '[6.4,6.7)', mavenProfile: 'elasticsearch-6.4', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.AFTER_MERGE), // Not testing 6.7 to make the build quicker. // The only difference with 6.8+ is a bug in field sorts that is already present in earlier versions. new EsLocalBuildEnvironment(versionRange: '[6.7,6.8)', mavenProfile: 'elasticsearch-6.7', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.ON_DEMAND), new EsLocalBuildEnvironment(versionRange: '[6.8,7.0)', mavenProfile: 'elasticsearch-6.8', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.AFTER_MERGE), // Not testing 7.0/7.1/7.2 to make the build quicker. // The only difference with 7.3+ is they have a bug in their BigInteger support. new EsLocalBuildEnvironment(versionRange: '[7.0,7.3)', mavenProfile: 'elasticsearch-7.0', - jdkTool: 'OpenJDK 8 Latest', condition: TestCondition.ON_DEMAND), new EsLocalBuildEnvironment(versionRange: '[7.3,7.7)', mavenProfile: 'elasticsearch-7.3', - jdkTool: 'OpenJDK 11 Latest', condition: TestCondition.AFTER_MERGE), // Not testing 7.7 to make the build quicker. // The only difference with 7.7+ is how we create templates for tests. new EsLocalBuildEnvironment(versionRange: '[7.7,7.8)', mavenProfile: 'elasticsearch-7.7', - jdkTool: 'OpenJDK 11 Latest', condition: TestCondition.ON_DEMAND), // Not testing 7.9 to make the build quicker. // The only difference with 7.10+ is an additional test for exists on null values, // which is disabled on 7.10 but enabled on all older versions (not just 7.9). new EsLocalBuildEnvironment(versionRange: '[7.8,7.10)', mavenProfile: 'elasticsearch-7.8', - jdkTool: 'OpenJDK 11 Latest', condition: TestCondition.AFTER_MERGE), new EsLocalBuildEnvironment(versionRange: '[7.10,7.11)', mavenProfile: 'elasticsearch-7.10', - jdkTool: 'OpenJDK 11 Latest', condition: TestCondition.BEFORE_MERGE, isDefault: true), new EsLocalBuildEnvironment(versionRange: '[7.11,7.x)', mavenProfile: 'elasticsearch-7.11', - jdkTool: 'OpenJDK 11 Latest', condition: TestCondition.AFTER_MERGE) ], // Note that each of these environments will only be tested if the appropriate @@ -464,7 +452,6 @@ stage('Default build') { -Pdist -Pcoverage -Pjqassistant \ ${enableDefaultBuildIT ? '' : '-DskipITs'} \ ${toTestJdkArg(environments.content.jdk.default)} \ - ${toElasticsearchJdkArg(environments.content.jdk.default)} \ """ // Don't try to report to Coveralls.io or SonarCloud if coverage data is missing @@ -760,10 +747,6 @@ abstract class BuildEnvironment { String getMavenJdkTool(def allEnvironments) { allEnvironments.content.jdk.default.buildJdkTool } - - String getElasticsearchJdkTool(def allEnvironments) { - allEnvironments.content.esLocal.default.jdkTool - } } class JdkBuildEnvironment extends BuildEnvironment { @@ -797,13 +780,8 @@ class DatabaseBuildEnvironment extends BuildEnvironment { class EsLocalBuildEnvironment extends BuildEnvironment { String versionRange String mavenProfile - String jdkTool @Override String getTag() { "elasticsearch-local-$versionRange" } - @Override - String getElasticsearchJdkTool(def allEnvironments) { - jdkTool - } } class EsAwsBuildEnvironment extends BuildEnvironment { @@ -814,10 +792,6 @@ class EsAwsBuildEnvironment extends BuildEnvironment { boolean staticCredentials = false @Override String getTag() { "elasticsearch-aws-$version" + (staticCredentials ? "-credentials-static" : "") } - @Override - String getElasticsearchJdkTool(def allEnvironments) { - null // No JDK needed for Elasticsearch: the Elasticsearch instance is remote. - } String getNameEmbeddableVersion() { version.replaceAll('\\.', '') } @@ -921,7 +895,6 @@ void mavenNonDefaultBuild(BuildEnvironment buildEnv, String args, String project sh """ \ mvn -Dsurefire.environment=$testSuffix \ ${toTestJdkArg(buildEnv)} \ - ${toElasticsearchJdkArg(buildEnv)} \ --fail-at-end \ $args \ """ @@ -965,14 +938,3 @@ String toTestJdkArg(BuildEnvironment buildEnv) { return args } - -String toElasticsearchJdkArg(BuildEnvironment buildEnv) { - String elasticsearchJdkTool = buildEnv.getElasticsearchJdkTool(environments) - - if (elasticsearchJdkTool == null || buildEnv.getMavenJdkTool(environments) == elasticsearchJdkTool) { - return '' // No specific JDK needed - } - - def elasticsearchJdkToolPath = tool(name: elasticsearchJdkTool, type: 'jdk') - return "-Dtest.elasticsearch.run.java_home=$elasticsearchJdkToolPath" -} diff --git a/documentation/pom.xml b/documentation/pom.xml index 5451499c6cf..937111b4e5f 100644 --- a/documentation/pom.xml +++ b/documentation/pom.xml @@ -115,8 +115,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin org.apache.maven.plugins @@ -169,7 +169,6 @@ maven-dependency-plugin - unpack-asciidoctor-theme generate-resources diff --git a/integrationtest/backend/elasticsearch/pom.xml b/integrationtest/backend/elasticsearch/pom.xml index d9403344b60..9685681da7f 100644 --- a/integrationtest/backend/elasticsearch/pom.xml +++ b/integrationtest/backend/elasticsearch/pom.xml @@ -95,8 +95,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin diff --git a/integrationtest/jdk/java-modules/pom.xml b/integrationtest/jdk/java-modules/pom.xml index 38cd7e8b1d8..02525517b38 100644 --- a/integrationtest/jdk/java-modules/pom.xml +++ b/integrationtest/jdk/java-modules/pom.xml @@ -69,8 +69,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin diff --git a/integrationtest/mapper/orm-batch-jsr352/pom.xml b/integrationtest/mapper/orm-batch-jsr352/pom.xml index 7893b1571db..b5cc1e0a951 100644 --- a/integrationtest/mapper/orm-batch-jsr352/pom.xml +++ b/integrationtest/mapper/orm-batch-jsr352/pom.xml @@ -186,8 +186,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin diff --git a/integrationtest/mapper/orm-realbackend/pom.xml b/integrationtest/mapper/orm-realbackend/pom.xml index 62d50b469ef..17b632fe404 100644 --- a/integrationtest/mapper/orm-realbackend/pom.xml +++ b/integrationtest/mapper/orm-realbackend/pom.xml @@ -135,8 +135,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin diff --git a/integrationtest/mapper/orm-spring/pom.xml b/integrationtest/mapper/orm-spring/pom.xml index 7b5be07f1e1..7748b44b70f 100644 --- a/integrationtest/mapper/orm-spring/pom.xml +++ b/integrationtest/mapper/orm-spring/pom.xml @@ -134,8 +134,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin diff --git a/integrationtest/performance/backend/elasticsearch/pom.xml b/integrationtest/performance/backend/elasticsearch/pom.xml index b6957c5ef03..20b6e788e2f 100644 --- a/integrationtest/performance/backend/elasticsearch/pom.xml +++ b/integrationtest/performance/backend/elasticsearch/pom.xml @@ -56,8 +56,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin org.bsc.maven diff --git a/integrationtest/showcase/library/pom.xml b/integrationtest/showcase/library/pom.xml index 83927512250..8d3912084f0 100644 --- a/integrationtest/showcase/library/pom.xml +++ b/integrationtest/showcase/library/pom.xml @@ -185,8 +185,8 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin + io.fabric8 + docker-maven-plugin diff --git a/parents/integrationtest/pom.xml b/parents/integrationtest/pom.xml index 71c3091e083..1e0c1d6de45 100644 --- a/parents/integrationtest/pom.xml +++ b/parents/integrationtest/pom.xml @@ -140,33 +140,60 @@ - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} + io.fabric8 + docker-maven-plugin + ${version.docker.maven.plugin} ${test.elasticsearch.run.skip} - ${test.elasticsearch.run.flavour} - hsearchEsTestCluster - 9200 - ${test.elasticsearch.connection.version} - 90 - - true - - ${test.elasticsearch.run.java_home} - + + + docker.elastic.co/elasticsearch/elasticsearch:${test.elasticsearch.connection.version} + elasticsearch + + + single-node + + false + + true + + + 9200:9200 + + + Elasticsearch: + default + cyan + + + + http://localhost:9200 + GET + 200 + + + + + + + + true - - start-elasticsearch + docker-start pre-integration-test - runforked + stop + start - stop-elasticsearch + docker-stop post-integration-test stop @@ -185,45 +212,6 @@ org.apache.maven.plugins maven-surefire-plugin - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-integrationtest-sharedresources - generate-test-resources - - unpack - - - - - ${project.groupId} - hibernate-search-util-internal-integrationtest-sharedresources - build-resources - zip - ${project.version} - - - ${project.build.directory}/ - true - - - - - - - ${project.groupId} - hibernate-search-util-internal-integrationtest-sharedresources - build-resources - zip - ${project.version} - - - @@ -316,25 +304,8 @@ elasticsearch-5.6 ${version.org.elasticsearch.latest-5.6} - - org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch5TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/5.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/5.0/init/init.script - - - - - @@ -342,25 +313,8 @@ elasticsearch-6.0 ${version.org.elasticsearch.latest-6.2} - - org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch60TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/6.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/6.0/init/init.script - - - - - @@ -370,21 +324,6 @@ ${version.org.elasticsearch.latest-6.3} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch63TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/6.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/6.0/init/init.script - - - - - @@ -394,21 +333,6 @@ ${version.org.elasticsearch.latest-6.6} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch64TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/6.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/6.0/init/init.script - - - - - @@ -418,21 +342,6 @@ ${version.org.elasticsearch.latest-6.7} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch67TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/6.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/6.0/init/init.script - - - - - @@ -442,21 +351,6 @@ ${version.org.elasticsearch.latest-6.8} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch68TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/6.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/6.0/init/init.script - - - - - @@ -466,21 +360,6 @@ ${version.org.elasticsearch.latest-7.2} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch70TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/7.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/7.0/init/init.script - - - - - @@ -490,21 +369,6 @@ ${version.org.elasticsearch.latest-7.6} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch73TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/7.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/7.0/init/init.script - - - - - @@ -514,21 +378,6 @@ ${version.org.elasticsearch.latest-7.7} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch77TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/7.0/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/7.0/init/init.script - - - - - @@ -538,21 +387,6 @@ ${version.org.elasticsearch.latest-7.9} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch78TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/7.8/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/7.8/init/init.json - - - - - @@ -568,21 +402,6 @@ ${version.org.elasticsearch.latest-7.10} org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch710TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/7.8/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/7.8/init/init.json - - - - - @@ -590,25 +409,8 @@ elasticsearch-7.11 ${version.org.elasticsearch.latest-7.11} - - default org.hibernate.search.util.impl.integrationtest.backend.elasticsearch.dialect.Elasticsearch710TestDialect - - - - - com.github.alexcojocaru - elasticsearch-maven-plugin - ${version.com.github.alexcojocaru.elasticsearch.plugin} - - ${project.build.directory}/elasticsearch-maven-plugin/7.8/configuration/ - ${project.build.directory}/elasticsearch-maven-plugin/7.8/init/init.json - - - - - diff --git a/pom.xml b/pom.xml index 73bfa1e61e2..cb8a04f2c87 100644 --- a/pom.xml +++ b/pom.xml @@ -330,7 +330,7 @@ 0.8.3 4.3.0 1.8.0 - 6.19 + 0.34.1 1.0.0.Beta2 3.7.0.1746 false - ${java.home} - oss - - 4.0.0 - - org.hibernate.search - hibernate-search-util-internal-integrationtest-parent - 6.1.0-SNAPSHOT - .. - - hibernate-search-util-internal-integrationtest-sharedresources - pom - - Hibernate Search Utils - Internal - ITs - Shared Resources - Contains resources which we want to reuse across multiple modules for integration testing purposes - - - true - true - - - - - - maven-assembly-plugin - - - - package-shared-test-build-resources - - single - - package - - - src/main/assembly/build-resources.xml - - - - - - - - - diff --git a/util/internal/integrationtest/sharedresources/src/main/assembly/build-resources.xml b/util/internal/integrationtest/sharedresources/src/main/assembly/build-resources.xml deleted file mode 100644 index d146b09f6ea..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/assembly/build-resources.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - build-resources - - zip - dir - - - false - / - - - - src/main/elasticsearch-maven-plugin - elasticsearch-maven-plugin - - - diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/elasticsearch.yml b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/elasticsearch.yml deleted file mode 100644 index 3f966606565..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/elasticsearch.yml +++ /dev/null @@ -1,12 +0,0 @@ -network.host: _local_ - -# Avoid warnings related to clustering -discovery.type: single-node - -# Prevent swapping -# This may trigger warnings upon boot if the system is not correctly set up. -# See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock -bootstrap.memory_lock: true - -# Disable starting multiple nodes on a single system: -node.max_local_storage_nodes: 1 diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/jvm.options b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/jvm.options deleted file mode 100644 index eed30cb4418..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/jvm.options +++ /dev/null @@ -1,115 +0,0 @@ -## JVM configuration - -################################################################ -## IMPORTANT: JVM heap size -################################################################ -## -## You should always set the min and max JVM heap -## size to the same value. For example, to set -## the heap to 4 GB, set: -## -## -Xms4g -## -Xmx4g -## -## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html -## for more information -## -################################################################ - -# Xms represents the initial size of total heap space -# Xmx represents the maximum size of total heap space - -# For Hibernate Search, a few tests require slightly more than 512MB of memory -# because they index a lot of data. -# Let's stay on the safe side and keep the default of 1GB, -# since it's not 2010 anymore and CI instances have more than enough memory. --Xms1g --Xmx1g - -################################################################ -## Expert settings -################################################################ -## -## All settings below this section are considered -## expert settings. Don't tamper with them unless -## you understand what you are doing -## -################################################################ - -## GC configuration --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --XX:+UseCMSInitiatingOccupancyOnly - -## optimizations - -# pre-touch memory pages used by the JVM during initialization --XX:+AlwaysPreTouch - -## basic - -# force the server VM (remove on 32-bit client JVMs) --server - -# explicitly set the stack size (reduce to 320k on 32-bit client JVMs) --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 - -# use old-style file permissions on JDK9 --Djdk.io.permissionsUseCanonicalPath=true - -# 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 --Dlog4j.skipJansi=true - -## heap dumps - -# generate a heap dump when an allocation from the Java heap fails -# heap dumps are created in the working directory of the JVM --XX:+HeapDumpOnOutOfMemoryError - -# specify an alternative path for heap dumps -# ensure the directory exists and has sufficient space -#-XX:HeapDumpPath=${heap.dump.path} - -## GC logging - -#-XX:+PrintGCDetails -#-XX:+PrintGCTimeStamps -#-XX:+PrintGCDateStamps -#-XX:+PrintClassHistogram -#-XX:+PrintTenuringDistribution -#-XX:+PrintGCApplicationStoppedTime - -# log GC status to a file with time stamps -# ensure the directory exists -#-Xloggc:${loggc} - -# By default, the GC log file will not rotate. -# By uncommenting the lines below, the GC log file -# will be rotated every 128MB at most 32 times. -#-XX:+UseGCLogFileRotation -#-XX:NumberOfGCLogFiles=32 -#-XX:GCLogFileSize=128M - -# Elasticsearch 5.0.0 will throw an exception on unquoted field names in JSON. -# If documents were already indexed with unquoted fields in a previous version -# of Elasticsearch, some operations may throw errors. -# -# WARNING: This option will be removed in Elasticsearch 6.0.0 and is provided -# only for migration purposes. -#-Delasticsearch.json.allow_unquoted_field_names=true diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/log4j2.properties b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/log4j2.properties deleted file mode 100644 index 7c70a98423a..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/configuration/log4j2.properties +++ /dev/null @@ -1,36 +0,0 @@ -status = error - -appender.console.type = Console -appender.console.name = console -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [ES][%-5p][%d{ISO8601}][%-25c{1.}] %marker%m%n - -rootLogger.level = info -rootLogger.appenderRef.console.ref = console - -loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing - -# log action execution errors for easier debugging -logger.action.name = org.elasticsearch.action -logger.action.level = info - -# do not log metadata too much as we generate a log of noise -logger.metadata.name = org.elasticsearch.cluster.metadata -logger.metadata.level = warn - -logger.cluster.name = org.elasticsearch.cluster.routing.allocation -logger.cluster.level = warn - -logger.settings.name = org.elasticsearch.common.settings -logger.settings.level = warn - -logger.deprecation.name = org.elasticsearch.deprecation -logger.deprecation.level = warn - -# Warn us about using inefficient search operations -logger.slow_search.name = index.search.slowlog -logger.slow_search.level = trace - -# Warn us about using inefficient indexing actions -logger.slow_indexing.name = index.indexing.slowlog -logger.slow_indexing.level = trace diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/init/init.script b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/init/init.script deleted file mode 100644 index 7c20a72b48f..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/5.0/init/init.script +++ /dev/null @@ -1,6 +0,0 @@ -PUT:_template/lightweight_index:{ "template" : "*", "order": -9999, "settings" : { "number_of_shards" : 1, "number_of_replicas" : 0 } } -PUT:_template/slowlogs_search_level:{ "template" : "*", "order": -9999, "settings" : { "index.search.slowlog.level": "debug" } } -PUT:_template/slowlogs_indexing_level:{ "template" : "*", "order": -9999, "settings" : { "index.indexing.slowlog.level": "debug" } } -PUT:_template/slowlogs_search_threshold_query:{ "template" : "*", "order": -9999, "settings" : { "index.search.slowlog.threshold.query.warn": "5s", "index.search.slowlog.threshold.query.info": "500ms", "index.search.slowlog.threshold.query.debug": "100ms", "index.search.slowlog.threshold.query.trace": "10ms" } } -PUT:_template/slowlogs_search_threshold_fetch:{ "template" : "*", "order": -9999, "settings" : { "index.search.slowlog.threshold.fetch.warn": "1s", "index.search.slowlog.threshold.fetch.info": "200ms", "index.search.slowlog.threshold.fetch.debug": "100ms", "index.search.slowlog.threshold.fetch.trace": "10ms" } } -PUT:_template/slowlogs_indexing_threshold_index:{ "template" : "*", "order": -9999, "settings" : { "index.indexing.slowlog.threshold.index.warn": "2s", "index.indexing.slowlog.threshold.index.info": "500ms", "index.indexing.slowlog.threshold.index.debug": "100ms", "index.indexing.slowlog.threshold.index.trace": "10ms" } } diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/elasticsearch.yml b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/elasticsearch.yml deleted file mode 100644 index 3f966606565..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/elasticsearch.yml +++ /dev/null @@ -1,12 +0,0 @@ -network.host: _local_ - -# Avoid warnings related to clustering -discovery.type: single-node - -# Prevent swapping -# This may trigger warnings upon boot if the system is not correctly set up. -# See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock -bootstrap.memory_lock: true - -# Disable starting multiple nodes on a single system: -node.max_local_storage_nodes: 1 diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/jvm.options b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/jvm.options deleted file mode 100644 index 72d17611c0f..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/jvm.options +++ /dev/null @@ -1,126 +0,0 @@ -## JVM configuration - -################################################################ -## IMPORTANT: JVM heap size -################################################################ -## -## You should always set the min and max JVM heap -## size to the same value. For example, to set -## the heap to 4 GB, set: -## -## -Xms4g -## -Xmx4g -## -## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html -## for more information -## -################################################################ - -# Xms represents the initial size of total heap space -# Xmx represents the maximum size of total heap space - -# For Hibernate Search, a few tests require slightly more than 512MB of memory -# because they index a lot of data. -# Let's stay on the safe side and keep the default of 1GB, -# since it's not 2010 anymore and CI instances have more than enough memory. --Xms1g --Xmx1g - -################################################################ -## Expert settings -################################################################ -## -## All settings below this section are considered -## expert settings. Don't tamper with them unless -## you understand what you are doing -## -################################################################ - -## GC configuration --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --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 - --Djava.io.tmpdir=${ES_TMPDIR} - -## heap dumps - -# generate a heap dump when an allocation from the Java heap fails -# heap dumps are created in the working directory of the JVM --XX:+HeapDumpOnOutOfMemoryError - -# specify an alternative path for heap dumps; ensure the directory exists and -# has sufficient space --XX:HeapDumpPath=data - -# specify an alternative path for JVM fatal error logs --XX:ErrorFile=logs/hs_err_pid%p.log - -## JDK 8 GC logging - -#8:-XX:+PrintGCDetails -#8:-XX:+PrintGCDateStamps -#8:-XX:+PrintTenuringDistribution -#8:-XX:+PrintGCApplicationStoppedTime -#8:-Xloggc:logs/gc.log -#8:-XX:+UseGCLogFileRotation -#8:-XX:NumberOfGCLogFiles=32 -#8:-XX:GCLogFileSize=64m - -# 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 diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/log4j2.properties b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/log4j2.properties deleted file mode 100644 index 0a641bba7f4..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/configuration/log4j2.properties +++ /dev/null @@ -1,36 +0,0 @@ -status = error - -appender.console.type = Console -appender.console.name = console -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [ES][%-5p][%d{ISO8601}][%-25c{1.}][%node_name]%marker %m%n - -rootLogger.level = info -rootLogger.appenderRef.console.ref = console - -loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing - -# log action execution errors for easier debugging -logger.action.name = org.elasticsearch.action -logger.action.level = info - -# do not log metadata too much as we generate a log of noise -logger.metadata.name = org.elasticsearch.cluster.metadata -logger.metadata.level = warn - -logger.cluster.name = org.elasticsearch.cluster.routing.allocation -logger.cluster.level = warn - -logger.settings.name = org.elasticsearch.common.settings -logger.settings.level = warn - -logger.deprecation.name = org.elasticsearch.deprecation -logger.deprecation.level = warn - -# Warn us about using inefficient search operations -logger.slow_search.name = index.search.slowlog -logger.slow_search.level = trace - -# Warn us about using inefficient indexing actions -logger.slow_indexing.name = index.indexing.slowlog -logger.slow_indexing.level = trace diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/init/init.script b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/init/init.script deleted file mode 100644 index 33fb670baf0..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/6.0/init/init.script +++ /dev/null @@ -1,6 +0,0 @@ -PUT:_template/lightweight_index:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "number_of_shards" : 1, "number_of_replicas" : 0 } } -PUT:_template/slowlogs_search_level:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.search.slowlog.level": "debug" } } -PUT:_template/slowlogs_indexing_level:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.indexing.slowlog.level": "debug" } } -PUT:_template/slowlogs_search_threshold_query:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.search.slowlog.threshold.query.warn": "5s", "index.search.slowlog.threshold.query.info": "500ms", "index.search.slowlog.threshold.query.debug": "100ms", "index.search.slowlog.threshold.query.trace": "10ms" } } -PUT:_template/slowlogs_search_threshold_fetch:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.search.slowlog.threshold.fetch.warn": "1s", "index.search.slowlog.threshold.fetch.info": "200ms", "index.search.slowlog.threshold.fetch.debug": "100ms", "index.search.slowlog.threshold.fetch.trace": "10ms" } } -PUT:_template/slowlogs_indexing_threshold_index:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.indexing.slowlog.threshold.index.warn": "2s", "index.indexing.slowlog.threshold.index.info": "500ms", "index.indexing.slowlog.threshold.index.debug": "100ms", "index.indexing.slowlog.threshold.index.trace": "10ms" } } diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/elasticsearch.yml b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/elasticsearch.yml deleted file mode 100644 index 3cc13ef408f..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/elasticsearch.yml +++ /dev/null @@ -1,9 +0,0 @@ -network.host: _local_ - -# Avoid warnings related to clustering -discovery.type: single-node - -# Prevent swapping -# This may trigger warnings upon boot if the system is not correctly set up. -# See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock -bootstrap.memory_lock: true diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/jvm.options b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/jvm.options deleted file mode 100644 index 97a3c132ffd..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/jvm.options +++ /dev/null @@ -1,80 +0,0 @@ -## JVM configuration - -################################################################ -## IMPORTANT: JVM heap size -################################################################ -## -## You should always set the min and max JVM heap -## size to the same value. For example, to set -## the heap to 4 GB, set: -## -## -Xms4g -## -Xmx4g -## -## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html -## for more information -## -################################################################ - -# Xms represents the initial size of total heap space -# Xmx represents the maximum size of total heap space - -# For Hibernate Search, a few tests require slightly more than 512MB of memory -# because they index a lot of data. -# Let's stay on the safe side and keep the default of 1GB, -# since it's not 2010 anymore and CI instances have more than enough memory. --Xms1g --Xmx1g - -################################################################ -## Expert settings -################################################################ -## -## All settings below this section are considered -## expert settings. Don't tamper with them unless -## you understand what you are doing -## -################################################################ - -## GC configuration --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --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:G1ReservePercent=25 -# 10-:-XX:InitiatingHeapOccupancyPercent=30 - -## JVM temporary directory --Djava.io.tmpdir=${ES_TMPDIR} - -## heap dumps - -# generate a heap dump when an allocation from the Java heap fails -# heap dumps are created in the working directory of the JVM --XX:+HeapDumpOnOutOfMemoryError - -# specify an alternative path for heap dumps; ensure the directory exists and -# has sufficient space --XX:HeapDumpPath=data - -# specify an alternative path for JVM fatal error logs --XX:ErrorFile=logs/hs_err_pid%p.log - -## JDK 8 GC logging -#8:-XX:+PrintGCDetails -#8:-XX:+PrintGCDateStamps -#8:-XX:+PrintTenuringDistribution -#8:-XX:+PrintGCApplicationStoppedTime -#8:-Xloggc:logs/gc.log -#8:-XX:+UseGCLogFileRotation -#8:-XX:NumberOfGCLogFiles=32 -#8:-XX:GCLogFileSize=64m - -# JDK 9+ GC logging -#9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/log4j2.properties b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/log4j2.properties deleted file mode 100644 index 0a641bba7f4..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/configuration/log4j2.properties +++ /dev/null @@ -1,36 +0,0 @@ -status = error - -appender.console.type = Console -appender.console.name = console -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [ES][%-5p][%d{ISO8601}][%-25c{1.}][%node_name]%marker %m%n - -rootLogger.level = info -rootLogger.appenderRef.console.ref = console - -loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing - -# log action execution errors for easier debugging -logger.action.name = org.elasticsearch.action -logger.action.level = info - -# do not log metadata too much as we generate a log of noise -logger.metadata.name = org.elasticsearch.cluster.metadata -logger.metadata.level = warn - -logger.cluster.name = org.elasticsearch.cluster.routing.allocation -logger.cluster.level = warn - -logger.settings.name = org.elasticsearch.common.settings -logger.settings.level = warn - -logger.deprecation.name = org.elasticsearch.deprecation -logger.deprecation.level = warn - -# Warn us about using inefficient search operations -logger.slow_search.name = index.search.slowlog -logger.slow_search.level = trace - -# Warn us about using inefficient indexing actions -logger.slow_indexing.name = index.indexing.slowlog -logger.slow_indexing.level = trace diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/init/init.script b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/init/init.script deleted file mode 100644 index 33fb670baf0..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.0/init/init.script +++ /dev/null @@ -1,6 +0,0 @@ -PUT:_template/lightweight_index:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "number_of_shards" : 1, "number_of_replicas" : 0 } } -PUT:_template/slowlogs_search_level:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.search.slowlog.level": "debug" } } -PUT:_template/slowlogs_indexing_level:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.indexing.slowlog.level": "debug" } } -PUT:_template/slowlogs_search_threshold_query:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.search.slowlog.threshold.query.warn": "5s", "index.search.slowlog.threshold.query.info": "500ms", "index.search.slowlog.threshold.query.debug": "100ms", "index.search.slowlog.threshold.query.trace": "10ms" } } -PUT:_template/slowlogs_search_threshold_fetch:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.search.slowlog.threshold.fetch.warn": "1s", "index.search.slowlog.threshold.fetch.info": "200ms", "index.search.slowlog.threshold.fetch.debug": "100ms", "index.search.slowlog.threshold.fetch.trace": "10ms" } } -PUT:_template/slowlogs_indexing_threshold_index:{ "index_patterns" : ["*"], "order": -9999, "settings" : { "index.indexing.slowlog.threshold.index.warn": "2s", "index.indexing.slowlog.threshold.index.info": "500ms", "index.indexing.slowlog.threshold.index.debug": "100ms", "index.indexing.slowlog.threshold.index.trace": "10ms" } } diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/elasticsearch.yml b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/elasticsearch.yml deleted file mode 100644 index 3cc13ef408f..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/elasticsearch.yml +++ /dev/null @@ -1,9 +0,0 @@ -network.host: _local_ - -# Avoid warnings related to clustering -discovery.type: single-node - -# Prevent swapping -# This may trigger warnings upon boot if the system is not correctly set up. -# See https://www.elastic.co/guide/en/elasticsearch/reference/7.5/setup-configuration-memory.html#bootstrap-memory_lock -bootstrap.memory_lock: true diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/jvm.options b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/jvm.options deleted file mode 100644 index 97a3c132ffd..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/jvm.options +++ /dev/null @@ -1,80 +0,0 @@ -## JVM configuration - -################################################################ -## IMPORTANT: JVM heap size -################################################################ -## -## You should always set the min and max JVM heap -## size to the same value. For example, to set -## the heap to 4 GB, set: -## -## -Xms4g -## -Xmx4g -## -## See https://www.elastic.co/guide/en/elasticsearch/reference/current/heap-size.html -## for more information -## -################################################################ - -# Xms represents the initial size of total heap space -# Xmx represents the maximum size of total heap space - -# For Hibernate Search, a few tests require slightly more than 512MB of memory -# because they index a lot of data. -# Let's stay on the safe side and keep the default of 1GB, -# since it's not 2010 anymore and CI instances have more than enough memory. --Xms1g --Xmx1g - -################################################################ -## Expert settings -################################################################ -## -## All settings below this section are considered -## expert settings. Don't tamper with them unless -## you understand what you are doing -## -################################################################ - -## GC configuration --XX:+UseConcMarkSweepGC --XX:CMSInitiatingOccupancyFraction=75 --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:G1ReservePercent=25 -# 10-:-XX:InitiatingHeapOccupancyPercent=30 - -## JVM temporary directory --Djava.io.tmpdir=${ES_TMPDIR} - -## heap dumps - -# generate a heap dump when an allocation from the Java heap fails -# heap dumps are created in the working directory of the JVM --XX:+HeapDumpOnOutOfMemoryError - -# specify an alternative path for heap dumps; ensure the directory exists and -# has sufficient space --XX:HeapDumpPath=data - -# specify an alternative path for JVM fatal error logs --XX:ErrorFile=logs/hs_err_pid%p.log - -## JDK 8 GC logging -#8:-XX:+PrintGCDetails -#8:-XX:+PrintGCDateStamps -#8:-XX:+PrintTenuringDistribution -#8:-XX:+PrintGCApplicationStoppedTime -#8:-Xloggc:logs/gc.log -#8:-XX:+UseGCLogFileRotation -#8:-XX:NumberOfGCLogFiles=32 -#8:-XX:GCLogFileSize=64m - -# JDK 9+ GC logging -#9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/log4j2.properties b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/log4j2.properties deleted file mode 100644 index 0a641bba7f4..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/configuration/log4j2.properties +++ /dev/null @@ -1,36 +0,0 @@ -status = error - -appender.console.type = Console -appender.console.name = console -appender.console.layout.type = PatternLayout -appender.console.layout.pattern = [ES][%-5p][%d{ISO8601}][%-25c{1.}][%node_name]%marker %m%n - -rootLogger.level = info -rootLogger.appenderRef.console.ref = console - -loggers = action, metadata, cluster, settings, deprecation, slow_search, slow_indexing - -# log action execution errors for easier debugging -logger.action.name = org.elasticsearch.action -logger.action.level = info - -# do not log metadata too much as we generate a log of noise -logger.metadata.name = org.elasticsearch.cluster.metadata -logger.metadata.level = warn - -logger.cluster.name = org.elasticsearch.cluster.routing.allocation -logger.cluster.level = warn - -logger.settings.name = org.elasticsearch.common.settings -logger.settings.level = warn - -logger.deprecation.name = org.elasticsearch.deprecation -logger.deprecation.level = warn - -# Warn us about using inefficient search operations -logger.slow_search.name = index.search.slowlog -logger.slow_search.level = trace - -# Warn us about using inefficient indexing actions -logger.slow_indexing.name = index.indexing.slowlog -logger.slow_indexing.level = trace diff --git a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/init/init.json b/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/init/init.json deleted file mode 100644 index 7bac49e5529..00000000000 --- a/util/internal/integrationtest/sharedresources/src/main/elasticsearch-maven-plugin/7.8/init/init.json +++ /dev/null @@ -1,48 +0,0 @@ -[ - { - "method": "PUT", - "path": "_index_template/test_index_defaults", - "payload": { - "index_patterns": ["*"], - "priority": 0, - "template": { - "settings": { - "number_of_shards": 1, - "number_of_replicas": 0, - "indexing": { - "slowlog": { - "level": "debug", - "threshold": { - "index": { - "warn": "2s", - "trace": "10ms", - "debug": "100ms", - "info": "500ms" - } - } - } - }, - "search": { - "slowlog": { - "level": "debug", - "threshold": { - "fetch": { - "warn": "1s", - "trace": "10ms", - "debug": "100ms", - "info": "200ms" - }, - "query": { - "warn": "5s", - "trace": "10ms", - "debug": "100ms", - "info": "500ms" - } - } - } - } - } - } - } - } -]