Change pom versions for 0.0.5 tag

fixes #123 - Update _.all to _.every as the newer version of lodash has changed the term. This fixes error seen with Timely Standalon and Grafana >4.2

README.md

@@ -2,7 +2,7 @@
 
 [![Apache License][li]][ll]
 
-Timely is a time series database application that provides secure access to time series data. Timely is written in Java and designed to work with [Apache Accumulo] (http://accumulo.apache.org/) and [Grafana] (http://www.grafana.org). Documentation is located [here] (https://nationalsecurityagency.github.io/timely/).
+Timely is a time series database application that provides secure access to time series data. Timely is written in Java and designed to work with [Apache Accumulo](http://accumulo.apache.org/) and [Grafana](http://www.grafana.org). Documentation is located [here](https://nationalsecurityagency.github.io/timely/).
 
 [li]: http://img.shields.io/badge/license-ASL-blue.svg
 [ll]: https://www.apache.org/licenses/LICENSE-2.0

analytics/pom.xml

@@ -23,7 +23,7 @@ under the License.
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <properties>
         <flink.version>1.1.4</flink.version>

analytics/src/main/java/timely/analytics/flink/SubscriptionSource.java

@@ -51,6 +51,7 @@ public class SubscriptionSource extends RichSourceFunction<MetricResponse> imple
     private final String[] metrics;
     private final SummarizationJobParameters jp;
     private final long window;
+    private final AtomicInteger subscriptionsRemaining;
 
     public SubscriptionSource(SummarizationJobParameters jp) {
         this.jp = jp;
@@ -58,6 +59,7 @@ public class SubscriptionSource extends RichSourceFunction<MetricResponse> imple
         end = jp.getEndTime();
         metrics = jp.getMetrics();
         window = jp.getSummarizationInterval().toMilliseconds();
+        subscriptionsRemaining = new AtomicInteger(metrics.length);
     }
 
     @Override
@@ -102,7 +104,8 @@ public class SubscriptionSource extends RichSourceFunction<MetricResponse> imple
 
                     @Override
                     public void onMessage(final String message) {
-                        LOG.info("Message received on Websocket session {}: {}", session.getId(), message);
+                        LOG.info("Message received on Websocket session {}, length: {}", session.getId(),
+                                message.length());
                         try {
                             // Deserialize in this thread
                             final MetricResponses responses = JsonSerializer.getObjectMapper().readValue(message,
@@ -113,9 +116,10 @@ public class SubscriptionSource extends RichSourceFunction<MetricResponse> imple
                                     if (response.isComplete()) {
                                         LOG.info("Received last message.");
                                         ctx.emitWatermark(new Watermark(Long.MAX_VALUE));
+                                        subscriptionsRemaining.getAndDecrement();
                                         return;
                                     }
-                                    LOG.trace("Sending metric: {}", response);
+                                    LOG.trace("Received metric: {}", response);
                                     long time = response.getTimestamp();
                                     ctx.collectWithTimestamp(response, time);
                                     dateTimeAccumulator.add(formatter.format(new Date(response.getTimestamp())));
@@ -178,7 +182,7 @@ public class SubscriptionSource extends RichSourceFunction<MetricResponse> imple
                 LOG.info("Adding subscription for {}", m);
                 client.addSubscription(m, null, start, end, 5000);
             }
-            while (!client.isClosed()) {
+            while (!client.isClosed() && subscriptionsRemaining.get() > 0) {
                 try {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {

client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <dependencies>
         <dependency>

client/src/main/java/timely/client/udp/UdpClient.java

@@ -38,6 +38,7 @@ public class UdpClient implements AutoCloseable {
     public void close() throws IOException {
         if (null != sock) {
             sock.close();
+            sock = null;
         }
     }
 

client/src/main/java/timely/model/Tag.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonRootName;
-import com.google.common.base.Joiner;
 import com.google.common.base.Preconditions;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 import org.apache.commons.lang3.builder.EqualsBuilder;

client/src/main/java/timely/model/parse/TagListParser.java

@@ -11,8 +11,7 @@ import java.util.Map;
 /**
  * Parses tag1=val1,tag2=val2,tag3=val3 into a {@code List} of {@code Tag}
  * Combines {@code List} of {@code Tag} into {@code String} of
- * tag1=val1,tag2=val2,tag3=val3 NOTE: the tag and the value are both URL
- * encoded and subsequently URL decoded.
+ * tag1=val1,tag2=val2,tag3=val3.
  */
 public class TagListParser implements Parser<List<Tag>>, Combiner<Collection<Tag>> {
 

client/src/main/java/timely/model/parse/TagParser.java

@@ -4,16 +4,11 @@ import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import timely.model.Tag;
 
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Parses tag1=val1 into a {@code Tag} Combines {@code Tag} into {@code String}
- * of tag1=val1 NOTE: the tag and the value are both URL encoded and
- * subsequently URL decoded.
+ * of tag1=val1
  */
 public class TagParser implements Parser<Tag>, Combiner<Tag> {
 
@@ -26,28 +21,12 @@ public class TagParser implements Parser<Tag>, Combiner<Tag> {
         if (parts.size() != 2) {
             throw new IllegalArgumentException("Invalid tag format: " + t);
         }
-        return new Tag(unescape(parts.get(0)), unescape(parts.get(1)));
+        return new Tag(parts.get(0), parts.get(1));
     }
 
     @Override
     public String combine(Tag t) {
-        return equalsJoiner.join(escape(t.getKey()), escape(t.getValue()));
-    }
-
-    private String escape(String tag) {
-        try {
-            return URLEncoder.encode(tag, "UTF8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private String unescape(String tag) {
-        try {
-            return URLDecoder.decode(tag, "UTF8");
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
+        return equalsJoiner.join(t.getKey(), t.getValue());
     }
 
 }

client/src/main/python/DataOperations.py

@@ -1,10 +1,15 @@
 import time
+from datetime import timedelta
 from datetime import datetime
 from TimeDateRange import UTC
 import pandas
 import matplotlib.dates as mdates
 import plotly.graph_objs as go
 import plotly.offline as py
+import seaborn
+import matplotlib.ticker as tkr
+import numpy as np
+import os
 
 utc = UTC()
 
@@ -13,16 +18,17 @@ def pivot(df, metric, groupByColumn=None):
     dataFrame = pandas.DataFrame(df, copy=True)
     if dataFrame is not None:
         if groupByColumn is not None:
+            dataFrame["date"] = dataFrame.index.to_pydatetime()
             dataFrame = dataFrame.pivot_table(index="date", columns=groupByColumn, values=metric)
     return dataFrame
 
 
-def resample(df, sample, how='mean', fill_method='ffill'):
+def resample(df, sample, how='mean'):
 
     dataFrame = pandas.DataFrame(df, copy=True)
     if dataFrame is not None:
         if sample is not None:
-            dataFrame = dataFrame.resample(sample, how=how, fill_method=fill_method)
+            dataFrame = dataFrame.resample(sample, how=how).interpolate()
     return dataFrame
 
 
@@ -31,7 +37,7 @@ def unpivot(df, metric, groupByColumn=None):
     if dataFrame is not None:
         dataFrame['date'] = dataFrame.index.values
         dataFrame = pandas.melt(dataFrame, id_vars=['date'], value_name=metric, var_name=groupByColumn)
-        dataFrame = dataFrame.set_index(dataFrame['date'])
+        dataFrame = dataFrame.set_index('date')
     return dataFrame
 
 
@@ -44,7 +50,89 @@ def rolling_average(df, metric, rolling_average=None):
     return dataFrame
 
 
-def graph(analyticConfig, df, metric, seriesConfig={}, graphConfig={}, notebook=False):
+def graph(analyticConfig, df, timelyMetric, seriesConfig={}, graphConfig={}, notebook=False, type='png'):
+    if type == 'png':
+        return graphSeaborn(analyticConfig, df, timelyMetric, seriesConfig=seriesConfig, graphConfig=graphConfig, notebook=notebook)
+    else:
+        return graphPlotly(analyticConfig, df, timelyMetric, seriesConfig=seriesConfig, graphConfig=graphConfig, notebook=notebook)
+
+
+def graphSeaborn(analyticConfig, df, timelyMetric, seriesConfig={}, graphConfig={}, notebook=False):
+
+    dataFrame = pandas.DataFrame(df, copy=True)
+    if dataFrame is not None:
+        dataFrame = ensureMinSeriesLength(dataFrame, analyticConfig.groupByColumn)
+        dataFrame['date'] = dataFrame.index.values
+        dataFrame['dateFloat'] = dataFrame['date'].apply(lambda x: datetime2graphdays(x))
+        dataFrame['index'] = dataFrame['dateFloat']
+        groupByColumn = analyticConfig.groupByColumn
+
+        if groupByColumn is not None:
+            # sort on date and the groupByColumn so that the series legend is sorted
+            dataFrame = dataFrame.sort_values(['index', analyticConfig.groupByColumn])
+        else:
+            dataFrame = dataFrame.sort_values(['index'])
+
+        #dataFrame = dataFrame.set_index('index', drop=True)
+        dataFrame = dataFrame.dropna()
+        seaborn.set(style="darkgrid", palette="Set2")
+        fig, ax = seaborn.plt.subplots()
+
+        colors = np.random.random((len(dataFrame), 3))
+        i = 0
+        for col in df[analyticConfig.groupByColumn].unique():
+            tempDataFrame = dataFrame.loc[dataFrame[analyticConfig.groupByColumn] == col]
+            addlColConfig = seriesConfig.get(col, seriesConfig.get('default', dict()))
+            markerDict = addlColConfig.get("marker", dict())
+            color = markerDict.get("color", "")
+            if color == "red":
+                seaborn.tsplot(tempDataFrame, time="dateFloat", unit=None, interpolate=False, color="red", marker="d",
+                               estimator=np.nanmean, condition=groupByColumn, value=timelyMetric.metric, ax=ax)
+            else:
+                seaborn.tsplot(tempDataFrame, time="dateFloat", unit=None, interpolate=True, color=colors[i],
+                               estimator=np.nanmean, condition=groupByColumn, value=timelyMetric.metric, ax=ax)
+            i = i + 1
+
+        ax.xaxis_date()
+        ax.xaxis.set_major_locator(mdates.AutoDateLocator())
+        ax.xaxis.set_major_formatter(mdates.DateFormatter('%Y/%m/%d %H:%M:%S'))
+        ax.set_xlim(xmin=dataFrame['dateFloat'].min(), xmax=dataFrame['dateFloat'].max())
+
+        formatter = tkr.ScalarFormatter(useMathText=False)
+        formatter.set_scientific(False)
+        ax.yaxis.set_major_formatter(formatter)
+
+        graphTitle = getTitle(timelyMetric, analyticConfig)
+        seaborn.plt.title(graphTitle, fontsize='large')
+        seaborn.plt.xlabel('date/time')
+        seaborn.plt.ylabel(timelyMetric.metric)
+
+        legendTitle = "Legend"
+        if groupByColumn is not None:
+            legendTitle = groupByColumn
+
+        seaborn.plt.legend(loc='upper center', prop={'size':8}, ncol=10, title=legendTitle, bbox_to_anchor=(0.5,-0.4))
+        fig.autofmt_xdate(rotation=45)
+
+        seaborn.plt.autoscale(tight=False)
+
+        if notebook == True:
+            seaborn.plt.show()
+            return None
+        else:
+            directory = analyticConfig.output_dir
+            try:
+                os.makedirs(directory, mode=0755)
+            except OSError, e:
+                # be happy if someone already created the path
+                pass
+            baseFilename = getFilename(timelyMetric.metric, analyticConfig)
+            filename = directory+'/'+baseFilename
+            fig.savefig(filename + '.png')
+            return baseFilename + '.png'
+
+
+def graphPlotly(analyticConfig, df, timelyMetric, seriesConfig={}, graphConfig={}, notebook=False):
 
     dataFrame = pandas.DataFrame(df, copy=True)
     if dataFrame is not None:
@@ -55,13 +143,9 @@ def graph(analyticConfig, df, metric, seriesConfig={}, graphConfig={}, notebook=
         else:
             dataFrame = dataFrame.sort_values(['colFromIndex'])
 
-        title = None
-        if analyticConfig.sample is None:
-            title = metric
-        else:
-            title = metric + '\rsample ' + analyticConfig.sample
+        title = getTitle(timelyMetric, analyticConfig)
 
-        dataFrame['date'] = dataFrame.index
+        dataFrame['date'] = dataFrame.index.values
 
         layoutConfig = dict(
             title=title,
@@ -75,7 +159,7 @@ def graph(analyticConfig, df, metric, seriesConfig={}, graphConfig={}, notebook=
             ),
             yaxis=dict(
                 autorange=True,
-                title=title
+                title=timelyMetric.metric
             )
         )
 
@@ -84,15 +168,16 @@ def graph(analyticConfig, df, metric, seriesConfig={}, graphConfig={}, notebook=
         layout = go.Layout(layoutConfig)
 
         data = None
-        for col in df[analyticConfig.groupByColumn].unique():
+        groupByValues = sorted(dataFrame[analyticConfig.groupByColumn].unique())
+        for col in groupByValues:
             tempDataFrame = dataFrame.loc[dataFrame[analyticConfig.groupByColumn] == col]
 
-            addlColConfig = graphConfig.get(col, graphConfig.get('default', dict()))
+            addlColConfig = seriesConfig.get(col, seriesConfig.get('default', dict()))
 
             config = dict(
                 name=col,
                 x=tempDataFrame.index,
-                y=tempDataFrame[metric],
+                y=tempDataFrame[timelyMetric.metric],
                 hoverinfo='x+y+text',
                 text=col
             )
@@ -106,23 +191,128 @@ def graph(analyticConfig, df, metric, seriesConfig={}, graphConfig={}, notebook=
             else:
                 data.append(s)
 
-        now = datetime.now(tz=utc)
-        format = "%Y%m%d%H%M%S"
-        nowStr = time.strftime(format, now.timetuple())
-
-        fileNameBase = analyticConfig.output_dir + "/" + metric
-        if analyticConfig.sample is not None:
-            fileNameBase += "-" + analyticConfig.sample
-        if analyticConfig.how is not None:
-            fileNameBase += "-" + analyticConfig.how
+        directory = analyticConfig.output_dir
+        try:
+            os.makedirs(directory, mode=0755)
+        except OSError, e:
+            # be happy if someone already created the path
+            pass
+        baseFilename = getFilename(timelyMetric.metric, analyticConfig)
+        filename = directory+'/'+baseFilename
 
         fig = go.Figure(data=data, layout=layout)
         if notebook:
-            py.iplot(fig, filename=fileNameBase+'-'+nowStr, show_link=False)
+            py.iplot(fig, filename=filename, show_link=False)
+            return None
         else:
-            py.plot(fig, output_type='file', filename=fileNameBase+'-'+nowStr+'.html', auto_open=False, show_link=False)
+            py.plot(fig, output_type='file', filename=filename+'.html', image_filename=filename, image=None, auto_open=False, show_link=False)
+            return baseFilename+'.html'
 
+def ensureMinSeriesLength(df, groupByColumn):
+
+    dataFrame = df
+    if groupByColumn is not None:
+        dataFrame = pandas.DataFrame(df, copy=True)
+        dataFrame = dataFrame.dropna()
+
+        extra = pandas.DataFrame()
+        for c, (cond, df_c) in enumerate(dataFrame.groupby(groupByColumn, sort=False)):
+            if len(df_c) <= 1:
+                extra = extra.append(df_c)
+
+        extra.index = extra.index + pandas.DateOffset(seconds=1)
+        dataFrame = dataFrame.append(extra)
+
+    return dataFrame
 
 def datetime2graphdays(dt):
 
     return mdates.epoch2num((time.mktime(dt.timetuple()) / 86400) * mdates.SEC_PER_DAY)
+
+def graphdays2datetime(x):
+    epoch = mdates.num2epoch(x)
+    return datetime.fromtimestamp(int(epoch), utc)
+
+
+def getFilename(metric, analyticConfig):
+
+    now = datetime.now(tz=utc)
+    format = "%Y%m%d%H%M%S"
+    nowStr = time.strftime(format, now.timetuple())
+    fileNameBase = metric
+    if analyticConfig.sample is not None:
+        fileNameBase += "-" + analyticConfig.sample
+    if analyticConfig.how is not None:
+        fileNameBase += "-" + analyticConfig.how
+
+    return fileNameBase + '-' + nowStr
+
+def getDirectoryPathForDate(format='%Y/%m/%d'):
+    now = datetime.now(tz=utc)
+    return time.strftime(format, now.timetuple())
+
+def getTitle(timelyMetric, config, separator='\n'):
+    if config.orCondition:
+        condition = "OR"
+    else:
+        condition = "AND"
+
+    metricTitle = timelyMetric.metric
+    if timelyMetric.tags is not None and len(timelyMetric.tags) > 0:
+        metricTitle += ' (' + timelyMetric.tags + ')'
+
+    sampleTitle = ""
+    alertTitle = ""
+    if config.sample_period is not None:
+        sampleTitle = config.sample_period + " " + config.how + " samples"
+
+    if config.rolling_average_period is not None:
+        sampleTitle += ', ' + config.rolling_average_period + ' rolling average'
+
+    if config.min_threshold is not None:
+        if alertTitle != "":
+            alertTitle += " " + condition + " "
+        alertTitle += "(y < " + str(config.min_threshold) + ")"
+
+    if config.average_min_threshold is not None:
+        if alertTitle != "":
+            alertTitle += " " + condition + " "
+        alertTitle += "(y-avg < " + str(config.average_min_threshold) + ")"
+
+    if config.max_threshold is not None:
+        if alertTitle != "":
+            alertTitle += " " + condition + " "
+        alertTitle += "(y > " + str(config.max_threshold) + ")"
+
+    if config.average_max_threshold is not None:
+        if alertTitle != "":
+            alertTitle += " " + condition + " "
+        alertTitle += "(y-avg > " + str(config.average_max_threshold) + ")"
+
+    if config.alert_percentage is not None:
+        if alertTitle != "":
+            alertTitle += " " + condition + " "
+        if config.alert_percentage > 0:
+            alertTitle += "(y > " + str(config.alert_percentage) + "% above " + str(
+                config.rolling_average_period) + " sample average)"
+        else:
+            alertTitle += "(y < " + str(-config.alert_percentage) + "% below " + str(
+                config.rolling_average_period) + " sample average)"
+
+    if config.system_name is None:
+        title = metricTitle
+    else:
+        title = config.system_name + ' - ' + metricTitle
+
+    if sampleTitle != "":
+        title += separator + sampleTitle
+
+    if alertTitle != "":
+        if config.min_alert_period is not None:
+            alertTitle = '(' + alertTitle + ') for greater than ' + config.min_alert_period
+        if config.last_alert is not None:
+            alertTitle = alertTitle + ' in last ' + config.last_alert
+        title += separator + alertTitle
+
+
+    return title

client/src/main/python/TimeDateRange.py

@@ -2,6 +2,8 @@ import time
 from datetime import datetime
 from datetime import timedelta
 from datetime import tzinfo
+from pandas.tslib import Timedelta
+import pandas
 
 class TimeDateError(ValueError):
 
@@ -56,17 +58,17 @@ class TimeDateRange:
             return None
         return time.strftime(self.format, self.endDt.timetuple())
 
-    def __init__(self, beginStr, endStr, hours, format="%Y%m%d-%H%M%S"):
+    def __init__(self, beginStr, endStr, period, format="%Y%m%d-%H%M%S"):
 
         now = datetime.now(tz=utc)
         nowMs = TimeDateRange.unix_time_millis(now)
 
-        if beginStr != None and endStr != None and hours != None:
-            raise TimeDateError("You can not privide a begin, end, and hours")
-        elif (beginStr == None and endStr == None and hours == None) or (hours == None and beginStr == None):
+        if beginStr != None and endStr != None and period != None:
+            raise TimeDateError("You can not provide a begin, end, and period")
+        elif (beginStr == None and endStr == None and period == None) or (period == None and beginStr == None):
             raise TimeDateError("You must provide a time range")
 
-        if hours == None:
+        if period == None:
             # calculate begin time
             beginTuple = time.strptime(beginStr, self.format)
             self.beginDt = datetime(*beginTuple[0:6], tzinfo=utc)
@@ -81,10 +83,12 @@ class TimeDateRange:
                 if self.endDt > now:
                     self.endDt = now
         else:
-            # hours must be specified
-            rangeInSec = hours * 3600
+            # period must be specified
+            td = pandas.to_timedelta(period)
+            rangeInSec = td.total_seconds()
+
             if beginStr == None:
-                # calculate begin time from end tme and hours
+                # calculate begin time from end tme and period
 
                 # calculate end time
                 # end is either specified or now
@@ -99,7 +103,7 @@ class TimeDateRange:
                 self.beginDt = self.endDt - timedelta(milliseconds=rangeInSec * 1000)
 
             else:
-                # calculate end time from begin tme and hours
+                # calculate end time from begin tme and period
                 # calculate begin time
                 self.beginDt = datetime(*time.strptime(beginStr, self.format)[0:6], tzinfo=utc)
 

client/src/main/python/TimelyAlert.py

@@ -4,80 +4,22 @@ from email.mime.application import MIMEApplication
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.utils import COMMASPACE, formatdate
-from TimelyMetric import graph
+import TimelyMetric
 import syslog
+import DataOperations
 
 syslog.openlog("TimelyNotifications")
 
-#def __init__(self, file, send_to, subject, text, analyticConfig, notebook):
-
 
 class TimelyAlert():
 
-    def __init__(self, timelyMetric, dataFrame, seriesConfig, analyticConfig, notebook):
+    def __init__(self, timelyMetric, dataFrame, message, seriesConfig, analyticConfig, notebook):
         self.timelyMetric = timelyMetric
         self.dataFrame = dataFrame
         self.seriesConfig = seriesConfig
         self.analyticConfig = analyticConfig
         self.notebook = notebook
-
-    def createFilename(self, metric, config):
-
-        metricTitle = metric
-        if config.sample is not None:
-            sampleTitle = config.sample + "-" + config.how
-
-        filename = metricTitle
-        if sampleTitle != "":
-            filename += "-" + sampleTitle
-
-        return filename
-
-    def createTitle(self, metric, config):
-
-        if config.orCondition:
-            condition = "OR"
-        else:
-            condition = "AND"
-
-        metricTitle = metric
-        sampleTitle = ""
-        alertTitle = ""
-        if config.sample is not None:
-            sampleTitle = config.sample + " " + config.how + " samples"
-
-        if config.min_threshold is not None:
-            if alertTitle != "":
-                alertTitle += " " + condition + " "
-            alertTitle += "(y < " + str(config.min_threshold) + ")"
-
-        if config.max_threshold is not None:
-            if alertTitle != "":
-                alertTitle += " " + condition + " "
-            alertTitle += "(y > " + str(config.max_threshold) + ")"
-
-        if config.alert_percentage is not None:
-            if alertTitle != "":
-                alertTitle += " " + condition + " "
-            if config.alert_percentage > 0:
-                alertTitle += "(y > " + str(config.alert_percentage) + "% above " + str(config.rolling_average) + " sample average)"
-            else:
-                alertTitle += "(y < " + str(-config.alert_percentage) + "% below " + str(config.rolling_average) + " sample average)"
-
-        title = metricTitle
-        if sampleTitle != "":
-            title += "\n" + sampleTitle
-
-        if alertTitle != "":
-            title += "\n" + alertTitle
-
-        return title
-
-    def notify(self, send_from, send_to, server="127.0.0.1"):
-
-        self.graph()
-
-        return
+        self.message = message
 
     def email(self, send_from, send_to, subject, text, files=None, server="127.0.0.1"):
         assert isinstance(send_to, list)
@@ -104,20 +46,27 @@ class TimelyAlert():
         smtp.sendmail(send_from, send_to, msg.as_string())
         smtp.close()
 
-    def graph(self):
+    def log(self, message):
+
+        syslog.systlog(syslog.LOG_ALERT, message)
+
+    def graph(self, type="png"):
 
         graphConfig = {}
-        graphConfig["title"] = self.createTitle(self.timelyMetric.metric, self.analyticConfig)
-        graph(self.analyticConfig, self.dataFrame, self.timelyMetric.metric, seriesConfig=self.seriesConfig, graphConfig=graphConfig, notebook=self.notebook)
+        graphConfig["title"] = DataOperations.getTitle(self.timelyMetric, self.analyticConfig)
+        return TimelyMetric.graph(self.analyticConfig, self.dataFrame, self.timelyMetric, seriesConfig=self.seriesConfig, graphConfig=graphConfig, notebook=self.notebook, type=type)
 
+    def getDataFrame(self):
+        return self.dataFrame
 
-def main():
-    #syslog.syslog(syslog.LOG_ALERT, "Example message")
-    a = TimelyAlert(None, None, None, None, False)
+    def getAnalyticConfig(self):
+        return self.analyticConfig
 
-    a.email_alert("wwoley@localhost", ["wwoley@localhost"], "Test1", "This is a sendmail test")
+    def getSeriesConfig(self):
+        return self.seriesConfig
 
+    def getTimelyMetric(self):
+        return self.timelyMetric
 
-
-if __name__ == '__main__':
-    main()
+    def getMessage(self):
+        return self.message

client/src/main/python/TimelyAnalytic.py

@@ -1,14 +1,17 @@
 import TimelyMetric
 from TimeDateRange import TimeDateRange
 from TimeDateRange import UTC
-from datetime import datetime
+from TimelyAnalyticConfiguration import TimelyAnalyticConfiguration
+import DataOperations
 import pandas
 import re
-import plotly
+from pandas.tslib import Timestamp
+from datetime import timedelta
+
 from TimelyAlert import TimelyAlert
+import numpy as np
 
 utc = UTC()
-plotly.offline.init_notebook_mode()
 
 def logTiming(timelyMetric, startTime, stopTime):
     df = timelyMetric.getDataFrame()
@@ -27,65 +30,139 @@ def addCondition(orCondition, currResult, condition):
         currResult = currResult & condition
     return currResult
 
+def keepConsecutiveAlerts(dataFrame, exceptions, minimumSpan):
+
+    if exceptions.size > 0 and minimumSpan is not None:
+
+        currentFirst = None
+        currentLast = None
+        result_span_values = pandas.DataFrame()
+        result_span_values['bool'] = np.zeros(exceptions.shape, bool)
+        result_span_values = result_span_values.set_index(exceptions.index)
+        current_result_span_values = pandas.DataFrame()
+        current_result_span_values['bool'] = np.zeros(exceptions.shape, bool)
+        current_result_span_values = current_result_span_values.set_index(exceptions.index)
+
+        for index, row in dataFrame.iterrows():
+            if index in exceptions.index:
+                current_result_span_values.loc[index]['bool'] = True
+                currentLast = index
+                if currentFirst is None:
+                    currentFirst = index
+                if int((currentLast - currentFirst).total_seconds() / 60) > int(minimumSpan):
+                    result_span_values['bool'] = result_span_values['bool'] | current_result_span_values['bool']
+            else:
+                current_result_span_values['bool'] = np.zeros(exceptions.shape, bool)
+                currentFirst = None
+                currentLast = None
+
+        return exceptions.loc[result_span_values['bool']]
+    else:
+        return exceptions
+
 def find_alerts(timelyMetric, analyticConfig, notebook=False):
 
-    if analyticConfig.groupByColumn is None:
-        return
 
     df = timelyMetric.getDataFrame()
 
     graphDF = TimelyMetric.pivot(df, timelyMetric.metric, groupByColumn=analyticConfig.groupByColumn)
 
-    if analyticConfig.sample is not None:
-        graphDF = TimelyMetric.resample(graphDF, analyticConfig.sample, how=analyticConfig.how)
-
     if analyticConfig.excludeColRegex is not None:
         graphDF = graphDF.select(lambda x : not (re.search(analyticConfig.excludeColRegex, x)), axis=1)
     if analyticConfig.includeColRegex is not None:
         graphDF = graphDF.select(lambda x : re.search(analyticConfig.includeColRegex, x), axis=1)
 
+    if analyticConfig.sample is not None:
+        graphDF = TimelyMetric.resample(graphDF, analyticConfig.sample, how=analyticConfig.how)
+
     graphDF_avg = pandas.DataFrame(graphDF, copy=True)
 
     combined = pandas.DataFrame()
 
+    now = Timestamp.now()
+
     seriesConfig = {}
     for i in graphDF_avg.columns:
         col = str(i)
 
-        result = True
+        any_conditions_values = False
+        result_values = np.ones(graphDF[col].shape, bool)
         if analyticConfig.orCondition:
-            result = False
+            result_values = np.zeros(graphDF[col].shape, bool)
+
+        any_conditions_average = False
+        result_average = np.ones(graphDF_avg[col].shape, bool)
+        if analyticConfig.orCondition:
+            result_average = np.zeros(graphDF_avg[col].shape, bool)
 
         if analyticConfig.min_threshold is not None:
             currCondition = graphDF[col].astype(float) < analyticConfig.min_threshold
-            result = addCondition(analyticConfig.orCondition, result, currCondition)
+            result_values = addCondition(analyticConfig.orCondition, result_values, currCondition)
+            any_conditions_values = True
 
         if analyticConfig.max_threshold is not None:
             currCondition = graphDF[col].astype(float) > analyticConfig.max_threshold
-            result = addCondition(analyticConfig.orCondition, result, currCondition)
+            result_values = addCondition(analyticConfig.orCondition, result_values, currCondition)
+            any_conditions_values = True
 
-        graphDF_avg = TimelyMetric.rolling_average(graphDF_avg, str(i), rolling_average=analyticConfig.rolling_average)
-        if (analyticConfig.alert_percentage is not None) and (analyticConfig.rolling_average is not None):
-            if analyticConfig.alert_percentage > 0:
-                multiple = 1.0 + (float(abs(analyticConfig.alert_percentage)) / float(100))
-                currCondition = graphDF[col].astype(float) > (graphDF_avg[col].astype(float) * multiple)
-                result = addCondition(analyticConfig.orCondition, result, currCondition)
-            if analyticConfig.alert_percentage < 0:
-                multiple = 1.0 - (float(abs(analyticConfig.alert_percentage)) / float(100))
-                if multiple > 0:
-                    currCondition = graphDF[col].astype(float) < (graphDF_avg[col].astype(float) * multiple)
-                    result = addCondition(analyticConfig.orCondition, result, currCondition)
+        if analyticConfig.rolling_average_samples is not None:
+            graphDF_avg = TimelyMetric.rolling_average(graphDF_avg, col, rolling_average=analyticConfig.rolling_average_samples)
+            if analyticConfig.alert_percentage is not None:
+                if analyticConfig.alert_percentage > 0:
+                    multiple = 1.0 + (float(abs(analyticConfig.alert_percentage)) / float(100))
+                    currCondition = graphDF[col].astype(float) > (graphDF_avg[col].astype(float) * multiple)
+                    result_values = addCondition(analyticConfig.orCondition, result_values, currCondition)
+                    any_conditions_values = True
+                if analyticConfig.alert_percentage < 0:
+                    multiple = 1.0 - (float(abs(analyticConfig.alert_percentage)) / float(100))
+                    if multiple > 0:
+                        currCondition = graphDF[col].astype(float) < (graphDF_avg[col].astype(float) * multiple)
+                        result_values = addCondition(analyticConfig.orCondition, result_values, currCondition)
+                        any_conditions_values = True
 
-        exceptional = graphDF.loc[result, col]
-        if (analyticConfig.display.lower() == "all") or (analyticConfig.display.lower() == "alerts" and exceptional.size > 0):
+            if analyticConfig.average_min_threshold is not None:
+                currCondition = graphDF_avg[col].astype(float) < analyticConfig.average_min_threshold
+                result_average = addCondition(analyticConfig.orCondition, result_average, currCondition)
+                any_conditions_average = True
+            if analyticConfig.average_max_threshold is not None:
+                currCondition = graphDF_avg[col].astype(float) > analyticConfig.average_max_threshold
+                result_average = addCondition(analyticConfig.orCondition, result_average, currCondition)
+                any_conditions_average = True
+
+        # if orCondition is AND and no exceptional conditions have been found, then result_values will be all True
+        if any_conditions_values == False:
+            result_values = np.zeros(graphDF[col].shape, bool)
+        exceptional_values = graphDF.loc[result_values, col]
+
+        # if orCondition is AND and no exceptional conditions have been found, then result_average will be all True
+        if any_conditions_average == False:
+            result_average = np.zeros(graphDF_avg[col].shape, bool)
+        exceptional_average = graphDF_avg.loc[result_average, col]
+
+        # only evaluate the last analyticConfig.last_alert_minutes if set
+        if analyticConfig.last_alert_minutes is not None:
+            recentEnoughBegin = now - timedelta(minutes=analyticConfig.last_alert_minutes)
+            exceptional_values = exceptional_values.ix[recentEnoughBegin:now]
+            exceptional_average = exceptional_average.ix[recentEnoughBegin:now]
+
+        # only keep alerts that are in consecutive periods of length analyticConfig.min_alert_minutes
+        exceptional_values = keepConsecutiveAlerts(graphDF, exceptional_values, analyticConfig.min_alert_minutes)
+        exceptional_average = keepConsecutiveAlerts(graphDF_avg, exceptional_average, analyticConfig.min_alert_minutes)
+
+        anyValueExceptions = exceptional_values.size > 0
+        anyAverageExceptions = exceptional_average.size > 0
+
+        if (analyticConfig.display.lower() == "all") or (analyticConfig.display.lower() == "alerts" and anyValueExceptions):
             combined[col] = graphDF[col]
 
-        if (analyticConfig.display.lower() == "all") or (analyticConfig.display.lower() == "alerts" and exceptional.size > 0 and analyticConfig.alert_percentage is not None and analyticConfig.rolling_average is not None):
-            combined[col+'_avg'] = graphDF_avg[col]
+        if analyticConfig.rolling_average_samples is not None:
+            if (analyticConfig.display.lower() == "all") or (analyticConfig.display.lower() == "alerts" and (anyAverageExceptions or analyticConfig.alert_percentage is not None)):
+                combined[col+'_avg'] = graphDF_avg[col]
 
-        if (exceptional.size > 0):
-            combined[col+'_warn'] = exceptional.dropna()
-            seriesConfig[col+'_warn'] = {
+        if ((analyticConfig.display.lower() == "all") or (analyticConfig.display.lower() == "alerts" and anyValueExceptions)):
+            combined[col + '_warn'] = exceptional_values.dropna()
+
+            seriesConfig[col + '_warn'] = {
                 "mode" : "markers",
                 "marker" : {
                     "symbol" : "hash-open",
@@ -93,13 +170,32 @@ def find_alerts(timelyMetric, analyticConfig, notebook=False):
                 }
             }
 
+        if ((analyticConfig.display.lower() == "all") or (analyticConfig.display.lower() == "alerts" and anyAverageExceptions)):
+            combined[col + '_avg_warn'] = exceptional_average.dropna()
 
+            seriesConfig[col + '_avg_warn'] = {
+                "mode" : "markers",
+                "marker" : {
+                    "symbol" : "hash-open",
+                    "color" : "red"
+                }
+            }
 
     timelyAlert = None
     if not combined.empty:
-        combined = TimelyMetric.unpivot(combined, timelyMetric.metric, groupByColumn=analyticConfig.groupByColumn)
+        alertAnalyticConfig = TimelyAnalyticConfiguration(analyticConfig)
+        if alertAnalyticConfig.groupByColumn is None:
+            alertAnalyticConfig.groupByColumn = timelyMetric.metric + "_obs"
+        combined = TimelyMetric.unpivot(combined, timelyMetric.metric, groupByColumn=alertAnalyticConfig.groupByColumn)
         combined = combined.sort_index()
+        combined['date'] = combined.index.values
         combined = combined.sort_values(['date', analyticConfig.groupByColumn])
-        timelyAlert = TimelyAlert(timelyMetric, combined, seriesConfig, analyticConfig, notebook)
+        combined = combined.drop(['date'], 1)
+        combined = combined.dropna()
+        combined = DataOperations.ensureMinSeriesLength(combined, alertAnalyticConfig.groupByColumn)
+
+        message = DataOperations.getTitle(timelyMetric, analyticConfig, separator=', ')
+
+        timelyAlert = TimelyAlert(timelyMetric, combined, message, seriesConfig, alertAnalyticConfig, notebook)
 
     return timelyAlert

client/src/main/python/TimelyAnalyticConfiguration.py

@@ -1,4 +1,4 @@
-
+import pandas
 
 
 class TimelyAnalyticConfiguration():
@@ -6,20 +6,75 @@ class TimelyAnalyticConfiguration():
 
     def __init__(self, analyticConfig):
 
-        self.groupByColumn = analyticConfig.get('groupByColumn', None)
-        self.includeColRegex = analyticConfig.get('includeColRegex', None)
-        self.excludeColRegex = analyticConfig.get('excludeColRegex', None)
-        self.sample = analyticConfig.get('sample', None)
-        self.how = analyticConfig.get('how', 'mean')
-        self.rolling_average = analyticConfig.get('rolling_average', None)
-        self.min_threshold = analyticConfig.get('min_threshold', None)
-        self.max_threshold = analyticConfig.get('max_threshold', None)
-        self.alert_percentage = analyticConfig.get('alert_percentage', None)
-        boolean = analyticConfig.get('boolean', 'or')
-        self.orCondition = boolean == 'or' or boolean == 'OR'
-        # alerts or all
-        self.display = analyticConfig.get('display', 'alerts')
-        self.send_alerts_to = analyticConfig.get('send_alerts_to', [])
-        self.output_dir = analyticConfig.get('output_dir', '/tmp')
+        if isinstance(analyticConfig, dict):
+            self.groupByColumn = analyticConfig.get('groupByColumn', None)
+            self.includeColRegex = analyticConfig.get('includeColRegex', None)
+            self.excludeColRegex = analyticConfig.get('excludeColRegex', None)
+            self.sample_period = analyticConfig.get('sample', None)
+            self.how = analyticConfig.get('how', 'mean')
+            self.rolling_average_period = analyticConfig.get('rolling_average_period', None)
+            self.min_threshold = analyticConfig.get('min_threshold', None)
+            self.average_min_threshold = analyticConfig.get('average_min_threshold', None)
+            self.max_threshold = analyticConfig.get('max_threshold', None)
+            self.average_max_threshold = analyticConfig.get('average_max_threshold', None)
+            self.alert_percentage = analyticConfig.get('alert_percentage', None)
+            self.min_alert_period = analyticConfig.get('min_alert_period', None)
+            boolean = analyticConfig.get('boolean', 'or')
+            self.orCondition = boolean == 'or' or boolean == 'OR'
+            # alerts or all
+            self.display = analyticConfig.get('display', 'alerts')
+            self.send_alerts_to = analyticConfig.get('send_alerts_to', [])
+            self.output_dir = analyticConfig.get('output_dir', '/tmp')
+            self.last_alert = analyticConfig.get('last_alert', None)
+            self.system_name = analyticConfig.get('system_name', None)
 
+            self.sample = None
+            self.sample_minutes = None
+            if self.sample_period is not None:
+                td = pandas.to_timedelta(self.sample_period)
+                self.sample_minutes = int(td.total_seconds() / 60)
+                self.sample = str(self.sample_minutes) + 'min'
 
+            self.rolling_average_samples = None
+            self.rolling_average_minutes = None
+            if (self.rolling_average_period is not None) and (self.sample_minutes is not None):
+                td = pandas.to_timedelta(self.rolling_average_period)
+                self.rolling_average_minutes = int(td.total_seconds() / 60)
+                self.rolling_average_samples = int(self.rolling_average_minutes / self.sample_minutes)
+
+            self.min_alert_minutes = None
+            if self.min_alert_period is not None:
+                td = pandas.to_timedelta(self.min_alert_period)
+                self.min_alert_minutes = int(td.total_seconds() / 60)
+
+            self.last_alert_minutes = None
+            if self.last_alert is not None:
+                td = pandas.to_timedelta(self.last_alert)
+                self.last_alert_minutes = int(td.total_seconds() / 60)
+
+        elif isinstance(analyticConfig, TimelyAnalyticConfiguration):
+            self.groupByColumn = analyticConfig.groupByColumn
+            self.includeColRegex = analyticConfig.includeColRegex
+            self.excludeColRegex = analyticConfig.excludeColRegex
+            self.sample_period = analyticConfig.sample_period
+            self.sample_minutes = analyticConfig.sample_minutes
+            self.sample = analyticConfig.sample
+            self.how = analyticConfig.how
+            self.rolling_average_period = analyticConfig.rolling_average_period
+            self.rolling_average_samples = analyticConfig.rolling_average_samples
+            self.rolling_average_minutes = analyticConfig.rolling_average_minutes
+            self.min_threshold = analyticConfig.min_threshold
+            self.average_min_threshold = analyticConfig.average_min_threshold
+            self.max_threshold = analyticConfig.max_threshold
+            self.average_max_threshold = analyticConfig.average_max_threshold
+            self.alert_percentage = analyticConfig.alert_percentage
+            self.min_alert_period = analyticConfig.min_alert_period
+            self.min_alert_minutes = analyticConfig.min_alert_minutes
+            self.orCondition = analyticConfig.orCondition
+            # alerts or all
+            self.display = analyticConfig.display
+            self.send_alerts_to = analyticConfig.send_alerts_to
+            self.output_dir = analyticConfig.output_dir
+            self.last_alert = analyticConfig.last_alert
+            self.last_alert_minutes = analyticConfig.last_alert_minutes
+            self.system_name = analyticConfig.system_name

client/src/main/python/TimelyMetric.py

@@ -73,7 +73,7 @@ class TimelyMetric(TimelyWebSocketClient):
     client = None
     endtime = None
 
-    def __init__(self, hostport, metric, tags, beginStr, endStr, hours, sample):
+    def __init__(self, hostport, metric, tags, beginStr, endStr, period, sample):
         self.series = pandas.Series()
         self.metric = metric
         self.tags = tags
@@ -82,7 +82,7 @@ class TimelyMetric(TimelyWebSocketClient):
         self.dataFrame = None
         self.data = []
 
-        timeDateRange = TimeDateRange(beginStr, endStr, hours)
+        timeDateRange = TimeDateRange(beginStr, endStr, period)
 
         TimelyWebSocketClient.__init__(self, hostport, metric, tags, timeDateRange.getBeginMs(), timeDateRange.getEndMs())
 
@@ -135,8 +135,9 @@ class TimelyMetric(TimelyWebSocketClient):
         global client
 
         self.dataFrame = pandas.DataFrame(self.data)
-        self.dataFrame = self.dataFrame.set_index(self.dataFrame['date'].apply(lambda x: pandas.DatetimeIndex([x])))
-
+        if len(self.dataFrame) > 0:
+            self.dataFrame['date'] = pandas.DatetimeIndex(self.dataFrame['date'])
+            self.dataFrame = self.dataFrame.set_index('date')
 
         self.close()
         ioloop.IOLoop.current(instance=False).stop()
@@ -146,18 +147,22 @@ class TimelyMetric(TimelyWebSocketClient):
 
         return self.dataFrame;
 
+    def setDataFrame(self, dataFrame):
+
+        self.dataFrame = dataFrame
+
     def print_debug(self):
         if self.debug:
             print(self.dataFrame)
 
     def graph(self, groupByColumn=None):
-        graph(self.dataFrame, self.metric, sample=self.sample, how=self.how, groupByColumn=groupByColumn)
+        return graph(self.dataFrame, self, sample=self.sample, how=self.how, groupByColumn=groupByColumn)
 
 
 
 def main():
 
-    hours = None
+    period = None
     beginStr = None
     endStr = None
 
@@ -168,18 +173,18 @@ def main():
     groupByColumn = None
     try:
         argv = sys.argv
-        options, remainder = getopt.getopt(argv[1:], 'h', ['metric=', 'tags=', 'hours=', 'groupByColumn=', 'begin=', 'end=', 'sample=', 'how=', 'hostport='])
+        options, remainder = getopt.getopt(argv[1:], 'h', ['metric=', 'tags=', 'period=', 'groupByColumn=', 'begin=', 'end=', 'sample=', 'how=', 'hostport='])
     except getopt.GetoptError:
-        print('TimelyMetric.py ---hostport=<host:port> --metric=<metric> --tags=<tag1=val1,tag2=val2> --hours=<hours>, --groupByColumn=<groupByColumn>, --sample=<sample_period> --how=<mean|min|max>')
+        print('TimelyMetric.py ---hostport=<host:port> --metric=<metric> --tags=<tag1=val1,tag2=val2> --period=<period>, --groupByColumn=<groupByColumn>, --sample=<sample_period> --how=<mean|min|max>')
         sys.exit(2)
     for opt, arg in options:
         if opt == '-h':
-            print('TimelyMetric.py --hostport=<host:port> --metric=<metric> --tags=<tag1=val1,tag2=val2> --hours=<hours>, --groupByColumn=<groupByColumn>, --sample=<sample_period> --how=<mean|min|max>')
+            print('TimelyMetric.py --hostport=<host:port> --metric=<metric> --tags=<tag1=val1,tag2=val2> --period=<period>, --groupByColumn=<groupByColumn>, --sample=<sample_period> --how=<mean|min|max>')
             sys.exit()
         elif opt in ("--metric"):
             metric = arg
-        elif opt in ("--hours"):
-            hours = int(arg)
+        elif opt in ("--period"):
+            period = arg
         elif opt in ("--begin"):
             beginStr = arg
         elif opt in ("--end"):
@@ -194,13 +199,13 @@ def main():
             hostport = arg
     try:
 
-        timelyMetric = TimelyMetric(hostport, metric, tags, beginStr, endStr, hours, sample).fetch()
+        timelyMetric = TimelyMetric(hostport, metric, tags, beginStr, endStr, period, sample).fetch()
         dataFrame = timelyMetric.getDataFrame()
 
         if dataFrame is not None:
             dataFrame = resample(dataFrame, metric, sample, how)
             dataFrame = pivot(dataFrame, metric, groupByColumn=groupByColumn)
-            graph(dataFrame, metric, sample=sample, groupByColumn=groupByColumn, graphConfig={}, notebook=False)
+            graph(dataFrame, timelyMetric, sample=sample, groupByColumn=groupByColumn, graphConfig={}, notebook=False)
 
     except TimeDateError as e:
         print(e.message)

client/src/main/python/sampleAnalytic.py

@@ -1,23 +1,45 @@
 import TimelyMetric
 import TimelyAnalytic
+import DataOperations
+import os
+from TimelyAnalyticConfiguration import TimelyAnalyticConfiguration
 
 hostport = "127.0.0.1:4244"
 timelyMetric = TimelyMetric.TimelyMetric(hostport, '', None, None, None, 48, None).fetch()
-TimelyAnalytic.find_alerts(timelyMetric, TimelyAnalyticConfiguration({
+
+analyticConfig = TimelyAnalyticConfiguration({
+    'system_name' : 'TestSystem',
     'includeColRegex' : None,
     'excludeColRegex' : None,
     'groupByColumn' : 'instance',
-    'sample' : '10min',
+    'sample' : '10 minutes',
     'how' : 'mean',
-    'rolling_average' : 12,
+    'rolling_average_period' : '12 hours',
     'min_threshold' : None,
+    'average_min_threshold' : None,
     'max_threshold' : None,
+    'average_max_threshold' : None,
     'alert_percentage' : 25,
-    'boolean' : 'and'
+    'boolean' : 'and',
+    'min_alert_period' : '5 minutes',
+    'last_alert' : '1 hour',
     'display' : 'all',
     'output_dir' : '/path/to/output'
-}))
+})
+
+alert = TimelyAnalytic.find_alerts(timelyMetric, analyticConfig)
 
 if alert is not None:
-    alert.graph()
+    # write graph to file
+    oldmask = os.umask(022)
+    file = alert.graph(type='html')
+    os.umask(oldmask)
+
+    text = DataOperations.getTitle(timelyMetric, analyticConfig)
+
+    # send email with graph attached
+    alert.email("", "", text, text, [file])
+
+    # log to syslog
+    alert.log(text)
 

client/src/test/java/timely/model/TagListParserTest.java

@@ -20,15 +20,6 @@ public class TagListParserTest {
         Assert.assertEquals(new Tag("tag2", "value2"), tags.get(1));
     }
 
-    @Test
-    public void testListParseEncoded() {
-        String value = "tag%2C%3D%31=value%2C%3D%31,tag%2C%3D%32=value%2C%3D%32";
-        List<Tag> tags = new TagListParser().parse(value);
-        Assert.assertEquals(2, tags.size());
-        Assert.assertEquals(new Tag("tag,=1", "value,=1"), tags.get(0));
-        Assert.assertEquals(new Tag("tag,=2", "value,=2"), tags.get(1));
-    }
-
     @Test
     public void testListCombine() {
         List<Tag> tags = new ArrayList<>();
@@ -38,15 +29,6 @@ public class TagListParserTest {
         Assert.assertEquals("tag1=value1,tag2=value2", combined);
     }
 
-    @Test
-    public void testListCombineEncoded() {
-        List<Tag> tags = new ArrayList<>();
-        tags.add(new Tag("tag,=1", "value,=1"));
-        tags.add(new Tag("tag,=2", "value,=2"));
-        String combined = new TagListParser().combine(tags);
-        Assert.assertEquals("tag%2C%3D1=value%2C%3D1,tag%2C%3D2=value%2C%3D2", combined);
-    }
-
     @Test
     public void testListCombineMap() {
         Map<String, String> map = new TreeMap<>();

collectd-nsq-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <artifactId>collectd-nsq-plugin</artifactId>
     <dependencies>

collectd-plugin-parent/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <artifactId>collectd-plugin-parent</artifactId>
     <dependencies>

collectd-plugin-parent/src/main/java/timely/collectd/plugin/CollectDPluginParent.java

@@ -17,6 +17,7 @@ public abstract class CollectDPluginParent {
     private static final Pattern HADOOP_STATSD_PATTERN = Pattern
             .compile("([\\w-_]+)\\.([\\w-_]+)\\.([\\w-_]+)\\.([\\w-_]+)");
     private static final String INSTANCE = " instance=";
+    private static final String NAME = " name=";
     private static final String SAMPLE = " sample=";
     private static final String CODE = " code=";
     private static final String PERIOD = ".";
@@ -170,17 +171,27 @@ public abstract class CollectDPluginParent {
         } else if (vl.getPlugin().equals("snmp")) {
             metric.append("sys.snmp.").append(vl.getType());
             tags.append(INSTANCE).append(vl.getTypeInstance().replaceAll(" ", "_"));
+        } else if (vl.getPlugin().equals("GenericJMX")) {
+            metric.append("sys.").append(vl.getPlugin()).append(PERIOD).append(vl.getType()).append(PERIOD)
+                    .append(vl.getTypeInstance());
+            String[] pluginInstanceSplit = vl.getPluginInstance().split("-");
+            if (pluginInstanceSplit.length > 0) {
+                tags.append(INSTANCE).append(pluginInstanceSplit[0].replaceAll(" ", "_"));
+            }
+            if (pluginInstanceSplit.length > 1) {
+                tags.append(NAME).append(pluginInstanceSplit[1].replaceAll(" ", "_"));
+            }
         } else if (notEmpty(vl.getTypeInstance()) && notEmpty(vl.getType()) && notEmpty(vl.getPluginInstance())
                 && notEmpty(vl.getPlugin())) {
             metric.append("sys.").append(vl.getPlugin()).append(PERIOD).append(vl.getType()).append(PERIOD)
                     .append(vl.getTypeInstance());
-            tags.append(INSTANCE).append(vl.getPluginInstance());
+            tags.append(INSTANCE).append(vl.getPluginInstance().replaceAll(" ", "_"));
         } else if (notEmpty(vl.getTypeInstance()) && notEmpty(vl.getType()) && notEmpty(vl.getPlugin())) {
             metric.append("sys.").append(vl.getPlugin()).append(PERIOD).append(vl.getType()).append(PERIOD)
                     .append(vl.getTypeInstance());
         } else if (notEmpty(vl.getType()) && notEmpty(vl.getPluginInstance()) && notEmpty(vl.getPlugin())) {
             metric.append("sys.").append(vl.getPlugin()).append(PERIOD).append(vl.getType());
-            tags.append(INSTANCE).append(vl.getPluginInstance());
+            tags.append(INSTANCE).append(vl.getPluginInstance().replaceAll(" ", "_"));
         } else if (notEmpty(vl.getType()) && notEmpty(vl.getPlugin())) {
             metric.append("sys.").append(vl.getPlugin()).append(PERIOD).append(vl.getType());
         } else {

collectd-timely-plugin/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <artifactId>collectd-timely-plugin</artifactId>
     <dependencies>

common/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
   </parent>
   <artifactId>timely-common</artifactId>
   <dependencies>

grafana/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <build>
         <plugins>

grafana/timely-app/dist/datasource/dashboards/AccumuloOverview.json

@@ -2,6 +2,8 @@
   "__inputs": [
     {
       "name": "DS_TIMELY",
+      "label": "Timely",
+      "description": "",
       "type": "datasource",
       "pluginId": "timely-datasource",
       "pluginName": "Timely"
@@ -9,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "singlestat",
-      "name": "Singlestat",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
     },
     {
       "type": "panel",
@@ -21,10 +23,10 @@
       "version": ""
     },
     {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.0"
+      "type": "panel",
+      "id": "singlestat",
+      "name": "Singlestat",
+      "version": ""
     },
     {
       "type": "datasource",
@@ -33,18 +35,18 @@
       "version": "1.0.0"
     }
   ],
-  "id": null,
-  "title": "Accumulo Overview",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100",
       "panels": [
         {
@@ -71,7 +73,6 @@
           "hideTimeOverride": true,
           "id": 2,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -105,6 +106,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "count",
@@ -161,7 +163,6 @@
           "hideTimeOverride": true,
           "id": 3,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -195,6 +196,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -251,7 +253,6 @@
           "hideTimeOverride": true,
           "id": 4,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -285,6 +286,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -341,7 +343,6 @@
           "hideTimeOverride": true,
           "id": 5,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -375,6 +376,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -408,28 +410,28 @@
           "valueName": "avg"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -448,6 +450,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
@@ -481,6 +484,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Minor Compactions",
@@ -492,7 +496,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +524,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 7,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -546,6 +550,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
@@ -579,6 +584,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Major Compactions",
@@ -590,7 +596,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -614,18 +624,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 12,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -644,12 +650,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "counterMax": "",
               "currentTagKey": "",
@@ -668,6 +675,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Thrift Ops",
@@ -679,7 +687,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -703,18 +715,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 13,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -733,12 +741,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "counterMax": "",
               "currentTagKey": "",
@@ -757,6 +766,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Thrift Avg Execution Time",
@@ -768,7 +778,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -790,28 +804,28 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 8,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -830,12 +844,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -852,6 +867,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Ops",
@@ -863,7 +879,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -887,18 +907,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -917,12 +933,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -939,6 +956,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Write Time Avg",
@@ -950,7 +968,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -974,18 +996,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 18,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1004,12 +1022,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1026,6 +1045,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Write Time Min",
@@ -1037,7 +1057,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1061,18 +1085,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 19,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1091,12 +1111,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1113,6 +1134,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Write Time Max",
@@ -1124,7 +1146,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1146,28 +1172,28 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 11,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1186,12 +1212,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1208,6 +1235,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Mutation Array Num Ops",
@@ -1219,7 +1247,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1243,18 +1275,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 10,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1273,12 +1301,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1293,6 +1322,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Mutation Array Avg Size",
@@ -1304,7 +1334,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1328,18 +1362,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 17,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1358,12 +1388,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1378,6 +1409,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Mutation Array Max Size",
@@ -1389,7 +1421,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1411,28 +1447,28 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 14,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1451,12 +1487,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1472,6 +1509,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Zookeeper Packets Received",
@@ -1483,7 +1521,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1507,18 +1549,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 15,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1537,12 +1575,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1558,6 +1597,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Zookeeper Packets Sent",
@@ -1569,7 +1609,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1593,18 +1637,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 16,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1623,12 +1663,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1644,6 +1685,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Zookeeper Average Latency",
@@ -1655,7 +1697,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1677,9 +1723,20 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now-1h",
     "to": "now"
@@ -1709,14 +1766,7 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "schemaVersion": 12,
-  "version": 19,
-  "links": [],
-  "gnetId": null
-}
+  "timezone": "browser",
+  "title": "Accumulo Overview",
+  "version": 4
+}

grafana/timely-app/dist/datasource/dashboards/TimelyStatus.json

@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "singlestat",
-      "name": "Singlestat",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
     },
     {
       "type": "panel",
@@ -23,10 +23,10 @@
       "version": ""
     },
     {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.0"
+      "type": "panel",
+      "id": "singlestat",
+      "name": "Singlestat",
+      "version": ""
     },
     {
       "type": "datasource",
@@ -35,18 +35,19 @@
       "version": "1.0.0"
     }
   ],
-  "id": null,
-  "title": "Timely Status",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": "1m",
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "150",
       "panels": [
         {
@@ -73,7 +74,6 @@
           "hideTimeOverride": true,
           "id": 8,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -107,9 +107,10 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
-              "aggregator": "count",
+              "aggregator": "sum",
               "downsampleAggregator": "sum",
               "downsampleFillPolicy": "none",
               "downsampleInterval": "1m",
@@ -157,7 +158,6 @@
           "hideTimeOverride": true,
           "id": 9,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -191,6 +191,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "count",
@@ -198,8 +199,8 @@
               "currentTagValue": "",
               "downsampleAggregator": "count",
               "downsampleFillPolicy": "none",
-              "downsampleInterval": "1m",
-              "metric": "sys.collectd.queue_length",
+              "downsampleInterval": "1s",
+              "metric": "sys.collectd.cache_size",
               "refId": "A",
               "tags": {}
             }
@@ -243,7 +244,6 @@
           "hideTimeOverride": true,
           "id": 10,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -277,6 +277,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -306,28 +307,28 @@
           "valueName": "avg"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 3,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -346,7 +347,8 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 4,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -364,6 +366,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Metrics Inserted",
@@ -375,7 +378,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -399,18 +406,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 4,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -429,7 +432,8 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 4,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -447,6 +451,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Meta Inserted",
@@ -458,7 +463,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -482,18 +491,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -512,7 +517,8 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 4,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -530,6 +536,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Metrics Received",
@@ -541,7 +548,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -561,30 +572,18 @@
               "show": true
             }
           ]
-        }
-      ],
-      "title": "New row"
-    },
-    {
-      "collapse": false,
-      "editable": true,
-      "height": "250px",
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 7,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -603,12 +602,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 6,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -622,6 +622,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "CollectD Cache Sizes",
@@ -633,91 +634,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "${DS_TIMELY}",
-          "editable": true,
-          "error": false,
-          "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 11,
-          "isNew": true,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
+            "buckets": null,
+            "mode": "time",
+            "name": null,
             "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "aggregator": "sum",
-              "alias": "$tag_host",
-              "currentTagKey": "",
-              "currentTagValue": "",
-              "downsampleAggregator": "sum",
-              "downsampleFillPolicy": "none",
-              "downsampleInterval": "1m",
-              "metric": "sys.collectd.queue_length",
-              "refId": "A",
-              "tags": {
-                "host": ".*"
-              }
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "CollectD Queue Length",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "show": true
+            "values": []
           },
           "yaxes": [
             {
@@ -739,9 +660,20 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now-1h",
     "to": "now"
@@ -772,15 +704,7 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": "1m",
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Timely Status",
+  "version": 4
 }

grafana/timely-app/dist/datasource/dashboards/standalone_test.json

@@ -1,40 +1,59 @@
 {
   "__inputs": [
     {
-      "name": "DS_NAME",
+      "name": "DS_TIMELY-STANDALONE",
+      "label": "Timely-Standalone",
+      "description": "",
       "type": "datasource",
-      "pluginId": "timely-datasource"
+      "pluginId": "timely-datasource",
+      "pluginName": "Timely"
     }
   ],
-  "id": null,
-  "title": "Timely Standalone Demo",
-  "originalTitle": "Timely Standalone Demo",
-  "tags": ["imported"],
-  "style": "dark",
-  "timezone": "browser",
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "timely-datasource",
+      "name": "Timely",
+      "version": "1.0.0"
+    }
+  ],
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": "5s",
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 1,
           "legend": {
             "alignAsTable": true,
@@ -56,6 +75,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -93,17 +113,23 @@
               "refId": "C"
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Status",
           "tooltip": {
             "msResolution": true,
             "shared": false,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -124,28 +150,28 @@
           ]
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": false,
@@ -166,12 +192,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -186,17 +213,23 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "CPU User by Host",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -220,18 +253,14 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 3,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": false,
@@ -252,12 +281,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "none",
               "alias": "$tag_rack",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -272,17 +302,23 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "CPU User by Rack",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -306,18 +342,14 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": false,
@@ -338,12 +370,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "none",
               "alias": "",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -356,17 +389,23 @@
               "tags": {}
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Cumulative CPU",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -388,9 +427,22 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "imported"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now-15m",
     "to": "now"
@@ -421,14 +473,7 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": "5s",
-  "schemaVersion": 12,
-  "version": 1,
-  "links": []
-}
+  "timezone": "browser",
+  "title": "Timely Standalone Demo",
+  "version": 6
+}

grafana/timely-app/dist/datasource/datasource.js

@@ -408,7 +408,7 @@ System.register(['lodash', 'angular', '../../../app/core/utils/datemath'], funct
             var tagData = [];
 
             if (!_.isEmpty(md.tags)) {
-              _.each(_.pairs(md.tags), function (tag) {
+              _.each(_.toPairs(md.tags), function (tag) {
                 if (_.has(groupByTags, tag[0])) {
                   tagData.push(tag[0] + "=" + tag[1]);
                 }
@@ -493,7 +493,7 @@ System.register(['lodash', 'angular', '../../../app/core/utils/datemath'], funct
                 if (target.filters && target.filters.length > 0) {
                   return target.metric === metricData.metric;
                 } else {
-                  return target.metric === metricData.metric && _.all(target.tags, function (tagV, tagK) {
+                  return target.metric === metricData.metric && _.every(target.tags, function (tagV, tagK) {
                     interpolatedTagValue = this.templateSrv.replace(tagV, options.scopedVars, 'pipe');
                     return metricData.tags[tagK] === interpolatedTagValue || interpolatedTagValue === "*";
                   }.bind(this));

grafana/timely-app/dist/datasource/datasource.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/datasource/datasource.js"],"names":["_","angular","dateMath","TimelyDatasource","instanceSettings","$q","backendSrv","templateSrv","contextSrv","type","name","jsonData","httpsPort","timelyHost","wsPort","basicAuths","url","_makeHttpsUrl","withCredentials","basicAuth","supportMetrics","tagKeys","aggregatorsPromise","filterTypesPromise","options","start","convertToTSDBTime","rangeRaw","from","end","to","qs","each","targets","target","metric","push","convertTargetToQuery","bind","queries","compact","isEmpty","d","defer","resolve","data","promise","groupByTags","query","filters","length","val","tagk","tags","key","performTimeSeriesQuery","then","response","metricToTargetMapping","mapMetricsToTargets","result","map","metricData","index","_saveTagKeys","transformMetricData","datasourceRequest","method","status","message","title","eventList","aggregator","annotation","results","annotationObject","annotations","isGlobal","globalAnnotations","event","description","time","Math","floor","startTime","text","notes","when","interpolated","replace","err","reject","responseTransform","value","metrics_regex","tag_names_regex","tag_values_regex","tag_names_suggest_regex","tag_values_suggest_regex","metrics_query","match","_performSuggestQuery","tag_names_query","_performMetricKeyLookup","tag_values_query","_performMetricKeyValueLookup","tag_names_suggest_query","tag_values_suggest_query","msResolution","reqBody","showQuery","_addCredentialOptions","headers","Object","keys","aggregateTags","tag","_get","q","max","keysArray","split","trim","keysQuery","splice","join","m","limit","tagvs","r","indexOf","tagks","tagv","relativeUrl","params","isArray","sort","md","metricLabel","createMetricLabel","dps","v","k","datapoints","alias","scopedVars","clone","label","tagData","pairs","has","hide","shouldComputeRate","rate","rateOptions","counter","isCounter","counterMax","parseInt","counterResetValue","resetValue","disableDownsampling","interval","downsampleInterval","parseFloat","downsample","downsampleAggregator","downsampleFillPolicy","copy","filter_key","filter","tag_key","metrics","interpolatedTagValue","findIndex","all","tagV","tagK","date","roundUp","parse","valueOf"],"mappings":";;;;;;;;;;;;;;;AAAOA,O;;AACAC,a;;AACKC,c;;;;;;;;;;;;;;;;;;;;;kCAECC,gB;;AAEX;AACA,kCAAYC,gBAAZ,EAA8BC,EAA9B,EAAkCC,UAAlC,EAA8CC,WAA9C,EAA2DC,UAA3D,EAAuE;AAAA;;AACrE,eAAKC,IAAL,GAAYL,iBAAiBK,IAA7B;AACA,eAAKC,IAAL,GAAYN,iBAAiBM,IAA7B;;AAEA,eAAKC,QAAL,GAAgBP,iBAAiBO,QAAjB,IAA6B,EAA7C;AACA,eAAKC,SAAL,GAAiBR,iBAAiBO,QAAjB,CAA0BC,SAA3C;AACA,eAAKC,UAAL,GAAkBT,iBAAiBO,QAAjB,CAA0BE,UAA5C;AACA,eAAKC,MAAL,GAAcV,iBAAiBO,QAAjB,CAA0BG,MAAxC;AACA,cAAI,CAACV,iBAAiBO,QAAjB,CAA0BI,UAA/B,EAA0C;AACxCX,6BAAiBO,QAAjB,CAA0BI,UAA1B,GAAuC,KAAvC;AACD;;AAED,eAAKC,GAAL,GAAW,KAAKC,aAAL,EAAX;AACA,eAAKC,eAAL,GAAuB,IAAvB;AACA,eAAKC,SAAL,GAAiB,KAAjB;;AAEA,eAAKC,cAAL,GAAsB,IAAtB;AACA,eAAKC,OAAL,GAAe,EAAf;;AAEA,eAAKhB,EAAL,GAAUA,EAAV;AACA,eAAKC,UAAL,GAAkBA,UAAlB;AACA,eAAKC,WAAL,GAAmBA,WAAnB;AACA,eAAKC,UAAL,GAAkBA,UAAlB;;AAEA,eAAKc,kBAAL,GAA0B,IAA1B;AACA,eAAKC,kBAAL,GAA0B,IAA1B;AAED;;AAED;;;;;gCACMC,O,EAAQ;AACZ,gBAAIC,QAAQ,KAAKC,iBAAL,CAAuBF,QAAQG,QAAR,CAAiBC,IAAxC,EAA8C,KAA9C,CAAZ;AACA,gBAAIC,MAAM,KAAKH,iBAAL,CAAuBF,QAAQG,QAAR,CAAiBG,EAAxC,EAA4C,IAA5C,CAAV;AACA,gBAAIC,KAAK,EAAT;;AAEA/B,cAAEgC,IAAF,CAAOR,QAAQS,OAAf,EAAwB,UAASC,MAAT,EAAiB;AACvC,kBAAI,CAACA,OAAOC,MAAZ,EAAoB;AAAE;AAAS;AAC/BJ,iBAAGK,IAAH,CAAQ,KAAKC,oBAAL,CAA0BH,MAA1B,EAAkCV,OAAlC,CAAR;AACD,aAHuB,CAGtBc,IAHsB,CAGjB,IAHiB,CAAxB;;AAKA,gBAAIC,UAAUvC,EAAEwC,OAAF,CAAUT,EAAV,CAAd;;AAEA;AACA,gBAAI/B,EAAEyC,OAAF,CAAUF,OAAV,CAAJ,EAAwB;AACtB,kBAAIG,IAAI,KAAKrC,EAAL,CAAQsC,KAAR,EAAR;AACAD,gBAAEE,OAAF,CAAU,EAAEC,MAAM,EAAR,EAAV;AACA,qBAAOH,EAAEI,OAAT;AACD;;AAED,gBAAIC,cAAc,EAAlB;AACA/C,cAAEgC,IAAF,CAAOO,OAAP,EAAgB,UAASS,KAAT,EAAgB;AAC9B,kBAAIA,MAAMC,OAAN,IAAiBD,MAAMC,OAAN,CAAcC,MAAd,GAAuB,CAA5C,EAA+C;AAC7ClD,kBAAEgC,IAAF,CAAOgB,MAAMC,OAAb,EAAsB,UAASE,GAAT,EAAc;AAClCJ,8BAAYI,IAAIC,IAAhB,IAAwB,IAAxB;AACD,iBAFD;AAGD,eAJD,MAIO;AACLpD,kBAAEgC,IAAF,CAAOgB,MAAMK,IAAb,EAAmB,UAASF,GAAT,EAAcG,GAAd,EAAmB;AACpCP,8BAAYO,GAAZ,IAAmB,IAAnB;AACD,iBAFD;AAGD;AACF,aAVD;;AAYA,mBAAO,KAAKC,sBAAL,CAA4BhB,OAA5B,EAAqCd,KAArC,EAA4CI,GAA5C,EAAiD2B,IAAjD,CAAsD,UAASC,QAAT,EAAmB;AAC9E,kBAAIC,wBAAwB,KAAKC,mBAAL,CAAyBF,SAASZ,IAAlC,EAAwCrB,OAAxC,CAA5B;AACA,kBAAIoC,SAAS5D,EAAE6D,GAAF,CAAMJ,SAASZ,IAAf,EAAqB,UAASiB,UAAT,EAAqBC,KAArB,EAA4B;AAC5DA,wBAAQL,sBAAsBK,KAAtB,CAAR;AACA,oBAAIA,UAAU,CAAC,CAAf,EAAkB;AAChBA,0BAAQ,CAAR;AACD;AACD,qBAAKC,YAAL,CAAkBF,UAAlB;;AAEA,uBAAO,KAAKG,mBAAL,CAAyBH,UAAzB,EAAqCf,WAArC,EAAkDvB,QAAQS,OAAR,CAAgB8B,KAAhB,CAAlD,EAA0EvC,OAA1E,CAAP;AACD,eARiC,CAQhCc,IARgC,CAQ3B,IAR2B,CAArB,CAAb;AASA,qBAAO,EAAEO,MAAMe,MAAR,EAAP;AACD,aAZ4D,CAY3DtB,IAZ2D,CAYtD,IAZsD,CAAtD,CAAP;AAaD;;;2CAGe;AACd,mBAAO,KAAKhC,UAAL,CAAgB4D,iBAAhB,CAAkC;AACvClD,mBAAK,KAAKA,GAAL,GAAW,UADuB;AAEvCmD,sBAAQ;AAF+B,aAAlC,EAGJX,IAHI,CAGC,oBAAY;AAClB,kBAAIC,SAASW,MAAT,KAAoB,GAAxB,EAA6B;AAC3B,uBAAO,EAAEA,QAAQ,SAAV,EAAqBC,SAAS,wBAA9B,EAAwDC,OAAO,SAA/D,EAAP;AACD;AALine truncated
+{"version":3,"sources":["../../src/datasource/datasource.js"],"names":["_","angular","dateMath","TimelyDatasource","instanceSettings","$q","backendSrv","templateSrv","contextSrv","type","name","jsonData","httpsPort","timelyHost","wsPort","basicAuths","url","_makeHttpsUrl","withCredentials","basicAuth","supportMetrics","tagKeys","aggregatorsPromise","filterTypesPromise","options","start","convertToTSDBTime","rangeRaw","from","end","to","qs","each","targets","target","metric","push","convertTargetToQuery","bind","queries","compact","isEmpty","d","defer","resolve","data","promise","groupByTags","query","filters","length","val","tagk","tags","key","performTimeSeriesQuery","then","response","metricToTargetMapping","mapMetricsToTargets","result","map","metricData","index","_saveTagKeys","transformMetricData","datasourceRequest","method","status","message","title","eventList","aggregator","annotation","results","annotationObject","annotations","isGlobal","globalAnnotations","event","description","time","Math","floor","startTime","text","notes","when","interpolated","replace","err","reject","responseTransform","value","metrics_regex","tag_names_regex","tag_values_regex","tag_names_suggest_regex","tag_values_suggest_regex","metrics_query","match","_performSuggestQuery","tag_names_query","_performMetricKeyLookup","tag_values_query","_performMetricKeyValueLookup","tag_names_suggest_query","tag_values_suggest_query","msResolution","reqBody","showQuery","_addCredentialOptions","headers","Object","keys","aggregateTags","tag","_get","q","max","keysArray","split","trim","keysQuery","splice","join","m","limit","tagvs","r","indexOf","tagks","tagv","relativeUrl","params","isArray","sort","md","metricLabel","createMetricLabel","dps","v","k","datapoints","alias","scopedVars","clone","label","tagData","toPairs","has","hide","shouldComputeRate","rate","rateOptions","counter","isCounter","counterMax","parseInt","counterResetValue","resetValue","disableDownsampling","interval","downsampleInterval","parseFloat","downsample","downsampleAggregator","downsampleFillPolicy","copy","filter_key","filter","tag_key","metrics","interpolatedTagValue","findIndex","every","tagV","tagK","date","roundUp","parse","valueOf"],"mappings":";;;;;;;;;;;;;;;AAAOA,O;;AACAC,a;;AACKC,c;;;;;;;;;;;;;;;;;;;;;kCAECC,gB;;AAEX;AACA,kCAAYC,gBAAZ,EAA8BC,EAA9B,EAAkCC,UAAlC,EAA8CC,WAA9C,EAA2DC,UAA3D,EAAuE;AAAA;;AACrE,eAAKC,IAAL,GAAYL,iBAAiBK,IAA7B;AACA,eAAKC,IAAL,GAAYN,iBAAiBM,IAA7B;;AAEA,eAAKC,QAAL,GAAgBP,iBAAiBO,QAAjB,IAA6B,EAA7C;AACA,eAAKC,SAAL,GAAiBR,iBAAiBO,QAAjB,CAA0BC,SAA3C;AACA,eAAKC,UAAL,GAAkBT,iBAAiBO,QAAjB,CAA0BE,UAA5C;AACA,eAAKC,MAAL,GAAcV,iBAAiBO,QAAjB,CAA0BG,MAAxC;AACA,cAAI,CAACV,iBAAiBO,QAAjB,CAA0BI,UAA/B,EAA0C;AACxCX,6BAAiBO,QAAjB,CAA0BI,UAA1B,GAAuC,KAAvC;AACD;;AAED,eAAKC,GAAL,GAAW,KAAKC,aAAL,EAAX;AACA,eAAKC,eAAL,GAAuB,IAAvB;AACA,eAAKC,SAAL,GAAiB,KAAjB;;AAEA,eAAKC,cAAL,GAAsB,IAAtB;AACA,eAAKC,OAAL,GAAe,EAAf;;AAEA,eAAKhB,EAAL,GAAUA,EAAV;AACA,eAAKC,UAAL,GAAkBA,UAAlB;AACA,eAAKC,WAAL,GAAmBA,WAAnB;AACA,eAAKC,UAAL,GAAkBA,UAAlB;;AAEA,eAAKc,kBAAL,GAA0B,IAA1B;AACA,eAAKC,kBAAL,GAA0B,IAA1B;AAED;;AAED;;;;;gCACMC,O,EAAQ;AACZ,gBAAIC,QAAQ,KAAKC,iBAAL,CAAuBF,QAAQG,QAAR,CAAiBC,IAAxC,EAA8C,KAA9C,CAAZ;AACA,gBAAIC,MAAM,KAAKH,iBAAL,CAAuBF,QAAQG,QAAR,CAAiBG,EAAxC,EAA4C,IAA5C,CAAV;AACA,gBAAIC,KAAK,EAAT;;AAEA/B,cAAEgC,IAAF,CAAOR,QAAQS,OAAf,EAAwB,UAASC,MAAT,EAAiB;AACvC,kBAAI,CAACA,OAAOC,MAAZ,EAAoB;AAAE;AAAS;AAC/BJ,iBAAGK,IAAH,CAAQ,KAAKC,oBAAL,CAA0BH,MAA1B,EAAkCV,OAAlC,CAAR;AACD,aAHuB,CAGtBc,IAHsB,CAGjB,IAHiB,CAAxB;;AAKA,gBAAIC,UAAUvC,EAAEwC,OAAF,CAAUT,EAAV,CAAd;;AAEA;AACA,gBAAI/B,EAAEyC,OAAF,CAAUF,OAAV,CAAJ,EAAwB;AACtB,kBAAIG,IAAI,KAAKrC,EAAL,CAAQsC,KAAR,EAAR;AACAD,gBAAEE,OAAF,CAAU,EAAEC,MAAM,EAAR,EAAV;AACA,qBAAOH,EAAEI,OAAT;AACD;;AAED,gBAAIC,cAAc,EAAlB;AACA/C,cAAEgC,IAAF,CAAOO,OAAP,EAAgB,UAASS,KAAT,EAAgB;AAC9B,kBAAIA,MAAMC,OAAN,IAAiBD,MAAMC,OAAN,CAAcC,MAAd,GAAuB,CAA5C,EAA+C;AAC7ClD,kBAAEgC,IAAF,CAAOgB,MAAMC,OAAb,EAAsB,UAASE,GAAT,EAAc;AAClCJ,8BAAYI,IAAIC,IAAhB,IAAwB,IAAxB;AACD,iBAFD;AAGD,eAJD,MAIO;AACLpD,kBAAEgC,IAAF,CAAOgB,MAAMK,IAAb,EAAmB,UAASF,GAAT,EAAcG,GAAd,EAAmB;AACpCP,8BAAYO,GAAZ,IAAmB,IAAnB;AACD,iBAFD;AAGD;AACF,aAVD;;AAYA,mBAAO,KAAKC,sBAAL,CAA4BhB,OAA5B,EAAqCd,KAArC,EAA4CI,GAA5C,EAAiD2B,IAAjD,CAAsD,UAASC,QAAT,EAAmB;AAC9E,kBAAIC,wBAAwB,KAAKC,mBAAL,CAAyBF,SAASZ,IAAlC,EAAwCrB,OAAxC,CAA5B;AACA,kBAAIoC,SAAS5D,EAAE6D,GAAF,CAAMJ,SAASZ,IAAf,EAAqB,UAASiB,UAAT,EAAqBC,KAArB,EAA4B;AAC5DA,wBAAQL,sBAAsBK,KAAtB,CAAR;AACA,oBAAIA,UAAU,CAAC,CAAf,EAAkB;AAChBA,0BAAQ,CAAR;AACD;AACD,qBAAKC,YAAL,CAAkBF,UAAlB;;AAEA,uBAAO,KAAKG,mBAAL,CAAyBH,UAAzB,EAAqCf,WAArC,EAAkDvB,QAAQS,OAAR,CAAgB8B,KAAhB,CAAlD,EAA0EvC,OAA1E,CAAP;AACD,eARiC,CAQhCc,IARgC,CAQ3B,IAR2B,CAArB,CAAb;AASA,qBAAO,EAAEO,MAAMe,MAAR,EAAP;AACD,aAZ4D,CAY3DtB,IAZ2D,CAYtD,IAZsD,CAAtD,CAAP;AAaD;;;2CAGe;AACd,mBAAO,KAAKhC,UAAL,CAAgB4D,iBAAhB,CAAkC;AACvClD,mBAAK,KAAKA,GAAL,GAAW,UADuB;AAEvCmD,sBAAQ;AAF+B,aAAlC,EAGJX,IAHI,CAGC,oBAAY;AAClB,kBAAIC,SAASW,MAAT,KAAoB,GAAxB,EAA6B;AAC3B,uBAAO,EAAEA,QAAQ,SAAV,EAAqBC,SAAS,wBAA9B,EAAwDC,OAAO,SAA/D,EAAP;AACLine truncated

grafana/timely-app/dist/plugin.json

@@ -23,8 +23,8 @@
       {"name": "Project site", "url": "https://github.com/NationalSecurityAgency/timely"},
       {"name": "License & Terms", "url": "https://raw.githubusercontent.com/NationalSecurityAgency/timely/master/LICENSE"}
     ],
-    "version": "0.0.4-SNAPSHOT",
-    "updated": "2016-10-27"
+    "version": "0.0.5-SNAPSHOT",
+    "updated": "2017-07-21"
   },
 
   "includes": [
@@ -34,7 +34,7 @@
   ],
 
   "dependencies": {
-    "grafanaVersion": "3.x.x",
+    "grafanaVersion": "4.x.x",
     "plugins": []
   }
 

grafana/timely-app/plugin.json

@@ -23,8 +23,8 @@
       {"name": "Project site", "url": "https://github.com/NationalSecurityAgency/timely"},
       {"name": "License & Terms", "url": "https://raw.githubusercontent.com/NationalSecurityAgency/timely/master/LICENSE"}
     ],
-    "version": "0.0.4-SNAPSHOT",
-    "updated": "2016-10-27"
+    "version": "0.0.5-SNAPSHOT",
+    "updated": "2017-07-21"
   },
 
   "includes": [
@@ -34,7 +34,7 @@
   ],
 
   "dependencies": {
-    "grafanaVersion": "3.x.x",
+    "grafanaVersion": "4.x.x",
     "plugins": []
   }
 

grafana/timely-app/src/datasource/dashboards/AccumuloOverview.json

@@ -2,6 +2,8 @@
   "__inputs": [
     {
       "name": "DS_TIMELY",
+      "label": "Timely",
+      "description": "",
       "type": "datasource",
       "pluginId": "timely-datasource",
       "pluginName": "Timely"
@@ -9,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "singlestat",
-      "name": "Singlestat",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
     },
     {
       "type": "panel",
@@ -21,10 +23,10 @@
       "version": ""
     },
     {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.0"
+      "type": "panel",
+      "id": "singlestat",
+      "name": "Singlestat",
+      "version": ""
     },
     {
       "type": "datasource",
@@ -33,18 +35,18 @@
       "version": "1.0.0"
     }
   ],
-  "id": null,
-  "title": "Accumulo Overview",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "100",
       "panels": [
         {
@@ -71,7 +73,6 @@
           "hideTimeOverride": true,
           "id": 2,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -105,6 +106,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "count",
@@ -161,7 +163,6 @@
           "hideTimeOverride": true,
           "id": 3,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -195,6 +196,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -251,7 +253,6 @@
           "hideTimeOverride": true,
           "id": 4,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -285,6 +286,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -341,7 +343,6 @@
           "hideTimeOverride": true,
           "id": 5,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -375,6 +376,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -408,28 +410,28 @@
           "valueName": "avg"
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 6,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -448,6 +450,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
@@ -481,6 +484,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Minor Compactions",
@@ -492,7 +496,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -516,18 +524,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 7,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -546,6 +550,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
@@ -579,6 +584,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Major Compactions",
@@ -590,7 +596,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -614,18 +624,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 12,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -644,12 +650,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "counterMax": "",
               "currentTagKey": "",
@@ -668,6 +675,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Thrift Ops",
@@ -679,7 +687,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -703,18 +715,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 13,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -733,12 +741,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "counterMax": "",
               "currentTagKey": "",
@@ -757,6 +766,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Thrift Avg Execution Time",
@@ -768,7 +778,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -790,28 +804,28 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 8,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -830,12 +844,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -852,6 +867,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Ops",
@@ -863,7 +879,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -887,18 +907,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 9,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -917,12 +933,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -939,6 +956,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Write Time Avg",
@@ -950,7 +968,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -974,18 +996,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 18,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1004,12 +1022,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1026,6 +1045,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Write Time Min",
@@ -1037,7 +1057,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1061,18 +1085,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 19,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1091,12 +1111,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1113,6 +1134,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Write Ahead Logs Write Time Max",
@@ -1124,7 +1146,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1146,28 +1172,28 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 11,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1186,12 +1212,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1208,6 +1235,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Mutation Array Num Ops",
@@ -1219,7 +1247,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1243,18 +1275,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 10,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1273,12 +1301,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1293,6 +1322,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Mutation Array Avg Size",
@@ -1304,7 +1334,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1328,18 +1362,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 17,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1358,12 +1388,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1378,6 +1409,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Mutation Array Max Size",
@@ -1389,7 +1421,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1411,28 +1447,28 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 14,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1451,12 +1487,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1472,6 +1509,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Zookeeper Packets Received",
@@ -1483,7 +1521,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1507,18 +1549,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 15,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1537,12 +1575,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1558,6 +1597,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Zookeeper Packets Sent",
@@ -1569,7 +1609,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1593,18 +1637,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 16,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -1623,12 +1663,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 4,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -1644,6 +1685,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Zookeeper Average Latency",
@@ -1655,7 +1697,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -1677,9 +1723,20 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now-1h",
     "to": "now"
@@ -1709,14 +1766,7 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "schemaVersion": 12,
-  "version": 19,
-  "links": [],
-  "gnetId": null
-}
+  "timezone": "browser",
+  "title": "Accumulo Overview",
+  "version": 4
+}

grafana/timely-app/src/datasource/dashboards/TimelyStatus.json

@@ -11,10 +11,10 @@
   ],
   "__requires": [
     {
-      "type": "panel",
-      "id": "singlestat",
-      "name": "Singlestat",
-      "version": ""
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
     },
     {
       "type": "panel",
@@ -23,10 +23,10 @@
       "version": ""
     },
     {
-      "type": "grafana",
-      "id": "grafana",
-      "name": "Grafana",
-      "version": "3.1.0"
+      "type": "panel",
+      "id": "singlestat",
+      "name": "Singlestat",
+      "version": ""
     },
     {
       "type": "datasource",
@@ -35,18 +35,19 @@
       "version": "1.0.0"
     }
   ],
-  "id": null,
-  "title": "Timely Status",
-  "tags": [],
-  "style": "dark",
-  "timezone": "browser",
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": "1m",
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "150",
       "panels": [
         {
@@ -73,7 +74,6 @@
           "hideTimeOverride": true,
           "id": 8,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -107,9 +107,10 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
-              "aggregator": "count",
+              "aggregator": "sum",
               "downsampleAggregator": "sum",
               "downsampleFillPolicy": "none",
               "downsampleInterval": "1m",
@@ -157,7 +158,6 @@
           "hideTimeOverride": true,
           "id": 9,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -191,6 +191,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "count",
@@ -198,8 +199,8 @@
               "currentTagValue": "",
               "downsampleAggregator": "count",
               "downsampleFillPolicy": "none",
-              "downsampleInterval": "1m",
-              "metric": "sys.collectd.queue_length",
+              "downsampleInterval": "1s",
+              "metric": "sys.collectd.cache_size",
               "refId": "A",
               "tags": {}
             }
@@ -243,7 +244,6 @@
           "hideTimeOverride": true,
           "id": 10,
           "interval": null,
-          "isNew": true,
           "links": [],
           "mappingType": 1,
           "mappingTypes": [
@@ -277,6 +277,7 @@
             "lineColor": "rgb(31, 120, 193)",
             "show": false
           },
+          "tableColumn": "",
           "targets": [
             {
               "aggregator": "sum",
@@ -306,28 +307,28 @@
           "valueName": "avg"
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 3,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -346,7 +347,8 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 4,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -364,6 +366,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Metrics Inserted",
@@ -375,7 +378,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -399,18 +406,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 4,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -429,7 +432,8 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 4,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -447,6 +451,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Meta Inserted",
@@ -458,7 +463,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -482,18 +491,14 @@
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 5,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -512,7 +517,8 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 4,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
@@ -530,6 +536,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Metrics Received",
@@ -541,7 +548,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -561,30 +572,18 @@
               "show": true
             }
           ]
-        }
-      ],
-      "title": "New row"
-    },
-    {
-      "collapse": false,
-      "editable": true,
-      "height": "250px",
-      "panels": [
+        },
         {
           "aliasColors": {},
           "bars": false,
+          "dashLength": 10,
+          "dashes": false,
           "datasource": "${DS_TIMELY}",
           "editable": true,
           "error": false,
           "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 7,
-          "isNew": true,
           "legend": {
             "avg": false,
             "current": false,
@@ -603,12 +602,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
-          "span": 6,
+          "spaceLength": 10,
+          "span": 3,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "sum",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -622,6 +622,7 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "CollectD Cache Sizes",
@@ -633,91 +634,11 @@
           },
           "type": "graph",
           "xaxis": {
-            "show": true
-          },
-          "yaxes": [
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            },
-            {
-              "format": "short",
-              "label": null,
-              "logBase": 1,
-              "max": null,
-              "min": null,
-              "show": true
-            }
-          ]
-        },
-        {
-          "aliasColors": {},
-          "bars": false,
-          "datasource": "${DS_TIMELY}",
-          "editable": true,
-          "error": false,
-          "fill": 0,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
-          "id": 11,
-          "isNew": true,
-          "legend": {
-            "avg": false,
-            "current": false,
-            "max": false,
-            "min": false,
+            "buckets": null,
+            "mode": "time",
+            "name": null,
             "show": true,
-            "total": false,
-            "values": false
-          },
-          "lines": true,
-          "linewidth": 2,
-          "links": [],
-          "nullPointMode": "connected",
-          "percentage": false,
-          "pointradius": 5,
-          "points": false,
-          "renderer": "flot",
-          "seriesOverrides": [],
-          "span": 6,
-          "stack": false,
-          "steppedLine": false,
-          "targets": [
-            {
-              "aggregator": "sum",
-              "alias": "$tag_host",
-              "currentTagKey": "",
-              "currentTagValue": "",
-              "downsampleAggregator": "sum",
-              "downsampleFillPolicy": "none",
-              "downsampleInterval": "1m",
-              "metric": "sys.collectd.queue_length",
-              "refId": "A",
-              "tags": {
-                "host": ".*"
-              }
-            }
-          ],
-          "timeFrom": null,
-          "timeShift": null,
-          "title": "CollectD Queue Length",
-          "tooltip": {
-            "msResolution": true,
-            "shared": true,
-            "sort": 0,
-            "value_type": "cumulative"
-          },
-          "type": "graph",
-          "xaxis": {
-            "show": true
+            "values": []
           },
           "yaxes": [
             {
@@ -739,9 +660,20 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now-1h",
     "to": "now"
@@ -772,15 +704,7 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": "1m",
-  "schemaVersion": 12,
-  "version": 8,
-  "links": [],
-  "gnetId": null
+  "timezone": "browser",
+  "title": "Timely Status",
+  "version": 4
 }

grafana/timely-app/src/datasource/dashboards/standalone_test.json

@@ -1,40 +1,59 @@
 {
   "__inputs": [
     {
-      "name": "DS_NAME",
+      "name": "DS_TIMELY-STANDALONE",
+      "label": "Timely-Standalone",
+      "description": "",
       "type": "datasource",
-      "pluginId": "timely-datasource"
+      "pluginId": "timely-datasource",
+      "pluginName": "Timely"
     }
   ],
-  "id": null,
-  "title": "Timely Standalone Demo",
-  "originalTitle": "Timely Standalone Demo",
-  "tags": ["imported"],
-  "style": "dark",
-  "timezone": "browser",
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "timely-datasource",
+      "name": "Timely",
+      "version": "1.0.0"
+    }
+  ],
+  "annotations": {
+    "list": []
+  },
   "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
   "hideControls": false,
-  "sharedCrosshair": false,
+  "id": null,
+  "links": [],
+  "refresh": "5s",
   "rows": [
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)",
-            "thresholdLine": false
-          },
+          "grid": {},
           "id": 1,
           "legend": {
             "alignAsTable": true,
@@ -56,6 +75,7 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
@@ -93,17 +113,23 @@
               "refId": "C"
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Timely Status",
           "tooltip": {
             "msResolution": true,
             "shared": false,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -124,28 +150,28 @@
           ]
         }
       ],
-      "title": "Row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
     },
     {
       "collapse": false,
-      "editable": true,
       "height": "250px",
       "panels": [
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 2,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": false,
@@ -166,12 +192,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "none",
               "alias": "$tag_host",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -186,17 +213,23 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "CPU User by Host",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -220,18 +253,14 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 3,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": false,
@@ -252,12 +281,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "none",
               "alias": "$tag_rack",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -272,17 +302,23 @@
               }
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "CPU User by Rack",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -306,18 +342,14 @@
         {
           "aliasColors": {},
           "bars": false,
-          "datasource": "${DS_NAME}",
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
           "editable": true,
           "error": false,
           "fill": 1,
-          "grid": {
-            "threshold1": null,
-            "threshold1Color": "rgba(216, 200, 27, 0.27)",
-            "threshold2": null,
-            "threshold2Color": "rgba(234, 112, 112, 0.22)"
-          },
+          "grid": {},
           "id": 4,
-          "isNew": true,
           "legend": {
             "alignAsTable": true,
             "avg": false,
@@ -338,12 +370,13 @@
           "points": false,
           "renderer": "flot",
           "seriesOverrides": [],
+          "spaceLength": 10,
           "span": 12,
           "stack": false,
           "steppedLine": false,
           "targets": [
             {
-              "aggregator": "max",
+              "aggregator": "none",
               "alias": "",
               "currentTagKey": "",
               "currentTagValue": "",
@@ -356,17 +389,23 @@
               "tags": {}
             }
           ],
+          "thresholds": [],
           "timeFrom": null,
           "timeShift": null,
           "title": "Cumulative CPU",
           "tooltip": {
             "msResolution": false,
             "shared": true,
+            "sort": 0,
             "value_type": "cumulative"
           },
           "type": "graph",
           "xaxis": {
-            "show": true
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
           },
           "yaxes": [
             {
@@ -388,9 +427,22 @@
           ]
         }
       ],
-      "title": "New row"
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
     }
   ],
+  "schemaVersion": 14,
+  "style": "dark",
+  "tags": [
+    "imported"
+  ],
+  "templating": {
+    "list": []
+  },
   "time": {
     "from": "now-15m",
     "to": "now"
@@ -421,14 +473,7 @@
       "30d"
     ]
   },
-  "templating": {
-    "list": []
-  },
-  "annotations": {
-    "list": []
-  },
-  "refresh": "5s",
-  "schemaVersion": 12,
-  "version": 1,
-  "links": []
-}
+  "timezone": "browser",
+  "title": "Timely Standalone Demo",
+  "version": 6
+}

grafana/timely-app/src/datasource/datasource.js

@@ -347,7 +347,7 @@ export class TimelyDatasource {
     var tagData = [];
 
     if (!_.isEmpty(md.tags)) {
-      _.each(_.pairs(md.tags), function(tag) {
+      _.each(_.toPairs(md.tags), function(tag) {
         if (_.has(groupByTags, tag[0])) {
           tagData.push(tag[0] + "=" + tag[1]);
         }
@@ -430,9 +430,7 @@ export class TimelyDatasource {
         if (target.filters && target.filters.length > 0) {
           return target.metric === metricData.metric;
         } else {
-          return target.metric === metricData.metric &&
-          _.all(target.tags,
-              function(tagV, tagK) {
+          return target.metric === metricData.metric && _.every(target.tags, function(tagV, tagK) {
                 interpolatedTagValue = this.templateSrv.replace(tagV, options.scopedVars, 'pipe');
                 return metricData.tags[tagK] === interpolatedTagValue || interpolatedTagValue === "*";
               }.bind(this));

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>0.0.4</version>
+    <version>0.0.5</version>
     <packaging>pom</packaging>
     <name>Timely</name>
     <description>A secure and scalable time series database based on Apache Accumulo</description>
@@ -26,9 +26,6 @@
         <module>common</module>
         <module>client</module>
         <module>server</module>
-        <module>collectd-timely-plugin</module>
-        <module>collectd-nsq-plugin</module>
-        <module>collectd-plugin-parent</module>
         <module>grafana</module>
         <module>analytics</module>
     </modules>
@@ -59,8 +56,8 @@
         <version.jsoup>1.9.2</version.jsoup>
         <version.junit>4.12</version.junit>
         <version.log4j>2.6.2</version.log4j>
-        <version.netty>4.0.38.Final</version.netty>
-        <version.netty-tcnative>1.1.33.Fork18</version.netty-tcnative>
+        <version.netty>4.0.46.Final</version.netty>
+        <version.netty-tcnative>2.0.1.Final</version.netty-tcnative>
         <version.powermock>1.6.4</version.powermock>
         <version.slf4j>1.7.21</version.slf4j>
         <version.spring-boot>1.4.1.RELEASE</version.spring-boot>
@@ -509,4 +506,17 @@
             </plugins>
         </pluginManagement>
     </build>
+    <profiles>
+        <profile>
+            <id>collectd</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <modules>
+                <module>collectd-timely-plugin</module>
+                <module>collectd-nsq-plugin</module>
+                <module>collectd-plugin-parent</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

server/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>timely</groupId>
         <artifactId>timely</artifactId>
-        <version>0.0.4</version>
+        <version>0.0.5</version>
     </parent>
     <dependencies>
         <dependency>

server/src/main/java/timely/Server.java

@@ -63,7 +63,7 @@ import timely.auth.VisibilityCache;
 import timely.netty.http.HttpMetricPutHandler;
 import timely.netty.http.HttpStaticFileServerHandler;
 import timely.netty.http.HttpVersionRequestHandler;
-import timely.netty.http.NonSecureHttpHandler;
+import timely.netty.http.NonSslRedirectHandler;
 import timely.netty.http.StrictTransportHandler;
 import timely.netty.http.TimelyExceptionHandler;
 import timely.netty.http.auth.BasicAuthLoginRequestHandler;
@@ -473,10 +473,9 @@ public class Server {
             @Override
             protected void initChannel(SocketChannel ch) throws Exception {
 
-                ch.pipeline().addLast("ssl", sslCtx.newHandler(ch.alloc()));
+                ch.pipeline().addLast("ssl", new NonSslRedirectHandler(config, sslCtx));
                 ch.pipeline().addLast("encoder", new HttpResponseEncoder());
                 ch.pipeline().addLast("decoder", new HttpRequestDecoder());
-                ch.pipeline().addLast("non-secure", new NonSecureHttpHandler(config));
                 ch.pipeline().addLast("compressor", new HttpContentCompressor());
                 ch.pipeline().addLast("decompressor", new HttpContentDecompressor());
                 ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));

server/src/main/java/timely/netty/http/NonSecureHttpHandler.java

@@ -1,44 +0,0 @@
-package timely.netty.http;
-
-import io.netty.buffer.Unpooled;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.http.DefaultFullHttpResponse;
-import io.netty.handler.codec.http.FullHttpResponse;
-import io.netty.handler.codec.http.HttpHeaders.Names;
-import io.netty.handler.codec.http.HttpResponseStatus;
-import io.netty.handler.codec.http.HttpVersion;
-import io.netty.handler.ssl.NotSslRecordException;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import timely.Configuration;
-import timely.netty.Constants;
-
-public class NonSecureHttpHandler extends ChannelInboundHandlerAdapter implements TimelyHttpHandler {
-
-    private static final Logger LOG = LoggerFactory.getLogger(NonSecureHttpHandler.class);
-    private final String redirectAddress;
-
-    public NonSecureHttpHandler(Configuration conf) {
-        String timelyHost = conf.getHttp().getHost();
-        int timelyPort = conf.getHttp().getPort();
-        String path = conf.getHttp().getRedirectPath();
-        redirectAddress = "https://" + timelyHost + ":" + timelyPort + path;
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        ctx.pipeline().remove("ssl");
-        if (cause instanceof NotSslRecordException) {
-            LOG.trace("Received non-SSL request, returning redirect");
-            FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
-                    HttpResponseStatus.MOVED_PERMANENTLY, Unpooled.EMPTY_BUFFER);
-            response.headers().set(Names.LOCATION, redirectAddress);
-            LOG.trace(Constants.LOG_RETURNING_RESPONSE, response);
-            ctx.writeAndFlush(response);
-        }
-    }
-
-}

server/src/main/java/timely/netty/http/NonSslRedirectHandler.java

@@ -0,0 +1,64 @@
+package timely.netty.http;
+
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.codec.http.DefaultFullHttpResponse;
+import io.netty.handler.codec.http.FullHttpResponse;
+import io.netty.handler.codec.http.HttpHeaders.Names;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.handler.codec.http.HttpVersion;
+import io.netty.handler.ssl.OptionalSslHandler;
+import io.netty.handler.ssl.SslContext;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import timely.Configuration;
+import timely.netty.Constants;
+
+public class NonSslRedirectHandler extends OptionalSslHandler implements TimelyHttpHandler {
+
+    private static final Logger LOG = LoggerFactory.getLogger(NonSslRedirectHandler.class);
+    private final String redirectAddress;
+
+    public NonSslRedirectHandler(Configuration conf, SslContext sslContext) {
+        super(sslContext);
+        String timelyHost = conf.getHttp().getHost();
+        int timelyPort = conf.getHttp().getPort();
+        String path = conf.getHttp().getRedirectPath();
+        redirectAddress = "https://" + timelyHost + ":" + timelyPort + path;
+    }
+
+    @Override
+    protected String newSslHandlerName() {
+        return "ssl";
+    }
+
+    @Override
+    protected String newNonSslHandlerName() {
+        return "ssl";
+    }
+
+    @Override
+    protected ChannelHandler newNonSslHandler(ChannelHandlerContext context) {
+        return new ChannelInboundHandlerAdapter() {
+
+            private HttpResponseEncoder encoder = new HttpResponseEncoder();
+
+            @Override
+            public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
+                LOG.trace("Received non-SSL request, returning redirect");
+                FullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1,
+                        HttpResponseStatus.MOVED_PERMANENTLY, Unpooled.EMPTY_BUFFER);
+                response.headers().set(Names.LOCATION, redirectAddress);
+                LOG.trace(Constants.LOG_RETURNING_RESPONSE, response);
+                encoder.write(ctx, response, ctx.voidPromise());
+                ctx.flush();
+            }
+        };
+    }
+
+}

server/src/main/java/timely/store/DataStoreImpl.java

@@ -80,7 +80,6 @@ import timely.model.Metric;
 import timely.model.Tag;
 import timely.sample.Aggregation;
 import timely.sample.Aggregator;
-import timely.sample.Downsample;
 import timely.sample.Sample;
 import timely.sample.aggregators.Avg;
 import timely.sample.iterators.AggregationIterator;

server/src/main/java/timely/subscription/MetricScanner.java

@@ -86,13 +86,15 @@ public class MetricScanner extends Thread implements UncaughtExceptionHandler {
     }
 
     public synchronized void flush() {
-        if (responses.size() > 0) {
-            try {
-                String json = om.writeValueAsString(responses);
-                this.ctx.writeAndFlush(new TextWebSocketFrame(json));
-                responses.clear();
-            } catch (JsonProcessingException e) {
-                LOG.error("Error serializing metrics: " + responses, e);
+        synchronized (responses) {
+            if (responses.size() > 0) {
+                try {
+                    String json = om.writeValueAsString(responses);
+                    this.ctx.writeAndFlush(new TextWebSocketFrame(json));
+                    responses.clear();
+                } catch (JsonProcessingException e) {
+                    LOG.error("Error serializing metrics: " + responses, e);
+                }
             }
         }
     }
@@ -152,9 +154,12 @@ public class MetricScanner extends Thread implements UncaughtExceptionHandler {
     }
 
     public void close() {
-        LOG.info("Marking metric scanner closed: {}", name);
-        this.flusher.cancel(false);
-        this.closed = true;
+        if (!closed) {
+            LOG.info("Marking metric scanner closed: {}", name);
+            flush();
+            this.flusher.cancel(false);
+            this.closed = true;
+        }
     }
 
     @Override

server/src/test/java/timely/TestServer.java

@@ -11,6 +11,7 @@ import io.netty.handler.codec.http.HttpObjectAggregator;
 import io.netty.handler.codec.http.HttpRequestDecoder;
 import io.netty.handler.logging.LoggingHandler;
 import io.netty.handler.ssl.SslContext;
+import timely.netty.http.NonSslRedirectHandler;
 import timely.netty.tcp.MetricsBufferDecoder;
 import timely.netty.tcp.TcpDecoder;
 import timely.netty.udp.UdpDecoder;
@@ -33,7 +34,7 @@ public class TestServer extends Server {
 
             @Override
             protected void initChannel(SocketChannel ch) throws Exception {
-                ch.pipeline().addLast("ssl", sslCtx.newHandler(ch.alloc()));
+                ch.pipeline().addLast("ssl", new NonSslRedirectHandler(config, sslCtx));
                 ch.pipeline().addLast("decompressor", new HttpContentDecompressor());
                 ch.pipeline().addLast("decoder", new HttpRequestDecoder());
                 ch.pipeline().addLast("aggregator", new HttpObjectAggregator(8192));

server/src/test/java/timely/test/integration/http/HttpApiIT.java

@@ -112,38 +112,6 @@ public class HttpApiIT extends OneWaySSLBase {
         }
     }
 
-    @Test
-    public void testMetricsURLEncoded() throws Exception {
-        final Server s = new Server(conf);
-        s.run();
-        try {
-            // @formatter:off
-            put("sys.cpu.user " + TEST_TIME + " 1.0 tag%31=value%31 tag%32=value%32",
-                    "sys.cpu.idle " + (TEST_TIME + 1) + " 1.0 tag%33=value%33 tag%34=value%34",
-                    "sys.cpu.idle " + (TEST_TIME + 2) + " 1.0 tag%33=value%33 tag%34=value%34 viz=(a|b|c)",
-                    "zzzz 1234567892 1.0 host=localhost");
-
-            // Latency in TestConfiguration is 2s, wait for it
-            sleepUninterruptibly(TestConfiguration.WAIT_SECONDS, TimeUnit.SECONDS);
-
-            String metrics = "https://localhost:54322/api/metrics";
-            // Test prefix matching
-            String result = query(metrics);
-            Document doc = Jsoup.parse(result);
-            Elements tableData = doc.select("td");
-
-            assertEquals(1, tableData.select(":contains(sys.cpu.user)").size());
-            assertEquals(1, tableData.select(":contains(tag1=value1 tag2=value2)").size());
-            assertEquals(1, tableData.select(":contains(sys.cpu.idle)").size());
-            assertEquals(1, tableData.select(":contains(tag3=value3 tag4=value4)").size());
-            assertEquals(1, tableData.select(":contains(zzzz)").size());
-            assertEquals(1, tableData.select(":contains(host=localhost)").size());
-            // @formatter:on
-        } finally {
-            s.shutdown();
-        }
-    }
-
     @Test
     public void testMetricsJson() throws Exception {
         // @formatter:off