Add zero values to field chart widgets

Graylog2 · Mar 24, 2015 · 2fe7faf · 2fe7faf
1 parent db8b777
commit 2fe7faf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/app/assets/javascripts/dashboards/widgets/field_chart.js b/app/assets/javascripts/dashboards/widgets/field_chart.js
@@ -48,7 +48,7 @@ function updateWidget_field_chart(widget, data) {
     for (var key in data.result) {
         var point = {
             x: parseInt(key),
-            y: data.result[key][graphElem.attr("data-config-valuetype")]
+            y: data.result[key]
         };
 
         series.push(point);

diff --git a/app/controllers/api/DashboardsApiController.java b/app/controllers/api/DashboardsApiController.java
@@ -177,7 +177,7 @@ public Result widgetValue(String dashboardId, String widgetId, int resolution) {
             DashboardWidgetValueResponse widgetValue = widget.getValue(api());
 
             Object resultValue;
-            if (widget instanceof SearchResultChartWidget) {
+            if (widget instanceof SearchResultChartWidget || widget instanceof FieldChartWidget) {
                 resultValue = formatWidgetValueResults(resolution, widget, widgetValue);
             } else {
                 resultValue = widgetValue.result;
@@ -198,7 +198,7 @@ public Result widgetValue(String dashboardId, String widgetId, int resolution) {
         }
     }
 
-    protected Map<String, Long> formatWidgetValueResults(final int maxDataPoints,
+    protected Map<String, Object> formatWidgetValueResults(final int maxDataPoints,
                                                                final DashboardWidget widget,
                                                                final DashboardWidgetValueResponse widgetValue) {
         final Map<String, Object> widgetConfig = widget.getConfig();
@@ -207,18 +207,20 @@ protected Map<String, Long> formatWidgetValueResults(final int maxDataPoints,
 
         return formatWidgetValueResults(maxDataPoints,
                 widgetValue.result,
+                (String)widgetConfig.get("valuetype"),
                 interval,
                 widgetValue.computationTimeRange,
                 allQuery);
     }
 
     // TODO: Extract common parts of this and the similar method on SearchApiController
-    protected Map<String, Long> formatWidgetValueResults(final int maxDataPoints,
+    protected Map<String, Object> formatWidgetValueResults(final int maxDataPoints,
                                                          final Object resultValue,
+                                                         final String functionType,
                                                          final String interval,
                                                          final Map<String, Object> timeRange,
                                                          final boolean allQuery) {
-        final Map<String, Long> points = Maps.newHashMap();
+        final Map<String, Object> points = Maps.newHashMap();
 
         if (resultValue instanceof Map) {
             final Map<?, ?> resultMap = (Map) resultValue;
@@ -245,7 +247,10 @@ protected Map<String, Long> formatWidgetValueResults(final int maxDataPoints,
                 if (index % factor == 0) {
                     String timestamp = Long.toString(currentTime.getMillis() / 1000);
                     Object value = resultMap.get(timestamp);
-                    Long result = value == null ? 0L : Long.parseLong(String.valueOf(value));
+                    if (functionType != null && value != null) {
+                        value = ((Map)value).get(functionType);
+                    }
+                    Object result = value == null ? 0 : value;
                     points.put(timestamp, result);
                 }
                 index++;

diff --git a/javascript/src/components/visualizations/GraphVisualization.jsx b/javascript/src/components/visualizations/GraphVisualization.jsx
@@ -139,7 +139,7 @@ var GraphVisualization = React.createClass({
         var formattedData = [];
         for(var key in data) {
             if (data.hasOwnProperty(key)) {
-                var normalizedValue = NumberUtils.normalizeNumber(data[key][this.props.config.valuetype]);
+                var normalizedValue = NumberUtils.normalizeNumber(data[key]);
                 formattedData.push({
                     x: Number(key),
                     y: isNaN(normalizedValue) ? 0 : normalizedValue