You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/01/30 10:23:15 UTC
lucene-solr:jira/solr-9858: SOLR-9858 Narrow the selection of
reported metrics.
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-9858 cba0956f3 -> 100ee7ed6
SOLR-9858 Narrow the selection of reported metrics.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/100ee7ed
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/100ee7ed
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/100ee7ed
Branch: refs/heads/jira/solr-9858
Commit: 100ee7ed6d38caf176c5aca7dc8c0fb7f2c97bd1
Parents: cba0956
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Jan 30 11:22:54 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Jan 30 11:22:54 2017 +0100
----------------------------------------------------------------------
.../metrics/reporters/solr/SolrOverseerReporter.java | 14 ++++++++++----
.../metrics/reporters/solr/SolrReplicaReporter.java | 2 +-
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/100ee7ed/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrOverseerReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrOverseerReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrOverseerReporter.java
index f3bb4d5..7f5de69 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrOverseerReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrOverseerReporter.java
@@ -35,12 +35,18 @@ public class SolrOverseerReporter extends SolrMetricReporter {
public static final List<SolrReporter.Specification> DEFAULT_METRICS = new ArrayList<SolrReporter.Specification>() {{
add(new SolrReporter.Specification(OVERSEER_GROUP, "jetty",
SolrMetricManager.overridableRegistryName(SolrInfoMBean.Group.jetty.toString()),
- Collections.singleton(".*\\.mean"))); // all metrics
+ Collections.emptySet())); // all metrics
add(new SolrReporter.Specification(OVERSEER_GROUP, "jvm",
SolrMetricManager.overridableRegistryName(SolrInfoMBean.Group.jvm.toString()),
- Collections.emptySet())); // all metrics
- add(new SolrReporter.Specification(OVERSEER_GROUP, "node", SolrMetricManager.overridableRegistryName(SolrInfoMBean.Group.node.toString()),
- Collections.emptySet())); // all metrics
+ new HashSet<String>() {{
+ add("memory\\.total\\..*");
+ add("memory\\.heap\\..*");
+ add("os\\.SystemLoadAverage");
+ add("threads\\.count");
+ }})); // all metrics
+ // XXX anything interesting here?
+ //add(new SolrReporter.Specification(OVERSEER_GROUP, "node", SolrMetricManager.overridableRegistryName(SolrInfoMBean.Group.node.toString()),
+ // Collections.emptySet())); // all metrics
add(new SolrReporter.Specification(OVERSEER_GROUP, "leader.$1", "solr\\.core\\.(.*)\\.leader",
new HashSet<String>(){{
add("UPDATE\\./update/.*");
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/100ee7ed/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReplicaReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReplicaReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReplicaReporter.java
index 5d2d584..06a4f92 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReplicaReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/solr/SolrReplicaReporter.java
@@ -41,7 +41,7 @@ public class SolrReplicaReporter extends SolrMetricReporter {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final String[] DEFAULT_METRICS = {
- "TLOG.*", "REPLICATION.*", "INDEX.flush.*", "INDEX.merge.major.*", "UPDATE\\./update/.*", "QUERY\\./select.*"
+ "TLOG.*", "REPLICATION.*", "INDEX.flush.*", "INDEX.merge.major.*", "UPDATE\\./update/.*requests", "QUERY\\./select.*requests"
};
private String groupId;