Fixed some mesages.

Author: Florian Lautenschlager

chronix-timeseries-exploration/src/main/java/de/qaware/chronix/examples/exploration/ui/MainController.java

@@ -105,11 +105,11 @@ public void initChronix(String solrUrl) {
             @Override
             public Void call() {
 
-                LOGGER.info("Setting up Chronix with an remote solr to url {}", solrUrl);
+                LOGGER.info("Setting up Chronix with a remote Solr to URL {}", solrUrl);
                 solr = new HttpSolrClient(solrUrl);
 
                 boolean solrAvailable = solrAvailable();
-                LOGGER.info("Checking connection to solr. Result {}", solrAvailable);
+                LOGGER.info("Checking connection to Solr. Result {}", solrAvailable);
 
                 if (solrAvailable) {
                     Platform.runLater(() -> connectedState.setFill(Color.GREEN));
@@ -122,6 +122,9 @@ public Void call() {
                 Function<MetricTimeSeries, String> groupBy = MainController.this::join;
 
                 BinaryOperator<MetricTimeSeries> reduce = (timeSeries, timeSeries2) -> {
+                    if (timeSeries == null || timeSeries2 == null) {
+                        return new MetricTimeSeries.Builder("empty").build();
+                    }
                     timeSeries.addAll(timeSeries2.getPoints());
                     return timeSeries;
                 };
@@ -159,7 +162,7 @@ protected Void call() throws Exception {
                 long queryStart = System.currentTimeMillis();
                 List<MetricTimeSeries> result = chronix.stream(solr, query).collect(Collectors.toList());
                 long queryEnd = System.currentTimeMillis();
-                LOGGER.info("Query took: {} ms", (queryEnd - queryStart));
+                LOGGER.info("Query took: {} ms for {} points", (queryEnd - queryStart), size(result));
 
                 queryStart = System.currentTimeMillis();
                 result.forEach(ts -> {
@@ -178,6 +181,13 @@ protected Void call() throws Exception {
 
     }
 
+    private int size(List<MetricTimeSeries> result) {
+        if (result == null) {
+            return 0;
+        }
+        return result.stream().mapToInt(MetricTimeSeries::size).sum();
+    }
+
     private void convertTsToSeries(MetricTimeSeries ts, XYChart.Series<DateAxis, NumberAxis> series) {
         MetricDataPoint former = null;
 
@@ -202,6 +212,9 @@ private void convertTsToSeries(MetricTimeSeries ts, XYChart.Series<DateAxis, Num
     }
 
     private String join(MetricTimeSeries ts) {
+        if (ts == null) {
+            return "";
+        }
         return String.valueOf(ts.attribute("host")) + "-" +
                 ts.attribute("source") + "-" +
                 ts.attribute("group") + "-" +

chronix-timeseries-exploration/src/main/resources/de/qaware/chronix/examples/exploration/ui/Main.fxml

@@ -59,10 +59,11 @@
                                       promptText="Enter your Query here. The following fields are available: start, end, metric, and host. An example query is: metric:*usage* AND host:prod*. Press enter to execute the query."
 
                             />
-                            <TextArea fx:id="fqQuery" disable="false" editable="true" prefHeight="50.0" prefWidth="400.0"
+                            <TextArea fx:id="fqQuery" disable="false" editable="true" prefHeight="50.0"
+                                      prefWidth="400.0"
                                       visible="true" wrapText="true"
 
-                                      promptText="Enter your filter query to aggregate results, e.g., {! Aggregation ag=max}"
+                                      promptText="Enter your filter query to analyze results, e.g., ag=max, ag=dev, analysis=trend"
 
                             />
                         </children>