diff --git a/build.gradle b/build.gradle index 362d254b..0cf849af 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import com.github.mgk.gradle.* - buildscript { ext { es_version = version.replaceAll(/\.[0-9]+(|-.+)$/, "") @@ -28,6 +26,7 @@ plugins { apply plugin: 'java' apply plugin: 'idea' apply plugin: 'elasticsearch.esplugin' +apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.testclusters' // Uncomment if you want to use: System.out.println("Emergency!"); @@ -72,7 +71,7 @@ dependencies { implementation "org.elasticsearch:elasticsearch:${versions.elasticsearch}" implementation "io.prometheus:simpleclient:${versions.prometheus}" implementation "io.prometheus:simpleclient_common:${versions.prometheus}" - implementation "org.apache.logging.log4j:log4j-api:${versions.log4j}" + yamlRestTestRuntimeOnly "org.apache.logging.log4j:log4j-core:${versions.log4j}" testImplementation (group: 'junit', name: 'junit', version: "${versions.junit}") { exclude group:'org.hamcrest' //also included in ES test framework } @@ -93,18 +92,6 @@ esplugin { testClusters.all { numberOfNodes = 2 - -// There does not seem to be any easy way how to setup custom cluster name. - -// This worked in ES 7.4.x, but now results in: -// A problem occurred evaluating root project 'prometheus-exporter'. -// > Cannot set the property 'clusterName' because the backing field is final. -// clusterName = "PrometheusExporterITCluster" - -// This does not work in ES 7.5.x too: -// Execution failed for task ':integTestRunner'. -// > Testclusters does not allow the following settings to be changed:[cluster.name] for node{::integTest-0} -// setting 'cluster.name', 'PrometheusExporterITCluster' } checkstyle { diff --git a/src/main/java/org/elasticsearch/action/ClusterStatsData.java b/src/main/java/org/elasticsearch/action/ClusterStatsData.java index 7959b9b0..589d57ef 100644 --- a/src/main/java/org/elasticsearch/action/ClusterStatsData.java +++ b/src/main/java/org/elasticsearch/action/ClusterStatsData.java @@ -21,13 +21,13 @@ import org.elasticsearch.ElasticsearchParseException; import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.cluster.metadata.Metadata; -import org.elasticsearch.core.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.SettingsException; import org.elasticsearch.common.unit.RatioValue; +import org.elasticsearch.core.Nullable; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/action/NodePrometheusMetricsResponse.java b/src/main/java/org/elasticsearch/action/NodePrometheusMetricsResponse.java index 5b744b08..e686942c 100644 --- a/src/main/java/org/elasticsearch/action/NodePrometheusMetricsResponse.java +++ b/src/main/java/org/elasticsearch/action/NodePrometheusMetricsResponse.java @@ -22,11 +22,11 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.admin.indices.stats.PackageAccessHelper; -import org.elasticsearch.core.Nullable; import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.core.Nullable; import java.io.IOException; diff --git a/src/main/java/org/elasticsearch/action/TransportNodePrometheusMetricsAction.java b/src/main/java/org/elasticsearch/action/TransportNodePrometheusMetricsAction.java index 5d4b6cc5..1d9b8935 100644 --- a/src/main/java/org/elasticsearch/action/TransportNodePrometheusMetricsAction.java +++ b/src/main/java/org/elasticsearch/action/TransportNodePrometheusMetricsAction.java @@ -33,10 +33,10 @@ import org.elasticsearch.action.support.HandledTransportAction; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; -import org.elasticsearch.core.Nullable; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.ClusterSettings; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.core.Nullable; import org.elasticsearch.tasks.Task; import org.elasticsearch.transport.TransportService; diff --git a/src/main/java/org/elasticsearch/rest/prometheus/RestPrometheusMetricsAction.java b/src/main/java/org/elasticsearch/rest/prometheus/RestPrometheusMetricsAction.java index 8c4d2c44..719c087c 100644 --- a/src/main/java/org/elasticsearch/rest/prometheus/RestPrometheusMetricsAction.java +++ b/src/main/java/org/elasticsearch/rest/prometheus/RestPrometheusMetricsAction.java @@ -34,12 +34,12 @@ import org.elasticsearch.rest.*; import org.elasticsearch.rest.action.RestResponseListener; -import java.util.List; -import java.util.Locale; - import static java.util.Arrays.asList; import static java.util.Collections.unmodifiableList; +import java.util.List; +import java.util.Locale; + /** * REST action class for Prometheus Exporter plugin. */ diff --git a/src/test/java/org/elasticsearch/rest/PrometheusRestHandlerClientYamlTestSuiteIT.java b/src/yamlRestTest/java/org/elasticsearch/rest/PrometheusRestHandlerClientYamlTestSuiteIT.java similarity index 100% rename from src/test/java/org/elasticsearch/rest/PrometheusRestHandlerClientYamlTestSuiteIT.java rename to src/yamlRestTest/java/org/elasticsearch/rest/PrometheusRestHandlerClientYamlTestSuiteIT.java diff --git a/src/test/java/org/elasticsearch/rest/package-info.java b/src/yamlRestTest/java/org/elasticsearch/rest/package-info.java similarity index 100% rename from src/test/java/org/elasticsearch/rest/package-info.java rename to src/yamlRestTest/java/org/elasticsearch/rest/package-info.java diff --git a/src/test/resources/rest-api-spec/api/prometheus.metrics.json b/src/yamlRestTest/resources/rest-api-spec/api/prometheus.metrics.json similarity index 91% rename from src/test/resources/rest-api-spec/api/prometheus.metrics.json rename to src/yamlRestTest/resources/rest-api-spec/api/prometheus.metrics.json index 65132cb1..5bcaec81 100644 --- a/src/test/resources/rest-api-spec/api/prometheus.metrics.json +++ b/src/yamlRestTest/resources/rest-api-spec/api/prometheus.metrics.json @@ -4,6 +4,7 @@ "url":"https://github.com/vvanholl/elasticsearch-prometheus-exporter/" }, "stability": "stable", + "visibility" : "public", "url":{ "paths":[ { diff --git a/src/test/resources/rest-api-spec/test/resthandler/10_basic.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/10_basic.yml similarity index 100% rename from src/test/resources/rest-api-spec/test/resthandler/10_basic.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/10_basic.yml diff --git a/src/test/resources/rest-api-spec/test/resthandler/20_00_metrics.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_00_metrics.yml similarity index 100% rename from src/test/resources/rest-api-spec/test/resthandler/20_00_metrics.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_00_metrics.yml diff --git a/src/test/resources/rest-api-spec/test/resthandler/20_10_cluster_settings_metrics_disabled.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_10_cluster_settings_metrics_disabled.yml similarity index 98% rename from src/test/resources/rest-api-spec/test/resthandler/20_10_cluster_settings_metrics_disabled.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_10_cluster_settings_metrics_disabled.yml index a45c055f..312b8fd3 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/20_10_cluster_settings_metrics_disabled.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_10_cluster_settings_metrics_disabled.yml @@ -24,7 +24,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -153,6 +153,6 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/20_11_index_level_metrics_disabled.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_11_index_level_metrics_disabled.yml similarity index 99% rename from src/test/resources/rest-api-spec/test/resthandler/20_11_index_level_metrics_disabled.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_11_index_level_metrics_disabled.yml index 7ea0c106..3835920c 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/20_11_index_level_metrics_disabled.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/20_11_index_level_metrics_disabled.yml @@ -21,7 +21,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_00_index_level_info.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_00_index_level_info.yml similarity index 86% rename from src/test/resources/rest-api-spec/test/resthandler/30_00_index_level_info.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_00_index_level_info.yml index abb2257a..2e7d6cae 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_00_index_level_info.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_00_index_level_info.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,8 +33,8 @@ \# \s TYPE \s es_index_shards_number \s gauge \n ( es_index_shards_number\{ - cluster="integTest", - type="(active_primary|initializing|relocating|shards|active|unassigned)", + cluster="yamlRestTest", + type="(active_primary|delayed_unassigned|initializing|relocating|shards|active|unassigned)", index="twitter" ,\} \s+ \d+\.\d+ \n? ){6} @@ -47,7 +46,7 @@ \# \s HELP \s es_index_status (\s|\w|\d)+ \n \# \s TYPE \s es_index_status \s gauge \n es_index_status\{ - cluster="integTest",index="twitter" + cluster="yamlRestTest",index="twitter" \,} \s \d+\.\d+ \n? .*/ @@ -57,7 +56,7 @@ \# \s HELP \s es_index_replicas_number (\s|\w|\d)+ \n \# \s TYPE \s es_index_replicas_number \s gauge \n es_index_replicas_number\{ - cluster="integTest",index="twitter" + cluster="yamlRestTest",index="twitter" ,\} \s+ \d+\.\d+ \n? .*/ @@ -77,7 +76,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -97,7 +95,7 @@ \# \s TYPE \s es_index_doc_number \s gauge \n ( es_index_doc_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -109,7 +107,7 @@ \# \s TYPE \s es_index_doc_deleted_number \s gauge \n ( es_index_doc_deleted_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -121,7 +119,7 @@ \# \s TYPE \s es_index_store_size_bytes \s gauge \n ( es_index_store_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_10_index_indexing.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_10_index_indexing.yml similarity index 81% rename from src/test/resources/rest-api-spec/test/resthandler/30_10_index_indexing.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_10_index_indexing.yml index 8d048153..d5f84045 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_10_index_indexing.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_10_index_indexing.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_indexing_delete_count \s gauge \n ( es_index_indexing_delete_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_indexing_delete_current_number \s gauge \n ( es_index_indexing_delete_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_indexing_delete_time_seconds \s gauge \n ( es_index_indexing_delete_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_indexing_index_count \s gauge \n ( es_index_indexing_index_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -82,7 +81,7 @@ \# \s TYPE \s es_index_indexing_index_current_number \s gauge \n ( es_index_indexing_index_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -94,7 +93,7 @@ \# \s TYPE \s es_index_indexing_index_failed_count \s gauge \n ( es_index_indexing_index_failed_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -106,7 +105,7 @@ \# \s TYPE \s es_index_indexing_index_time_seconds \s gauge \n ( es_index_indexing_index_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -118,7 +117,7 @@ \# \s TYPE \s es_index_indexing_noop_update_count \s gauge \n ( es_index_indexing_noop_update_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -130,7 +129,7 @@ \# \s TYPE \s es_index_indexing_is_throttled_bool \s gauge \n ( es_index_indexing_is_throttled_bool\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -142,7 +141,7 @@ \# \s TYPE \s es_index_indexing_throttle_time_seconds \s gauge \n ( es_index_indexing_throttle_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_11_index_get.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_11_index_get.yml similarity index 81% rename from src/test/resources/rest-api-spec/test/resthandler/30_11_index_get.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_11_index_get.yml index 858ad428..20f8cdc2 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_11_index_get.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_11_index_get.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_get_count \s gauge \n ( es_index_get_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_get_time_seconds \s gauge \n ( es_index_get_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_get_exists_count \s gauge \n ( es_index_get_exists_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_get_exists_time_seconds \s gauge \n ( es_index_get_exists_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -82,7 +81,7 @@ \# \s TYPE \s es_index_get_missing_count \s gauge \n ( es_index_get_missing_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -94,7 +93,7 @@ \# \s TYPE \s es_index_get_missing_time_seconds \s gauge \n ( es_index_get_missing_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -106,7 +105,7 @@ \# \s TYPE \s es_index_get_current_number \s gauge \n ( es_index_get_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_12_index_search.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_12_index_search.yml similarity index 80% rename from src/test/resources/rest-api-spec/test/resthandler/30_12_index_search.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_12_index_search.yml index 1dbeb787..34bd6107 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_12_index_search.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_12_index_search.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_search_open_contexts_number \s gauge \n ( es_index_search_open_contexts_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_search_fetch_count \s gauge \n ( es_index_search_fetch_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_search_fetch_current_number \s gauge \n ( es_index_search_fetch_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_search_fetch_time_seconds \s gauge \n ( es_index_search_fetch_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -82,7 +81,7 @@ \# \s TYPE \s es_index_search_query_count \s gauge \n ( es_index_search_query_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -94,7 +93,7 @@ \# \s TYPE \s es_index_search_query_current_number \s gauge \n ( es_index_search_query_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -106,7 +105,7 @@ \# \s TYPE \s es_index_search_query_time_seconds \s gauge \n ( es_index_search_query_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -118,7 +117,7 @@ \# \s TYPE \s es_index_search_scroll_count \s gauge \n ( es_index_search_scroll_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -130,7 +129,7 @@ \# \s TYPE \s es_index_search_scroll_current_number \s gauge \n ( es_index_search_scroll_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -142,7 +141,7 @@ \# \s TYPE \s es_index_search_scroll_time_seconds \s gauge \n ( es_index_search_scroll_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_13_index_merges.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_13_index_merges.yml similarity index 81% rename from src/test/resources/rest-api-spec/test/resthandler/30_13_index_merges.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_13_index_merges.yml index 3692fb46..3d547e3c 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_13_index_merges.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_13_index_merges.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_merges_current_number \s gauge \n ( es_index_merges_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_merges_current_docs_number \s gauge \n ( es_index_merges_current_docs_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_merges_current_size_bytes \s gauge \n ( es_index_merges_current_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_merges_total_number \s gauge \n ( es_index_merges_total_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -82,7 +81,7 @@ \# \s TYPE \s es_index_merges_total_time_seconds \s gauge \n ( es_index_merges_total_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -94,7 +93,7 @@ \# \s TYPE \s es_index_merges_total_docs_count \s gauge \n ( es_index_merges_total_docs_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -106,7 +105,7 @@ \# \s TYPE \s es_index_merges_total_size_bytes \s gauge \n ( es_index_merges_total_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -118,7 +117,7 @@ \# \s TYPE \s es_index_merges_total_stopped_time_seconds \s gauge \n ( es_index_merges_total_stopped_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -130,7 +129,7 @@ \# \s TYPE \s es_index_merges_total_throttled_time_seconds \s gauge \n ( es_index_merges_total_throttled_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -142,7 +141,7 @@ \# \s TYPE \s es_index_merges_total_auto_throttle_bytes \s gauge \n ( es_index_merges_total_auto_throttle_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+([eE]\d+)? \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_14_index_refresh.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_14_index_refresh.yml similarity index 84% rename from src/test/resources/rest-api-spec/test/resthandler/30_14_index_refresh.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_14_index_refresh.yml index b9ebe098..5ae9334d 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_14_index_refresh.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_14_index_refresh.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_refresh_total_count \s gauge \n ( es_index_refresh_total_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_refresh_total_time_seconds \s gauge \n ( es_index_refresh_total_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_refresh_listeners_number \s gauge \n ( es_index_refresh_listeners_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_15_index_flush.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_15_index_flush.yml similarity index 86% rename from src/test/resources/rest-api-spec/test/resthandler/30_15_index_flush.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_15_index_flush.yml index 57cb1d56..2501547e 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_15_index_flush.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_15_index_flush.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_flush_total_count \s gauge \n ( es_index_flush_total_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_flush_total_time_seconds \s gauge \n ( es_index_flush_total_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_16_index_querycache.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_16_index_querycache.yml similarity index 81% rename from src/test/resources/rest-api-spec/test/resthandler/30_16_index_querycache.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_16_index_querycache.yml index 015e5d6c..bbc9a7bf 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_16_index_querycache.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_16_index_querycache.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_querycache_cache_count \s gauge \n ( es_index_querycache_cache_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_querycache_cache_size_bytes \s gauge \n ( es_index_querycache_cache_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_querycache_evictions_count \s gauge \n ( es_index_querycache_evictions_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_querycache_hit_count \s gauge \n ( es_index_querycache_hit_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -82,7 +81,7 @@ \# \s TYPE \s es_index_querycache_memory_size_bytes \s gauge \n ( es_index_querycache_memory_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -94,7 +93,7 @@ \# \s TYPE \s es_index_querycache_miss_number \s gauge \n ( es_index_querycache_miss_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -106,7 +105,7 @@ \# \s TYPE \s es_index_querycache_total_number \s gauge \n ( es_index_querycache_total_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_17_index_fieldata.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_17_index_fieldata.yml similarity index 86% rename from src/test/resources/rest-api-spec/test/resthandler/30_17_index_fieldata.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_17_index_fieldata.yml index 7742ec6f..98473efb 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_17_index_fieldata.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_17_index_fieldata.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_fielddata_memory_size_bytes \s gauge \n ( es_index_fielddata_memory_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_fielddata_evictions_count \s gauge \n ( es_index_fielddata_evictions_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_18_index_completion.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_18_index_completion.yml similarity index 89% rename from src/test/resources/rest-api-spec/test/resthandler/30_18_index_completion.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_18_index_completion.yml index f9917349..52e9572b 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_18_index_completion.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_18_index_completion.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_completion_size_bytes \s gauge \n ( es_index_completion_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_19_index_segments.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_19_index_segments.yml similarity index 79% rename from src/test/resources/rest-api-spec/test/resthandler/30_19_index_segments.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_19_index_segments.yml index eeb52fe7..1a0f3f0c 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_19_index_segments.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_19_index_segments.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_segments_number \s gauge \n ( es_index_segments_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_segments_memory_bytes \s gauge \n ( es_index_segments_memory_bytes\{ - cluster="integTest",type="(all|bitset|docvalues|indexwriter|norms|storefields|terms|termvectors|versionmap|points)",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",type="(all|bitset|docvalues|indexwriter|norms|storefields|terms|termvectors|versionmap|points)",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){20} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_20_index_suggest.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_20_index_suggest.yml similarity index 84% rename from src/test/resources/rest-api-spec/test/resthandler/30_20_index_suggest.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_20_index_suggest.yml index e9a4745c..735287f6 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_20_index_suggest.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_20_index_suggest.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_suggest_current_number \s gauge \n ( es_index_suggest_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_suggest_count \s gauge \n ( es_index_suggest_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_suggest_time_seconds \s gauge \n ( es_index_suggest_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_21_index_requestcache.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_21_index_requestcache.yml similarity index 83% rename from src/test/resources/rest-api-spec/test/resthandler/30_21_index_requestcache.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_21_index_requestcache.yml index 4585b75b..fbfa118b 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_21_index_requestcache.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_21_index_requestcache.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_requestcache_memory_size_bytes \s gauge \n ( es_index_requestcache_memory_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_requestcache_hit_count \s gauge \n ( es_index_requestcache_hit_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_requestcache_miss_count \s gauge \n ( es_index_requestcache_miss_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_requestcache_evictions_count \s gauge \n ( es_index_requestcache_evictions_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_22_index_recovery.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_22_index_recovery.yml similarity index 85% rename from src/test/resources/rest-api-spec/test/resthandler/30_22_index_recovery.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_22_index_recovery.yml index 1e9c0fad..db95249c 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_22_index_recovery.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_22_index_recovery.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_recovery_current_number \s gauge \n ( es_index_recovery_current_number\{ - cluster="integTest",type="(source|target)",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",type="(source|target)",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){4} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_recovery_throttle_time_seconds \s gauge \n ( es_index_recovery_throttle_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_23_index_translog.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_23_index_translog.yml similarity index 84% rename from src/test/resources/rest-api-spec/test/resthandler/30_23_index_translog.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_23_index_translog.yml index b1228b8b..bf6939b6 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_23_index_translog.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_23_index_translog.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_translog_operations_number \s gauge \n ( es_index_translog_operations_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_translog_size_bytes \s gauge \n ( es_index_translog_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_translog_uncommitted_operations_number \s gauge \n ( es_index_translog_uncommitted_operations_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -70,7 +69,7 @@ \# \s TYPE \s es_index_translog_uncommitted_size_bytes \s gauge \n ( es_index_translog_uncommitted_size_bytes\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/30_24_index_warmer.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_24_index_warmer.yml similarity index 84% rename from src/test/resources/rest-api-spec/test/resthandler/30_24_index_warmer.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_24_index_warmer.yml index a7ff6d37..c52bd441 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/30_24_index_warmer.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/30_24_index_warmer.yml @@ -14,7 +14,6 @@ - do: index: index: twitter - type: foo id: 1 body: { foo: bar } @@ -34,7 +33,7 @@ \# \s TYPE \s es_index_warmer_current_number \s gauge \n ( es_index_warmer_current_number\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -46,7 +45,7 @@ \# \s TYPE \s es_index_warmer_time_seconds \s gauge \n ( es_index_warmer_time_seconds\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ @@ -58,7 +57,7 @@ \# \s TYPE \s es_index_warmer_count \s gauge \n ( es_index_warmer_count\{ - cluster="integTest",index="twitter",context="(primaries|total)" + cluster="yamlRestTest",index="twitter",context="(primaries|total)" ,\} \s+ \d+\.\d+ \n? ){2} .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/40_10_cluster_settings_disk_threshold.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/40_10_cluster_settings_disk_threshold.yml similarity index 96% rename from src/test/resources/rest-api-spec/test/resthandler/40_10_cluster_settings_disk_threshold.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/40_10_cluster_settings_disk_threshold.yml index 68afbb8d..f97cac20 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/40_10_cluster_settings_disk_threshold.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/40_10_cluster_settings_disk_threshold.yml @@ -23,7 +23,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -55,7 +55,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 0\.0 \n? .*/ @@ -87,7 +87,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -120,7 +120,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -152,7 +152,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -184,6 +184,6 @@ \# \s HELP \s es_cluster_routing_allocation_disk_threshold_enabled (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_threshold_enabled \s gauge \n es_cluster_routing_allocation_disk_threshold_enabled\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ diff --git a/src/test/resources/rest-api-spec/test/resthandler/40_20_cluster_settings_disk_watermark_bytes.yml b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/40_20_cluster_settings_disk_watermark_bytes.yml similarity index 96% rename from src/test/resources/rest-api-spec/test/resthandler/40_20_cluster_settings_disk_watermark_bytes.yml rename to src/yamlRestTest/resources/rest-api-spec/test/resthandler/40_20_cluster_settings_disk_watermark_bytes.yml index d8778d7b..ae6cf1b7 100644 --- a/src/test/resources/rest-api-spec/test/resthandler/40_20_cluster_settings_disk_watermark_bytes.yml +++ b/src/yamlRestTest/resources/rest-api-spec/test/resthandler/40_20_cluster_settings_disk_watermark_bytes.yml @@ -28,7 +28,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_watermark_low_bytes (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_watermark_low_bytes \s gauge \n es_cluster_routing_allocation_disk_watermark_low_bytes\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -38,7 +38,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_watermark_high_bytes (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_watermark_high_bytes \s gauge \n es_cluster_routing_allocation_disk_watermark_high_bytes\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -48,7 +48,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_watermark_flood_stage_bytes (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_watermark_flood_stage_bytes \s gauge \n es_cluster_routing_allocation_disk_watermark_flood_stage_bytes\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 1\.0 \n? .*/ @@ -117,7 +117,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_watermark_low_pct (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_watermark_low_pct \s gauge \n es_cluster_routing_allocation_disk_watermark_low_pct\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 99\.9 \n? .*/ @@ -127,7 +127,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_watermark_high_pct (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_watermark_high_pct \s gauge \n es_cluster_routing_allocation_disk_watermark_high_pct\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 99\.9 \n? .*/ @@ -137,7 +137,7 @@ \# \s HELP \s es_cluster_routing_allocation_disk_watermark_flood_stage_pct (\s|\w|\d)+ \n \# \s TYPE \s es_cluster_routing_allocation_disk_watermark_flood_stage_pct \s gauge \n es_cluster_routing_allocation_disk_watermark_flood_stage_pct\{ - cluster="integTest" + cluster="yamlRestTest" \,} \s 99\.9 \n? .*/