modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java | 7 +++++++ modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java | 1 + 2 files changed, 8 insertions(+)
New commits: commit 76afc646065a30db60f7dfa8c57f264860ced958 Author: John Sanda jsanda@redhat.com Date: Wed Feb 27 13:20:46 2013 -0500
need to initialize the metrics configuration in MetricsServer
For the work I have been doing with metrics simulator I introduced the class MetricsConfiguration which specifies retention and time slice intervals to use. That configuration is injected into MetricsServer. This commit updates SLSB code to set a default configuration.
diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java index 667744c..f35f7fd 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cassandra/SessionManagerBean.java @@ -37,6 +37,7 @@ import com.datastax.driver.core.exceptions.NoHostAvailableException;
import org.rhq.cassandra.CassandraNode; import org.rhq.server.metrics.CQLException; +import org.rhq.server.metrics.MetricsConfiguration;
/** * @author John Sanda @@ -46,6 +47,8 @@ public class SessionManagerBean {
private Session session;
+ private MetricsConfiguration metricsConfiguration = new MetricsConfiguration(); + @PostConstruct private void createSession() { try { @@ -85,4 +88,8 @@ public class SessionManagerBean { return session; }
+ public MetricsConfiguration getMetricsConfiguration() { + return metricsConfiguration; + } + } diff --git a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java index f37368d..df2fe58 100644 --- a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java +++ b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MetricsManagerBean.java @@ -109,6 +109,7 @@ public class MetricsManagerBean implements MetricsManagerLocal { private MetricsServer getMetricsServer() { MetricsServer metricsServer = new MetricsServer(); metricsServer.setSession(sessionManager.getSession()); + metricsServer.setConfiguration(sessionManager.getMetricsConfiguration()); return metricsServer; } }
rhq-commits@lists.fedorahosted.org