metrics for radio

Author: Lennart Koopmann

app/controllers/MetricsController.java

@@ -23,8 +23,10 @@
 import lib.APIException;
 import lib.ApiClient;
 import lib.BreadcrumbList;
+import models.ClusterEntity;
 import models.Node;
 import models.NodeService;
+import models.Radio;
 import play.mvc.Result;
 
 import java.io.IOException;
@@ -58,4 +60,26 @@ public Result ofNode(String nodeId, String preFilter) {
         }
     }
 
+    public Result ofRadio(String radioId, String preFilter) {
+        try {
+            Radio radio = nodeService.loadRadio(radioId);
+
+            BreadcrumbList bc = new BreadcrumbList();
+            bc.addCrumb("System", routes.SystemController.index(0));
+            bc.addCrumb("Nodes", routes.SystemController.nodes());
+            bc.addCrumb(radio.getShortNodeId(), routes.RadiosController.show(radio.getId()));
+            bc.addCrumb("Metrics", routes.MetricsController.ofRadio(radio.getId(), ""));
+
+            return ok(views.html.system.metrics.of_node.render(currentUser(), bc, radio, radio.getMetrics("org.graylog2"), preFilter));
+        } catch (IOException e) {
+            return status(500, views.html.errors.error.render(ApiClient.ERROR_MSG_IO, e, request()));
+        } catch (APIException e) {
+            String message = "Could not fetch system information. We expected HTTP 200, but got a HTTP " + e.getHttpCode() + ".";
+            return status(500, views.html.errors.error.render(message, e, request()));
+        } catch (NodeService.NodeNotFoundException e) {
+            return status(404, views.html.errors.error.render(ApiClient.ERROR_MSG_NODE_NOT_FOUND, e, request()));
+        }
+    }
+
+
 }

app/models/Radio.java

@@ -27,10 +27,12 @@
 import lib.APIException;
 import lib.ApiClient;
 import lib.ExclusiveInputException;
+import lib.metrics.Metric;
 import models.api.requests.InputLaunchRequest;
 import models.api.responses.BuffersResponse;
 import models.api.responses.SystemOverviewResponse;
 import models.api.responses.cluster.RadioSummaryResponse;
+import models.api.responses.metrics.MetricsListResponse;
 import models.api.responses.system.*;
 import org.joda.time.DateTime;
 import org.slf4j.LoggerFactory;
@@ -275,6 +277,16 @@ public int getThroughput() {
         return 0;
     }
 
+    public Map<String, Metric> getMetrics(String namespace) throws APIException, IOException {
+        MetricsListResponse response = api.get(MetricsListResponse.class)
+                .radio(this)
+                .path("/system/metrics/namespace/{0}", namespace)
+                .expect(200, 404)
+                .execute();
+
+        return response.getMetrics();
+    }
+
     @Override
     public String toString() {
         final StringBuilder b = new StringBuilder();

app/views/system/metrics/of_node.scala.html

@@ -1,4 +1,4 @@
-@(currentUser: User, breadcrumbs: lib.BreadcrumbList, node: Node, metrics: Map[String, lib.metrics.Metric], preFilter: String)
+@(currentUser: User, breadcrumbs: lib.BreadcrumbList, node: ClusterEntity, metrics: Map[String, lib.metrics.Metric], preFilter: String)
 
 @main("Metrics", views.html.system.sidebar(), "", currentUser) {
 

app/views/system/nodes/index.scala.html

@@ -119,7 +119,7 @@ <h2 class="radios-head"><i class="icon icon-double-angle-down"></i> Radio nodes<
                         </a>
                         <ul class="dropdown-menu">
                             <li><a href="@routes.InputsController.manageRadio(radio.getId)">Manage inputs</a></li>
-                            <li class="disabled"><a href="#">Metrics</a></li>
+                            <li><a href="@routes.MetricsController.ofRadio(radio.getId)">Metrics</a></li>
                             <li><a href="@routes.SystemController.threadDumpRadio(radio.getId)">Get thread dump</a></li>
                         </ul>
                     </div>
@@ -138,7 +138,6 @@ <h3>
 
                 The JVM is using <strong>@radio.jvm().getUsedMemory.getMegabytes() of @radio.jvm().getTotalMemory.getMegabytes() MB</strong>
                 heap space and will not attempt to use more than <strong>@radio.jvm().getMaxMemory.getMegabytes() MB</strong>.
-
             </div>
         }
     } else {

conf/routes

@@ -50,6 +50,7 @@ POST        /system/inputs/:node_id/:input_id/staticfields
 GET         /system/inputs/:node_id/:input_id/staticfields/:key/delete               @controllers.InputsController.removeStaticField(node_id: String, input_id: String, key: String)
 GET         /system/mappers                                                          @controllers.MappersController.index()
 GET         /system/metrics/:node_id                                                 @controllers.MetricsController.ofNode(node_id: String, prefilter ?= "")
+GET         /system/metrics/radio/:radio_id                                          @controllers.MetricsController.ofRadio(radio_id: String, prefilter ?= "")
 
 # Extractors
 GET         /system/inputs/:node_id/:input_id/extractors                             @controllers.ExtractorsController.manage(node_id: String, input_id: String)