modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
| 8 ++++++++
modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
| 2 ++
2 files changed, 10 insertions(+)
New commits:
commit 1e0bdb7c60f440dca3bee9c9b464097081e623a0
Author: John Sanda <jsanda(a)redhat.com>
Date: Mon Nov 5 13:52:35 2012 -0500
adding 24 hour metrics table back into schema
diff --git a/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
b/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
index 287f882..189b35b 100644
--- a/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
+++ b/modules/common/cassandra-common/src/main/cassandra/cql/dbsetup.cql
@@ -25,6 +25,14 @@ CREATE TABLE six_hour_metrics (
PRIMARY KEY (schedule_id, time, type)
);
+CREATE TABLE twenty_four_hour_metrics (
+ schedule_id int,
+ time timestamp,
+ type int,
+ value double,
+ PRIMARY KEY (schedule_id, time, type)
+);
+
CREATE TABLE metrics_index (
bucket varchar,
time timestamp,
diff --git
a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
index 3dd19e8..a398fe4 100644
---
a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
+++
b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/MetricsDAO.java
@@ -56,6 +56,8 @@ public class MetricsDAO {
public static final String SIX_HOUR_METRICS_TABLE = "six_hour_metrics";
+ public static final String TWENTY_FOUR_HOUR_METRICS_TABLE =
"twenty_four_hour_metrics";
+
private static final String RAW_METRICS_QUERY =
"SELECT schedule_id, time, value " +
"FROM " + RAW_METRICS_TABLE + " " +
Show replies by date