fixed an integration that was wrong

rax-maas · Dec 12, 2015 · 21033d2 · 21033d2
1 parent 1e7cf1f
commit 21033d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ackspacecloud/blueflood/outputs/handlers/HttpMultiRollupsQueryHandlerIntegrationTest.java b/...ackspacecloud/blueflood/outputs/handlers/HttpMultiRollupsQueryHandlerIntegrationTest.java
@@ -51,7 +51,7 @@ public void testMultiplotQuery() throws Exception {
                 "        {\n" +
                 "          \"numPoints\": 1,\n" +
                 "          \"timestamp\": 1382400000,\n" +
-                "          \"average\": 397\n" +
+                "          \"latest\": 397\n" +
                 "        }\n" +
                 "      ],\n" +
                 "      \"type\": \"number\"\n" +
@@ -63,7 +63,7 @@ public void testMultiplotQuery() throws Exception {
                 "        {\n" +
                 "          \"numPoints\": 1,\n" +
                 "          \"timestamp\": 1382400000,\n" +
-                "          \"average\": 56\n" +
+                "          \"latest\": 56\n" +
                 "        }\n" +
                 "      ],\n" +
                 "      \"type\": \"number\"\n" +

diff --git a/.../com/rackspacecloud/blueflood/outputs/serializers/BatchedMetricsJSONOutputSerializer.java b/.../com/rackspacecloud/blueflood/outputs/serializers/BatchedMetricsJSONOutputSerializer.java
@@ -43,7 +43,7 @@ public JSONObject transformRollupData(Map<Locator, MetricData> metricData, Set<M
             singleMetricJSON.put("unit", one.getValue().getUnit() == null ? Util.UNKNOWN : one.getValue().getUnit());
             singleMetricJSON.put("type", one.getValue().getType());
             Set<MetricStat> oneFilterStats = fixFilterStats(one.getValue(), filterStats);
-            JSONArray values = transformDataToJSONArray(one.getValue(), filterStats);
+            JSONArray values = transformDataToJSONArray(one.getValue(), oneFilterStats);
             singleMetricJSON.put("data", values);
             metricsArray.add(singleMetricJSON);
         }