diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index fc0bdea6bed..e3b13700be0 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -98,6 +98,8 @@ Improvements * SOLR-12845: Add a default autoscaling cluster policy. (shalin, varunthacker, ab) +* SOLR-14433: Metrics: SolrShardReporter's default metrics list now includes TLOG and UPDATE./update (David Smiley) + Optimizations --------------------- * SOLR-8306: Do not collect expand documents when expand.rows=0 (Marshall Sanders, Amelia Henderson) diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java index bdf91f3da48..8609a238d74 100644 --- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java +++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrShardReporter.java @@ -68,7 +68,7 @@ public class SolrShardReporter extends SolrCoreReporter { add("REPLICATION.*"); add("INDEX\\.flush.*"); add("INDEX\\.merge\\.major.*"); - add("UPDATE\\./update/.*requests"); + add("UPDATE\\./update.*requests"); add("QUERY\\./select.*requests"); }}; diff --git a/solr/core/src/test-files/solr/solr-solrreporter.xml b/solr/core/src/test-files/solr/solr-solrreporter.xml index d238ac53260..f3249622eca 100644 --- a/solr/core/src/test-files/solr/solr-solrreporter.xml +++ b/solr/core/src/test-files/solr/solr-solrreporter.xml @@ -41,7 +41,7 @@ 5 - UPDATE\./update/.*requests + UPDATE\./update.*requests QUERY\./select.*requests @@ -60,7 +60,7 @@ cluster leader.$1 solr\.collection\.(.*)\.leader - UPDATE\./update/.* + UPDATE\./update.* diff --git a/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java b/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java index ef6d20863a0..132c91e4d6d 100644 --- a/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java +++ b/solr/core/src/test/org/apache/solr/metrics/reporters/solr/SolrCloudReportersTest.java @@ -140,7 +140,7 @@ public class SolrCloudReportersTest extends SolrCloudTestCase { String key = "QUERY./select.requests"; assertTrue(key, metrics.containsKey(key)); assertTrue(key, metrics.get(key) instanceof AggregateMetric); - key = "UPDATE./update/json.requests"; + key = "UPDATE./update.requests"; assertTrue(key, metrics.containsKey(key)); assertTrue(key, metrics.get(key) instanceof AggregateMetric); } @@ -150,7 +150,7 @@ public class SolrCloudReportersTest extends SolrCloudTestCase { String key = "jvm.memory.heap.init"; assertTrue(key, metrics.containsKey(key)); assertTrue(key, metrics.get(key) instanceof AggregateMetric); - key = "leader.test_collection.shard1.UPDATE./update/json.requests.max"; + key = "leader.test_collection.shard1.UPDATE./update.requests.max"; assertTrue(key, metrics.containsKey(key)); assertTrue(key, metrics.get(key) instanceof AggregateMetric); }