Add age off iterator for meta table

analytics/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.3.0</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>timely-analytics</artifactId>
   <!--
@@ -68,7 +68,6 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
           <configuration>
             <compilerId>jdt</compilerId>
@@ -77,7 +76,7 @@
             <dependency>
               <groupId>org.eclipse.tycho</groupId>
               <artifactId>tycho-compiler-jdt</artifactId>
-              <version>1.4.0</version>
+              <version>0.21.0</version>
             </dependency>
           </dependencies>
         </plugin>

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

@@ -67,7 +67,7 @@ public class SummarizationJob {
         })
         .name("Metric Windows")
         .addSink(
-            new SocketClientSink<MetricHistogram>(jp.getTimelyHostname(), jp.getTimelyTcpPort(),
+    		new SocketClientSink<MetricHistogram>(jp.getTimelyHostname(), jp.getTimelyTcpPort(),
                     new MetricHistogram(), 2, true) {
 
                 private final Logger LOG = LoggerFactory

balancer/conf/timely-balancer.yml

@@ -27,9 +27,6 @@ timely-balancer:
       trustStoreFile:
       trustStoreType: jks
       #trustStorePassword:
-    jwtCheckKeyStore:
-    jwtCheckKeyType:
-    jwtCheckKeyPassword:
   cache:
     enabled: false
     metric-age-off-hours:
@@ -114,7 +111,6 @@ timely-balancer:
     flush-interval-seconds: 30
     scanner-read-ahead: 1
     subscription-batch-size: 5000
-    incomingBufferSize: 50000000
     wsClientPool:
       minIdlePerKey: 0
       maxIdlePerKey: 40

balancer/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.3.0</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>timely-balancer</artifactId>
   <dependencies>
@@ -162,6 +162,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>${version.netty-tcnative}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

balancer/src/main/java/timely/balancer/ArrivalRate.java

@@ -1,7 +1,7 @@
 package timely.balancer;
 
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicLong;
 
 import com.google.common.util.concurrent.AtomicDouble;
@@ -20,26 +20,38 @@ public class ArrivalRate {
     private AtomicDouble longTermRate = new AtomicDouble(0);
     private AtomicLong longTermLastReset = new AtomicLong(0);
 
-    public ArrivalRate(ScheduledExecutorService arrivalRateExecutor) {
+    public ArrivalRate(Timer timer) {
         long now = System.currentTimeMillis();
         shortTermLastReset.set(now);
         mediumTermLastReset.set(now);
         longTermLastReset.set(now);
 
         // 2 minute
-        arrivalRateExecutor.scheduleAtFixedRate(() -> {
-            resetShort();
-        }, 2, 2, TimeUnit.MINUTES);
+        timer.schedule(new TimerTask() {
+
+            @Override
+            public void run() {
+                resetShort();
+            }
+        }, 120000, 120000);
 
         // 5 minute
-        arrivalRateExecutor.scheduleAtFixedRate(() -> {
-            resetMedium();
-        }, 5, 5, TimeUnit.MINUTES);
+        timer.schedule(new TimerTask() {
+
+            @Override
+            public void run() {
+                resetMedium();
+            }
+        }, 300000, 300000);
 
         // 15 minute
-        arrivalRateExecutor.scheduleAtFixedRate(() -> {
-            resetLong();
-        }, 15, 15, TimeUnit.MINUTES);
+        timer.schedule(new TimerTask() {
+
+            @Override
+            public void run() {
+                resetLong();
+            }
+        }, 900000, 900000);
     }
 
     private void resetShort() {

balancer/src/main/java/timely/balancer/Balancer.java

@@ -25,7 +25,6 @@ import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.channel.ChannelOption;
 import io.netty.channel.EventLoopGroup;
-import io.netty.channel.WriteBufferWaterMark;
 import io.netty.channel.epoll.EpollChannelOption;
 import io.netty.channel.epoll.EpollDatagramChannel;
 import io.netty.channel.epoll.EpollEventLoopGroup;
@@ -57,7 +56,6 @@ import io.netty.handler.stream.ChunkedWriteHandler;
 import io.netty.handler.timeout.IdleStateHandler;
 import io.netty.util.NettyRuntime;
 import io.netty.util.internal.SystemPropertyUtil;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.curator.RetryPolicy;
 import org.apache.curator.framework.CuratorFramework;
 import org.apache.curator.framework.CuratorFrameworkFactory;
@@ -70,7 +68,6 @@ import org.springframework.boot.WebApplicationType;
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import timely.auth.AuthCache;
-import timely.auth.JWTTokenHandler;
 import timely.balancer.configuration.BalancerConfiguration;
 import timely.balancer.configuration.ClientSsl;
 import timely.balancer.configuration.SpringBootstrap;
@@ -146,11 +143,8 @@ public class Balancer {
         this.balancerConfig = balancerConf;
     }
 
-    protected static ConfigurableApplicationContext initializeContext(String[] args) {
-        SpringApplicationBuilder builder = new SpringApplicationBuilder(SpringBootstrap.class);
-        builder.web(WebApplicationType.NONE);
-        builder.registerShutdownHook(false);
-        return builder.run(args);
+    protected static ConfigurableApplicationContext initializeConfiguration(String[] args) {
+        return new SpringApplicationBuilder(SpringBootstrap.class).web(WebApplicationType.NONE).run(args);
     }
 
     private void shutdownHook() {
@@ -182,9 +176,8 @@ public class Balancer {
             channelFutures.add(wsChannelHandle.close());
         }
 
-        int udpChannel = 1;
         for (Channel c : udpChannelHandleList) {
-            LOG.info("Closing udpChannelHandle #" + udpChannel++);
+            LOG.info("Closing udpChannelHandle");
             channelFutures.add(c.close());
         }
 
@@ -193,13 +186,14 @@ public class Balancer {
             try {
                 f.get();
             } catch (final Exception e) {
-                LOG.error("Channel:" + f.channel().config() + " -> " + e.getMessage(), e);
+                LOG.error("Error while shutting down channel: {}", f.channel().config());
+                LOG.error("{}", e.getMessage());
+                e.printStackTrace();
             }
         });
 
-        int quietPeriod = balancerConfig.getServer().getShutdownQuietPeriod();
+        Integer quietPeriod = balancerConfig.getServer().getShutdownQuietPeriod();
         List<Future<?>> groupFutures = new ArrayList<>();
-
         if (tcpBossGroup != null) {
             LOG.info("Shutting down tcpBossGroup");
             groupFutures.add(tcpBossGroup.shutdownGracefully(quietPeriod, 10, TimeUnit.SECONDS));
@@ -244,7 +238,9 @@ public class Balancer {
             try {
                 f.get();
             } catch (final Exception e) {
-                LOG.error("Group:" + f.toString() + " -> " + e.getMessage(), e);
+                LOG.error("Error while shutting down group: {}", f.toString());
+                LOG.error("{}", e.getMessage());
+                e.printStackTrace();
             }
         });
 
@@ -255,29 +251,14 @@ public class Balancer {
             LOG.error("Error closing WebSocketRequestDecoder during shutdown", e);
         }
 
-        if (this.metricResolver != null) {
-            try {
-                LOG.info("Closing metricResolver");
-                this.metricResolver.close();
-            } catch (Exception e) {
-                LOG.error(e.getMessage(), e);
-            }
-        }
-
-        if (curatorFramework != null) {
-            try {
-                LOG.info("Closing curatorFramework");
-                curatorFramework.close();
-            } catch (Exception e) {
-                LOG.error(e.getMessage(), e);
-            }
-        }
-
         if (applicationContext != null) {
             LOG.info("Closing applicationContext");
             applicationContext.close();
         }
 
+        if (curatorFramework != null) {
+            curatorFramework.close();
+        }
         this.shutdown = true;
         LOG.info("Server shut down.");
     }
@@ -378,15 +359,12 @@ public class Balancer {
 
         // start curator framework
         RetryPolicy retryPolicy = new RetryForever(1000);
-        int timeout = Long.valueOf(AccumuloConfiguration.getTimeInMillis(balancerConfig.getZooKeeper().getTimeout()))
-                .intValue();
-        curatorFramework = CuratorFrameworkFactory.newClient(balancerConfig.getZooKeeper().getServers(), timeout, 10000,
+        curatorFramework = CuratorFrameworkFactory.newClient(balancerConfig.getZooKeeper().getServers(), 30000, 1000,
                 retryPolicy);
         curatorFramework.start();
         ensureZkPaths(curatorFramework, zkPaths);
 
         AuthCache.configure(balancerConfig.getSecurity());
-        JWTTokenHandler.init(balancerConfig.getSecurity());
         final boolean useEpoll = useEpoll();
         Class<? extends ServerSocketChannel> channelClass;
         Class<? extends Channel> datagramChannelClass;
@@ -472,9 +450,10 @@ public class Balancer {
         wsServer.option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT);
         wsServer.option(ChannelOption.SO_BACKLOG, 128);
         wsServer.option(ChannelOption.SO_KEEPALIVE, true);
-        /* Not sure if next two lines are necessary */
+        /* Not sure if next three lines are necessary */
         wsServer.option(ChannelOption.SO_SNDBUF, 1048576);
-        wsServer.option(ChannelOption.WRITE_BUFFER_WATER_MARK, new WriteBufferWaterMark(620145, 838860));
+        wsServer.option(ChannelOption.WRITE_BUFFER_HIGH_WATER_MARK, 838860);
+        wsServer.option(ChannelOption.WRITE_BUFFER_LOW_WATER_MARK, 620145);
         wsChannelHandle = wsServer.bind(wsIp, wsPort).sync().channel();
         final String wsAddress = ((InetSocketAddress) wsChannelHandle.localAddress()).getAddress().getHostAddress();
 
@@ -499,12 +478,12 @@ public class Balancer {
 
     public static void main(String[] args) throws Exception {
 
-        Balancer.applicationContext = Balancer.initializeContext(args);
-        BalancerConfiguration balancerConf = Balancer.applicationContext.getBean(BalancerConfiguration.class);
+        Balancer.applicationContext = Balancer.initializeConfiguration(args);
+        BalancerConfiguration balancerConf = applicationContext.getBean(BalancerConfiguration.class);
 
-        Balancer balancer = new Balancer(balancerConf);
+        Balancer b = new Balancer(balancerConf);
         try {
-            balancer.run();
+            b.run();
             LATCH.await();
         } catch (final InterruptedException e) {
             LOG.info("Server shutting down.");
@@ -512,7 +491,7 @@ public class Balancer {
             LOG.error("Error running server.", e);
         } finally {
             try {
-                balancer.shutdown();
+                b.shutdown();
             } catch (Exception e) {
                 System.exit(1);
             }
@@ -536,13 +515,11 @@ public class Balancer {
                 ch.pipeline().addLast("chunker", new ChunkedWriteHandler());
                 ch.pipeline().addLast("queryDecoder", new timely.netty.http.HttpRequestDecoder(
                         balancerConfig.getSecurity(), balancerConfig.getHttp()));
-                ch.pipeline().addLast("fileServer", new HttpStaticFileServerHandler().setIgnoreSslHandshakeErrors(
-                        balancerConfig.getSecurity().getServerSsl().isUseGeneratedKeypair()));
+                ch.pipeline().addLast("fileServer", new HttpStaticFileServerHandler());
                 ch.pipeline().addLast("login",
                         new X509LoginRequestHandler(balancerConfig.getSecurity(), balancerConfig.getHttp()));
                 ch.pipeline().addLast("httpRelay", new HttpRelayHandler(metricResolver, httpClientPool));
-                ch.pipeline().addLast("error", new TimelyExceptionHandler().setIgnoreSslHandshakeErrors(
-                        balancerConfig.getSecurity().getServerSsl().isUseGeneratedKeypair()));
+                ch.pipeline().addLast("error", new TimelyExceptionHandler());
             }
         };
     }
@@ -590,7 +567,7 @@ public class Balancer {
                 ch.pipeline().addLast("idle-handler",
                         new IdleStateHandler(balancerConfig.getWebsocket().getTimeout(), 0, 0));
                 ch.pipeline().addLast("ws-protocol",
-                        new WebSocketServerProtocolHandler(WS_PATH, null, true, 65536, false, true));
+                        new WebSocketServerProtocolHandler(WS_PATH, null, true, 65536, true));
                 ch.pipeline().addLast("wsDecoder", new WebSocketRequestDecoder(balancerConfig.getSecurity()));
                 ch.pipeline().addLast("httpRelay", new WsRelayHandler(balancerConfig, metricResolver, wsClientPool));
                 ch.pipeline().addLast("error", new WSTimelyExceptionHandler());

balancer/src/main/java/timely/balancer/configuration/BalancerHttp.java

@@ -3,7 +3,6 @@ package timely.balancer.configuration;
 import javax.validation.Valid;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
-import org.apache.http.impl.client.CloseableHttpClient;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 import timely.configuration.Http;
 
@@ -11,9 +10,9 @@ public class BalancerHttp extends Http {
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<CloseableHttpClient> httpClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig httpClientPool = new GenericKeyedObjectPoolConfig();
 
-    public GenericKeyedObjectPoolConfig<CloseableHttpClient> getHttpClientPool() {
+    public GenericKeyedObjectPoolConfig getHttpClientPool() {
         return httpClientPool;
     }
 }

balancer/src/main/java/timely/balancer/configuration/BalancerServer.java

@@ -4,29 +4,27 @@ import javax.validation.Valid;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import timely.client.tcp.TcpClient;
-import timely.client.udp.UdpClient;
 import timely.configuration.Server;
 
 public class BalancerServer extends Server {
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<UdpClient> udpClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig udpClientPool = new GenericKeyedObjectPoolConfig();
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<TcpClient> tcpClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig tcpClientPool = new GenericKeyedObjectPoolConfig();
 
     private int numTcpPools = 1;
 
     private int tcpBufferSize = -1;
 
-    public GenericKeyedObjectPoolConfig<UdpClient> getUdpClientPool() {
+    public GenericKeyedObjectPoolConfig getUdpClientPool() {
         return udpClientPool;
     }
 
-    public GenericKeyedObjectPoolConfig<TcpClient> getTcpClientPool() {
+    public GenericKeyedObjectPoolConfig getTcpClientPool() {
         return tcpClientPool;
     }
 

balancer/src/main/java/timely/balancer/configuration/BalancerWebsocket.java

@@ -4,26 +4,15 @@ import javax.validation.Valid;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPoolConfig;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import timely.client.websocket.subscription.WebSocketSubscriptionClient;
 import timely.configuration.Websocket;
 
 public class BalancerWebsocket extends Websocket {
 
     @Valid
     @NestedConfigurationProperty
-    private GenericKeyedObjectPoolConfig<WebSocketSubscriptionClient> wsClientPool = new GenericKeyedObjectPoolConfig<>();
+    private GenericKeyedObjectPoolConfig wsClientPool = new GenericKeyedObjectPoolConfig();
 
-    public GenericKeyedObjectPoolConfig<WebSocketSubscriptionClient> getWsClientPool() {
+    public GenericKeyedObjectPoolConfig getWsClientPool() {
         return wsClientPool;
     }
-
-    public int incomingBufferSize = 50000000;
-
-    public int getIncomingBufferSize() {
-        return incomingBufferSize;
-    }
-
-    public void setIncomingBufferSize(int incomingBufferSize) {
-        this.incomingBufferSize = incomingBufferSize;
-    }
 }

balancer/src/main/java/timely/balancer/configuration/ZooKeeper.java

@@ -1,14 +1,9 @@
 package timely.balancer.configuration;
 
-import javax.validation.constraints.NotBlank;
-
 public class ZooKeeper {
 
     private String servers;
 
-    @NotBlank
-    private String timeout = "120s";
-
     public String getServers() {
         return servers;
     }
@@ -16,12 +11,4 @@ public class ZooKeeper {
     public void setServers(String servers) {
         this.servers = servers;
     }
-
-    public String getTimeout() {
-        return timeout;
-    }
-
-    public void setTimeout(String timeout) {
-        this.timeout = timeout;
-    }
 }

balancer/src/main/java/timely/balancer/connection/TimelyBalancedHost.java

@@ -1,5 +1,7 @@
 package timely.balancer.connection;
 
+import java.util.Timer;
+
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -11,6 +13,7 @@ import timely.balancer.configuration.BalancerConfiguration;
 public class TimelyBalancedHost {
 
     private static final Logger LOG = LoggerFactory.getLogger(TimelyBalancedHost.class);
+    static private Timer arrivalRateTimer = new Timer("ArrivalRateTimerTBH", true);
 
     private String host;
     private int tcpPort;
@@ -21,25 +24,34 @@ public class TimelyBalancedHost {
     private BalancerConfiguration balancerConfig;
     private int failures = 0;
     private int successes = 0;
-    private ArrivalRate arrivalRate = null;
+    private ArrivalRate arrivalRate = new ArrivalRate(arrivalRateTimer);
 
-    private TimelyBalancedHost() {
+    public TimelyBalancedHost() {
 
     }
 
-    private TimelyBalancedHost(String host, int tcpPort, int httpPort, int wsPort, int udpPort,
-            ArrivalRate arrivalRate) {
+    public TimelyBalancedHost(String host, int tcpPort, int httpPort, int wsPort, int udpPort) {
         this.host = host;
         this.tcpPort = tcpPort;
         this.httpPort = httpPort;
         this.wsPort = wsPort;
         this.udpPort = udpPort;
-        this.arrivalRate = arrivalRate;
     }
 
-    static public TimelyBalancedHost of(String host, int tcpPort, int httpPort, int wsPort, int udpPort,
-            ArrivalRate arrivalRate) {
-        return new TimelyBalancedHost(host, tcpPort, httpPort, wsPort, udpPort, arrivalRate);
+    public TimelyBalancedHost(String host, int basePort) {
+        this.host = host;
+        this.tcpPort = basePort;
+        this.httpPort = basePort + 1;
+        this.wsPort = basePort + 2;
+        this.udpPort = basePort + 3;
+    }
+
+    static public TimelyBalancedHost of(String host, int tcpPort, int httpPort, int wsPort, int udpPort) {
+        return new TimelyBalancedHost(host, tcpPort, httpPort, wsPort, udpPort);
+    }
+
+    static public TimelyBalancedHost of(String host, int basePort) {
+        return new TimelyBalancedHost(host, basePort);
     }
 
     public void setBalancerConfig(BalancerConfiguration balancerConfig) {
@@ -129,17 +141,11 @@ public class TimelyBalancedHost {
     }
 
     public void arrived() {
-        if (this.arrivalRate != null) {
-            this.arrivalRate.arrived();
-        }
+        arrivalRate.arrived();
     }
 
     public double getArrivalRate() {
-        if (this.arrivalRate == null) {
-            return 0;
-        } else {
-            return this.arrivalRate.getRate();
-        }
+        return arrivalRate.getRate();
     }
 
     @Override

balancer/src/main/java/timely/balancer/connection/http/HttpClientPool.java

@@ -4,12 +4,16 @@ import javax.net.ssl.SSLContext;
 
 import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
 import org.apache.http.impl.client.CloseableHttpClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import timely.balancer.configuration.BalancerHttp;
 import timely.balancer.configuration.BalancerSecurity;
 import timely.balancer.connection.TimelyBalancedHost;
 
 public class HttpClientPool extends GenericKeyedObjectPool<TimelyBalancedHost, CloseableHttpClient> {
 
+    private static final Logger LOG = LoggerFactory.getLogger(HttpClientPool.class);
+
     public HttpClientPool(BalancerSecurity balancerSecurity, BalancerHttp http, SSLContext sslContext) {
         super(new HttpClientFactory(balancerSecurity, sslContext), http.getHttpClientPool());
     }

balancer/src/main/java/timely/balancer/connection/ws/WsClientFactory.java

@@ -22,7 +22,7 @@ public class WsClientFactory implements KeyedPooledObjectFactory<TimelyBalancedH
     @Override
     public PooledObject<WebSocketSubscriptionClient> makeObject(TimelyBalancedHost k) throws Exception {
 
-        int bufferSize = balancerConfig.getWebsocket().getIncomingBufferSize();
+        int bufferSize = balancerConfig.getWebsocket().getSubscriptionBatchSize() * 500;
         WebSocketSubscriptionClient client = new WebSocketSubscriptionClient(sslContext, k.getHost(), k.getHttpPort(),
                 k.getWsPort(), balancerConfig.getSecurity().getClientSsl().isUseClientCert(),
                 balancerConfig.isLoginRequired(), "", "",

balancer/src/main/java/timely/balancer/healthcheck/HealthChecker.java

@@ -2,9 +2,8 @@ package timely.balancer.healthcheck;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,12 +15,12 @@ public class HealthChecker {
 
     private static final Logger LOG = LoggerFactory.getLogger(HealthChecker.class);
     private List<TimelyBalancedHost> timelyHosts = new ArrayList<>();
-    private ScheduledExecutorService executorService = Executors.newScheduledThreadPool(1);
+    private Timer timer;
     final private TCPServerHealthCheck tcpServerHealthCheck;
+    private TimerTask check = new TimerTask() {
 
-    public HealthChecker(BalancerConfiguration config, TcpClientPool tcpClientPool) {
-        this.tcpServerHealthCheck = new TCPServerHealthCheck(tcpClientPool);
-        this.executorService.scheduleAtFixedRate(() -> {
+        @Override
+        public void run() {
             synchronized (timelyHosts) {
                 for (TimelyBalancedHost h : timelyHosts) {
                     try {
@@ -36,7 +35,13 @@ public class HealthChecker {
                     }
                 }
             }
-        }, 0, config.getCheckServerHealthInterval(), TimeUnit.MILLISECONDS);
+        }
+    };
+
+    public HealthChecker(BalancerConfiguration config, TcpClientPool tcpClientPool) {
+        this.tcpServerHealthCheck = new TCPServerHealthCheck(tcpClientPool);
+        this.timer = new Timer("HealthCheckerThread", true);
+        this.timer.scheduleAtFixedRate(check, 0, config.getCheckServerHealthInterval());
     }
 
     public void setTimelyHosts(List<TimelyBalancedHost> timelyHosts) {
@@ -45,17 +50,4 @@ public class HealthChecker {
             this.timelyHosts.addAll(timelyHosts);
         }
     }
-
-    public void close() throws Exception {
-        this.executorService.shutdown();
-        try {
-            this.executorService.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-
-        } finally {
-            if (!this.executorService.isTerminated()) {
-                this.executorService.shutdownNow();
-            }
-        }
-    }
 }

balancer/src/main/java/timely/balancer/netty/http/HttpRelayHandler.java

@@ -1,6 +1,6 @@
 package timely.balancer.netty.http;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_LENGTH;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URLEncoder;
@@ -67,7 +67,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
         try {
             try {
                 request = msg.getHttpRequest();
-                String originalURI = request.uri();
+                String originalURI = request.getUri();
                 originalURI = encodeURI(originalURI);
 
                 String metric = null;
@@ -101,7 +101,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
 
                 List<Header> relayedHeaderList = new ArrayList<>();
                 for (Map.Entry<String, String> h : headers.entries()) {
-                    if (!h.getKey().equals(CONTENT_LENGTH.toString())) {
+                    if (!h.getKey().equals(CONTENT_LENGTH)) {
                         relayedHeaderList.add(new BasicHeader(h.getKey(), h.getValue()));
                     }
                 }
@@ -109,14 +109,14 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
                 relayedHeaderList.toArray(headerArray);
 
                 String relayURI = "https://" + k.getHost() + ":" + k.getHttpPort() + originalURI;
-                if (request.method().equals(HttpMethod.GET)) {
+                if (request.getMethod().equals(HttpMethod.GET)) {
                     HttpUriRequest relayedRequest = new HttpGet(relayURI);
                     if (headerArray.length > 0) {
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
 
-                } else if (request.method().equals(HttpMethod.POST)) {
+                } else if (request.getMethod().equals(HttpMethod.POST)) {
                     HttpPost relayedRequest = new HttpPost(relayURI);
 
                     String content = request.content().toString(StandardCharsets.UTF_8);
@@ -170,7 +170,7 @@ public class HttpRelayHandler extends SimpleChannelInboundHandler<HttpRequest> i
             if (client != null && k != null) {
                 httpClientPool.returnObject(k, client);
             } else {
-                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().uri());
+                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().getUri());
             }
         }
     }

balancer/src/main/java/timely/balancer/netty/ws/WsClientHandler.java

@@ -45,7 +45,7 @@ public class WsClientHandler extends ClientHandler {
             Multimap<String, String> proxyRequestHeaders = HashMultimap.create();
             ProxiedEntityUtils.addProxyHeaders(proxyRequestHeaders, token.getClientCert());
             for (String s : proxyRequestHeaders.keySet()) {
-                headers.put(s, new ArrayList<>(proxyRequestHeaders.get(s)));
+                headers.put(s, new ArrayList(proxyRequestHeaders.get(s)));
             }
         }
 
@@ -53,7 +53,7 @@ public class WsClientHandler extends ClientHandler {
         for (String s : originalRequestHeaders.keySet()) {
             if (!headers.containsKey(s)) {
                 // add pre-existing values if key does not exist in proxyRequest
-                headers.put(s, new ArrayList<>(originalRequestHeaders.get(s)));
+                headers.put(s, new ArrayList(originalRequestHeaders.get(s)));
             }
         }
     }

balancer/src/main/java/timely/balancer/resolver/BalancedMetricResolver.java

@@ -7,7 +7,6 @@ import static timely.balancer.Balancer.LEADER_LATCH_PATH;
 import static timely.store.cache.DataStoreCache.NON_CACHED_METRICS;
 import static timely.store.cache.DataStoreCache.NON_CACHED_METRICS_LOCK_PATH;
 
-import java.io.FileNotFoundException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -20,10 +19,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -72,8 +71,8 @@ public class BalancedMetricResolver implements MetricResolver {
     private List<TimelyBalancedHost> serverList = new ArrayList<>();
     private Random r = new Random();
     final private HealthChecker healthChecker;
-    private ScheduledExecutorService assignmentExecutor = Executors.newScheduledThreadPool(2);
-    private ScheduledExecutorService arrivalRateExecutor = Executors.newScheduledThreadPool(2);
+    private Timer timer = new Timer("RebalanceTimer", true);
+    private Timer arrivalRateTimer = new Timer("ArrivalRateTimerResolver", true);
     private int roundRobinCounter = 0;
     private Set<String> nonCachedMetrics = new HashSet<>();
     private DistributedAtomicValue nonCachedMetricsIP;
@@ -109,12 +108,22 @@ public class BalancedMetricResolver implements MetricResolver {
                 LOG.debug("Handling assignments event {}. assignmentsLastUpdatedInHdfs:{}", event.getType().toString(),
                         new Date(assignmentsLastUpdatedInHdfs.get().postValue()));
                 if (event.getType().equals(TreeCacheEvent.Type.NODE_UPDATED)) {
-                    readAssignmentsFromHdfs(true);
+                    long lastLocalUpdate = assignmentsLastUpdatedLocal.get();
+                    long lastHdfsUpdate = assignmentsLastUpdatedInHdfs.get().postValue();
+                    if (lastHdfsUpdate > lastLocalUpdate) {
+                        LOG.debug("Reading assignments from hdfs lastHdfsUpdate ({}) > lastLocalUpdate ({})",
+                                new Date(lastHdfsUpdate), new Date(lastLocalUpdate));
+                        readAssignmentsFromHdfs();
+                    } else {
+                        LOG.debug("Not reading assignments from hdfs lastHdfsUpdate ({}) <= lastLocalUpdate ({})",
+                                new Date(lastHdfsUpdate), new Date(lastLocalUpdate));
+                    }
                 }
             }
         };
 
-        try (TreeCache assignmentTreeCache = new TreeCache(curatorFramework, ASSIGNMENTS_LAST_UPDATED_PATH)) {
+        try {
+            TreeCache assignmentTreeCache = new TreeCache(curatorFramework, ASSIGNMENTS_LAST_UPDATED_PATH);
             assignmentTreeCache.getListenable().addListener(assignmentListener);
             assignmentTreeCache.start();
         } catch (Exception e) {
@@ -135,7 +144,8 @@ public class BalancedMetricResolver implements MetricResolver {
             }
         };
 
-        try (TreeCache nonCachedMetricsTreeCache = new TreeCache(curatorFramework, NON_CACHED_METRICS)) {
+        try {
+            TreeCache nonCachedMetricsTreeCache = new TreeCache(curatorFramework, NON_CACHED_METRICS);
             nonCachedMetricsTreeCache.getListenable().addListener(nonCachedMetricsListener);
             nonCachedMetricsTreeCache.start();
         } catch (Exception e) {
@@ -150,55 +160,55 @@ public class BalancedMetricResolver implements MetricResolver {
         }
         readNonCachedMetricsIP();
 
-        readAssignmentsFromHdfs(false);
+        readAssignmentsFromHdfs();
 
-        assignmentExecutor.scheduleAtFixedRate(() -> {
-            if (isLeader.get()) {
+        timer.schedule(new TimerTask() {
+
+            @Override
+            public void run() {
+                if (isLeader.get()) {
+                    try {
+                        balance();
+                    } catch (Exception e) {
+                        LOG.error(e.getMessage(), e);
+                    }
+                }
+            }
+        }, 900000, 900000);
+
+        timer.schedule(new TimerTask() {
+
+            @Override
+            public void run() {
                 try {
-                    balance();
+                    if (isLeader.get()) {
+                        long lastLocalUpdate = assignmentsLastUpdatedLocal.get();
+                        long lastHdfsUpdate = assignmentsLastUpdatedInHdfs.get().postValue();
+                        if (lastLocalUpdate > lastHdfsUpdate) {
+                            LOG.debug("Writing assignments to hdfs lastLocalUpdate ({}) > lastHdfsUpdate ({})",
+                                    new Date(lastLocalUpdate), new Date(lastHdfsUpdate));
+                            writeAssigmentsToHdfs();
+                        }
+                    }
                 } catch (Exception e) {
                     LOG.error(e.getMessage(), e);
                 }
             }
-        }, 15, 15, TimeUnit.MINUTES);
-
-        assignmentExecutor.scheduleAtFixedRate(() -> {
-            try {
-                if (isLeader.get()) {
-                    long lastLocalUpdate = assignmentsLastUpdatedLocal.get();
-                    long lastHdfsUpdate = assignmentsLastUpdatedInHdfs.get().postValue();
-                    if (lastLocalUpdate > lastHdfsUpdate) {
-                        LOG.debug("Leader writing assignments to hdfs lastLocalUpdate ({}) > lastHdfsUpdate ({})",
-                                new Date(lastLocalUpdate), new Date(lastHdfsUpdate));
-                        writeAssignmentsToHdfs();
-                    } else {
-                        LOG.trace("Leader not writing assignments to hdfs lastLocalUpdate ({}) <= lastHdfsUpdate ({})",
-                                new Date(lastLocalUpdate), new Date(lastHdfsUpdate));
-                    }
-                } else {
-                    readAssignmentsFromHdfs(true);
-                }
-            } catch (Exception e) {
-                LOG.error(e.getMessage(), e);
-            }
-        }, 10, 60, TimeUnit.SECONDS);
+        }, 10000, 60000);
     }
 
     private void readNonCachedMetricsIP() {
 
         Set<String> currentNonCachedMetricsDistributed = new TreeSet<>();
         try {
-            boolean acquired = false;
-            while (!acquired) {
-                acquired = nonCachedMetricsIPRWLock.readLock().acquire(60, TimeUnit.SECONDS);
-            }
+            nonCachedMetricsIPRWLock.readLock().acquire();
             byte[] currentNonCachedMetricsDistributedBytes = nonCachedMetricsIP.get().postValue();
             if (currentNonCachedMetricsDistributedBytes != null) {
                 try {
                     currentNonCachedMetricsDistributed = SerializationUtils
                             .deserialize(currentNonCachedMetricsDistributedBytes);
                 } catch (Exception e) {
-                    LOG.error(e.getMessage(), e);
+                    LOG.error(e.getMessage());
                     currentNonCachedMetricsDistributed = new TreeSet<>();
                 }
             }
@@ -239,7 +249,7 @@ public class BalancedMetricResolver implements MetricResolver {
                 public void isLeader() {
                     LOG.info("this balancer is the leader");
                     isLeader.set(true);
-                    writeAssignmentsToHdfs();
+                    writeAssigmentsToHdfs();
                 }
 
                 @Override
@@ -255,17 +265,17 @@ public class BalancedMetricResolver implements MetricResolver {
 
     private void startServiceListener(CuratorFramework curatorFramework) {
         try {
-            ServiceDiscovery<ServerDetails> discovery = ServiceDiscoveryBuilder.builder(ServerDetails.class)
-                    .client(curatorFramework).basePath(SERVICE_DISCOVERY_PATH).build();
+            ServiceDiscovery discovery = ServiceDiscoveryBuilder.builder(ServerDetails.class).client(curatorFramework)
+                    .basePath(SERVICE_DISCOVERY_PATH).build();
             discovery.start();
-            Collection<ServiceInstance<ServerDetails>> instances = discovery.queryForInstances("timely-server");
+            Collection<ServiceInstance> instances = discovery.queryForInstances("timely-server");
 
             balancerLock.writeLock().lock();
             try {
-                for (ServiceInstance<ServerDetails> si : instances) {
-                    ServerDetails pl = si.getPayload();
+                for (ServiceInstance si : instances) {
+                    ServerDetails pl = (ServerDetails) si.getPayload();
                     TimelyBalancedHost tbh = TimelyBalancedHost.of(pl.getHost(), pl.getTcpPort(), pl.getHttpPort(),
-                            pl.getWsPort(), pl.getUdpPort(), new ArrivalRate(arrivalRateExecutor));
+                            pl.getWsPort(), pl.getUdpPort());
                     LOG.info("adding service {} host:{} tcpPort:{} httpPort:{} wsPort:{} udpPort:{}", si.getId(),
                             pl.getHost(), pl.getTcpPort(), pl.getHttpPort(), pl.getWsPort(), pl.getUdpPort());
                     tbh.setBalancerConfig(balancerConfig);
@@ -276,8 +286,7 @@ public class BalancedMetricResolver implements MetricResolver {
                 balancerLock.writeLock().unlock();
             }
 
-            final ServiceCache<ServerDetails> serviceCache = discovery.serviceCacheBuilder().name("timely-server")
-                    .build();
+            final ServiceCache serviceCache = discovery.serviceCacheBuilder().name("timely-server").build();
             ServiceCacheListener listener = new ServiceCacheListener() {
 
                 @Override
@@ -285,13 +294,12 @@ public class BalancedMetricResolver implements MetricResolver {
                     boolean rebalanceNeeded = false;
                     balancerLock.writeLock().lock();
                     try {
-                        List<ServiceInstance<ServerDetails>> instances = serviceCache.getInstances();
+                        List<ServiceInstance> instances = serviceCache.getInstances();
                         Set<TimelyBalancedHost> availableHosts = new HashSet<>();
-                        for (ServiceInstance<ServerDetails> si : instances) {
+                        for (ServiceInstance si : instances) {
                             ServerDetails pl = (ServerDetails) si.getPayload();
                             TimelyBalancedHost tbh = TimelyBalancedHost.of(pl.getHost(), pl.getTcpPort(),
-                                    pl.getHttpPort(), pl.getWsPort(), pl.getUdpPort(),
-                                    new ArrivalRate(arrivalRateExecutor));
+                                    pl.getHttpPort(), pl.getWsPort(), pl.getUdpPort());
                             tbh.setBalancerConfig(balancerConfig);
                             availableHosts.add(tbh);
                         }
@@ -333,16 +341,14 @@ public class BalancedMetricResolver implements MetricResolver {
                                 assignMetric(s, h);
                                 LOG.debug("Assigned server removed.  Assigning {} to server {}:{}", s, h.getTcpPort());
                             }
+                            writeAssigmentsToHdfs();
                         }
 
                     } finally {
                         balancerLock.writeLock().unlock();
                     }
-                    if (isLeader.get()) {
-                        if (rebalanceNeeded) {
-                            balance();
-                        }
-                        writeAssignmentsToHdfs();
+                    if (isLeader.get() && rebalanceNeeded) {
+                        balance();
                     }
                 }
 
@@ -636,10 +642,7 @@ public class BalancedMetricResolver implements MetricResolver {
                 }
 
                 try {
-                    boolean acquired = false;
-                    while (!acquired) {
-                        acquired = nonCachedMetricsIPRWLock.writeLock().acquire(60, TimeUnit.SECONDS);
-                    }
+                    nonCachedMetricsIPRWLock.writeLock().acquire();
                     byte[] currentNonCachedMetricsDistributedBytes = nonCachedMetricsIP.get().postValue();
                     Set<String> currentNonCachedMetricsIP;
                     if (currentNonCachedMetricsDistributedBytes == null) {
@@ -686,7 +689,7 @@ public class BalancedMetricResolver implements MetricResolver {
             try {
                 lock.writeLock().release();
             } catch (Exception e3) {
-                LOG.error(e3.getMessage(), e3);
+                LOG.error(e3.getMessage());
             }
         }
     }
@@ -740,7 +743,7 @@ public class BalancedMetricResolver implements MetricResolver {
             if (chooseMetricSpecificHost) {
                 ArrivalRate rate = metricMap.get(metric);
                 if (rate == null) {
-                    rate = new ArrivalRate(arrivalRateExecutor);
+                    rate = new ArrivalRate(arrivalRateTimer);
                     if (!balancerLock.isWriteLockedByCurrentThread()) {
                         balancerLock.readLock().unlock();
                         balancerLock.writeLock().lock();
@@ -871,44 +874,11 @@ public class BalancedMetricResolver implements MetricResolver {
         return tbh;
     }
 
-    private void createAssignmentFile() {
-        try {
-            LOG.info("Creating assignment file: " + balancerConfig.getAssignmentFile());
-            Configuration configuration = new Configuration();
-            FileSystem fs = FileSystem.get(configuration);
-            Path assignmentFile = new Path(balancerConfig.getAssignmentFile());
-            fs.create(assignmentFile);
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-        }
-    }
-
-    private void readAssignmentsFromHdfs(boolean checkIfNecessary) {
-
-        try {
-            long lastLocalUpdate = assignmentsLastUpdatedLocal.get();
-            long lastHdfsUpdate = assignmentsLastUpdatedInHdfs.get().postValue();
-            if (checkIfNecessary) {
-                if (lastHdfsUpdate <= lastLocalUpdate) {
-                    LOG.debug("Not reading assignments from hdfs lastHdfsUpdate ({}) <= lastLocalUpdate ({})",
-                            new Date(lastHdfsUpdate), new Date(lastLocalUpdate));
-                    return;
-                }
-            }
-            LOG.debug("Reading assignments from hdfs lastHdfsUpdate ({}) > lastLocalUpdate ({})",
-                    new Date(lastHdfsUpdate), new Date(lastLocalUpdate));
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-        }
-
-        // proceed with reading from HDFS
+    private void readAssignmentsFromHdfs() {
 
         Map<String, TimelyBalancedHost> assignedMetricToHostMap = new TreeMap<>();
         try {
-            boolean acquired = false;
-            while (!acquired) {
-                acquired = assignmentsIPRWLock.readLock().acquire(60, TimeUnit.SECONDS);
-            }
+            assignmentsIPRWLock.readLock().acquire();
             balancerLock.writeLock().lock();
             Configuration configuration = new Configuration();
             FileSystem fs = FileSystem.get(configuration);
@@ -941,14 +911,8 @@ public class BalancedMetricResolver implements MetricResolver {
 
             metricToHostMap.clear();
             for (Map.Entry<String, TimelyBalancedHost> e : assignedMetricToHostMap.entrySet()) {
-                if (StringUtils.isNotBlank(e.getKey()) && e.getValue() != null) {
-                    if (shouldCache(e.getKey())) {
-                        metricToHostMap.put(e.getKey(), e.getValue());
-                    }
-                } else {
-                    Exception e1 = new IllegalStateException(
-                            "Bad assignment metric:" + e.getKey() + " host:" + e.getValue());
-                    LOG.warn(e1.getMessage(), e1);
+                if (shouldCache(e.getKey())) {
+                    metricToHostMap.put(e.getKey(), e.getValue());
                 }
             }
 
@@ -967,9 +931,6 @@ public class BalancedMetricResolver implements MetricResolver {
             assignmentsLastUpdatedLocal.set(assignmentsLastUpdatedInHdfs.get().postValue());
             LOG.info("Read {} assignments from hdfs lastHdfsUpdate = lastLocalUpdate ({})", metricToHostMap.size(),
                     new Date(assignmentsLastUpdatedLocal.get()));
-        } catch (FileNotFoundException e) {
-            createAssignmentFile();
-            metricToHostMap.clear();
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
         } finally {
@@ -982,14 +943,11 @@ public class BalancedMetricResolver implements MetricResolver {
         }
     }
 
-    private void writeAssignmentsToHdfs() {
+    private void writeAssigmentsToHdfs() {
 
         CsvWriter writer = null;
         try {
-            boolean acquired = false;
-            while (!acquired) {
-                acquired = assignmentsIPRWLock.writeLock().acquire(60, TimeUnit.SECONDS);
-            }
+            assignmentsIPRWLock.writeLock().acquire();
             balancerLock.readLock().lock();
             nonCachedMetricsLocalLock.readLock().lock();
             try {
@@ -1047,50 +1005,13 @@ public class BalancedMetricResolver implements MetricResolver {
 
     private void assignMetric(String metric, TimelyBalancedHost tbh) {
         if (isLeader.get()) {
-            if (StringUtils.isNotBlank(metric) && tbh != null) {
-                balancerLock.writeLock().lock();
-                try {
-                    metricToHostMap.put(metric, tbh);
-                    assignmentsLastUpdatedLocal.set(System.currentTimeMillis());
-                } finally {
-                    balancerLock.writeLock().unlock();
-                }
-            } else {
-                Exception e = new IllegalStateException("Bad assignment metric:" + metric + " host:" + tbh);
-                LOG.warn(e.getMessage(), e);
+            balancerLock.writeLock().lock();
+            try {
+                metricToHostMap.put(metric, tbh);
+                assignmentsLastUpdatedLocal.set(System.currentTimeMillis());
+            } finally {
+                balancerLock.writeLock().unlock();
             }
         }
     }
-
-    @Override
-    public void close() throws Exception {
-
-        this.assignmentExecutor.shutdown();
-        try {
-            this.assignmentExecutor.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-
-        } finally {
-            if (!this.assignmentExecutor.isTerminated()) {
-                this.assignmentExecutor.shutdownNow();
-            }
-        }
-
-        this.arrivalRateExecutor.shutdown();
-        try {
-            this.arrivalRateExecutor.awaitTermination(5, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-
-        } finally {
-            if (!this.arrivalRateExecutor.isTerminated()) {
-                this.arrivalRateExecutor.shutdownNow();
-            }
-        }
-
-        try {
-            this.healthChecker.close();
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-        }
-    }
 }

balancer/src/main/java/timely/balancer/resolver/MetricResolver.java

@@ -7,6 +7,4 @@ public interface MetricResolver {
     public TimelyBalancedHost getHostPortKeyIngest(String metric);
 
     public TimelyBalancedHost getHostPortKey(String metric);
-
-    public void close() throws Exception;
 }

client/pom.xml

@@ -4,13 +4,12 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.3.0</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>timely-client</artifactId>
   <properties>
     <!-- PEP 440 compliant version gets substituted into src/main/python/template/setup.py -->
-    <!-- use .dev0 instead of -SNAPSHOT -->
-    <python.client.version>1.3.0</python.client.version>
+    <python.client.version>1.2.3</python.client.version>
   </properties>
   <dependencies>
     <dependency>

client/src/main/java/timely/client/tcp/TcpClient.java

@@ -1,8 +1,7 @@
 package timely.client.tcp;
 
-import java.io.BufferedWriter;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.net.Socket;
 
 import org.slf4j.Logger;
@@ -15,7 +14,7 @@ public class TcpClient implements AutoCloseable {
     private final String host;
     private final int port;
     private Socket sock = null;
-    private BufferedWriter out = null;
+    private PrintWriter out = null;
     private long connectTime = 0L;
     private long backoff = 2000;
     private int bufferSize = -1;
@@ -48,6 +47,7 @@ public class TcpClient implements AutoCloseable {
      * 
      * @param metric
      *            newline terminated string representation of Timely metric
+     * @throws IOException
      */
     public synchronized void write(String metric) throws IOException {
         if (connect() != 0) {
@@ -60,7 +60,7 @@ public class TcpClient implements AutoCloseable {
         }
     }
 
-    public synchronized void flush() throws IOException {
+    public synchronized void flush() {
         if (null != out) {
             out.flush();
             writesSinceFlush = 0;
@@ -94,12 +94,12 @@ public class TcpClient implements AutoCloseable {
     }
 
     private synchronized int connect() {
-        if (null == sock || !sock.isConnected()) {
+        if (null == sock || !sock.isConnected() || out.checkError()) {
             if (System.currentTimeMillis() > (connectTime + backoff)) {
                 try {
                     connectTime = System.currentTimeMillis();
                     sock = new Socket(host, port);
-                    out = new BufferedWriter(new OutputStreamWriter(sock.getOutputStream()));
+                    out = new PrintWriter(sock.getOutputStream(), false);
                     backoff = 2000;
                     LOG.trace("Connected to Timely at {}:{}", host, port);
                 } catch (IOException e) {

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

@@ -2,6 +2,7 @@ package timely.model;
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
+import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.HashSet;
 import java.util.Set;
@@ -61,6 +62,7 @@ public interface ObjectSizeOf {
          * ObjectSizeOf interface and if implemented on the object will use that.
          * Otherwise it will do a simple navigation of the fields using reflection.
          *
+         * @param o
          * @return an approximation of the object size
          */
         public static long getObjectSize(Object o, boolean useSizeInBytesMethod, boolean debug) {
@@ -86,8 +88,15 @@ public interface ObjectSizeOf {
                     visited.add(oi);
                     try {
                         if (useSizeInBytesMethod) {
-                            if (o instanceof ObjectSizeOf) {
-                                size = ((ObjectSizeOf) o).sizeInBytes();
+                            try {
+                                if (o instanceof ObjectSizeOf) {
+                                    size = ((ObjectSizeOf) o).sizeInBytes();
+                                } else {
+                                    Method sizeInBytes = o.getClass().getMethod("sizeInBytes", (Class<?>[]) null);
+                                    size = (Long) sizeInBytes.invoke(o);
+                                }
+                            } catch (Throwable t) {
+                                // ok, lets do this the hard way...
                             }
                         }
                         if (size == 0) {

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

@@ -77,6 +77,8 @@ public class Tag implements Comparable<Tag>, Serializable {
 
     /**
      * Joins key and value into key=value
+     * 
+     * @return
      */
     public String join() {
         return tagParser.combine(this);

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

@@ -47,6 +47,7 @@ public class TagListParser implements Parser<List<Tag>>, Combiner<Collection<Tag
      * An alternative combiner for a map of string to string instead of a list of
      * tags
      * 
+     * @param tags
      * @return string representation
      */
     public String combine(Map<String, String> tags) {

client/src/main/spotbugs/excludes.xml

@@ -5,9 +5,4 @@
     <Method name="connect" />
     <Class name="timely.client.tcp.TcpClient"/>
   </Match>
-  <Match>
-    <!-- Must ignore these everywhere, because of a javac byte code generation bug -->
-    <!-- https://github.com/spotbugs/spotbugs/issues/756 -->
-    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
-  </Match>
 </FindBugsFilter>

client/src/test/java/timely/api/SerializationTest.java

@@ -47,9 +47,9 @@ public class SerializationTest {
         testSerialization(remove);
     }
 
+    @SuppressWarnings("unchecked")
     private <T> void testSerialization(T o) throws Exception {
         String ser = mapper.writeValueAsString(o);
-        @SuppressWarnings("unchecked")
         T des = mapper.readValue(ser, (Class<T>) o.getClass());
         Assert.assertEquals(o, des);
     }

collectd-nsq-plugin/pom.xml

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

collectd-nsq-plugin/src/main/java/timely/collectd/plugin/PooledCloseableHttpClientFactory.java

@@ -10,7 +10,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.collectd.api.OConfigItem;
 
-public class PooledCloseableHttpClientFactory implements PooledObjectFactory<CloseableHttpClient> {
+public class PooledCloseableHttpClientFactory implements PooledObjectFactory {
 
     private int connectionRequestTimeout = 10000; // 10 seconds in milliseconds
     private int connectTimeout = 30000; // 30 seconds in milliseconds
@@ -43,19 +43,19 @@ public class PooledCloseableHttpClientFactory implements PooledObjectFactory<Clo
     }
 
     @Override
-    public PooledObject<CloseableHttpClient> makeObject() throws Exception {
+    public PooledObject makeObject() throws Exception {
         RequestConfig requestConfig = RequestConfig.custom().setConnectionRequestTimeout(connectionRequestTimeout)
                 .setConnectTimeout(connectTimeout).setSocketTimeout(socketTimeout).build();
         HttpClientBuilder builder = HttpClientBuilder.create();
         builder.setDefaultRequestConfig(requestConfig);
         builder.setConnectionTimeToLive(connectionTimeToLive, TimeUnit.MILLISECONDS);
-        return new DefaultPooledObject<>(builder.build());
+        return new DefaultPooledObject(builder.build());
     }
 
     @Override
-    public void destroyObject(PooledObject<CloseableHttpClient> pooledObject) throws Exception {
+    public void destroyObject(PooledObject pooledObject) throws Exception {
         try {
-            pooledObject.getObject().close();
+            ((CloseableHttpClient) pooledObject.getObject()).close();
         } catch (Exception e) {
             // do nothing
         } finally {
@@ -65,17 +65,17 @@ public class PooledCloseableHttpClientFactory implements PooledObjectFactory<Clo
     }
 
     @Override
-    public boolean validateObject(PooledObject<CloseableHttpClient> pooledObject) {
+    public boolean validateObject(PooledObject pooledObject) {
         return pooledObject.getObject() != null;
     }
 
     @Override
-    public void activateObject(PooledObject<CloseableHttpClient> pooledObject) throws Exception {
+    public void activateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 
     @Override
-    public void passivateObject(PooledObject<CloseableHttpClient> pooledObject) throws Exception {
+    public void passivateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 

collectd-nsq-plugin/src/main/java/timely/collectd/plugin/WriteNSQPlugin.java

@@ -47,7 +47,6 @@ public class WriteNSQPlugin extends CollectDPluginParent
         Collectd.registerWrite(WriteNSQPlugin.class.getName(), this);
     }
 
-    @Override
     public int write(ValueList vl) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         DataOutputStream out = new DataOutputStream(baos);
@@ -111,17 +110,15 @@ public class WriteNSQPlugin extends CollectDPluginParent
         }
     }
 
-    @Override
     public int shutdown() {
         Collectd.logInfo("Shutting down connection to NSQ at " + host + ":" + port);
         clientPool.close();
         return 0;
     }
 
-    @Override
     public int config(OConfigItem config) {
         super.config(config);
-        GenericObjectPoolConfig<CloseableHttpClient> poolConfig = new GenericObjectPoolConfig<>();
+        GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
         // use max size for maxTotal and maxIdle
         // no need to activate or passivate
         poolConfig.setMaxTotal(POOL_MAX_SIZE);
@@ -159,7 +156,7 @@ public class WriteNSQPlugin extends CollectDPluginParent
             Collectd.logError("NSQ host, port, and topic must be configured");
             return -1;
         }
-        this.clientPool = new GenericObjectPool<>(pooledCloseableHttpClientFactory, poolConfig);
+        this.clientPool = new GenericObjectPool(pooledCloseableHttpClientFactory, poolConfig);
         this.endpoint = "http://" + host + ":" + port + "/mpub?topic=" + topic;
         return 0;
     }

collectd-plugin-parent/pom.xml

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

collectd-timely-plugin/pom.xml

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

collectd-timely-plugin/src/main/java/timely/collectd/plugin/PooledSocketFactory.java

@@ -8,7 +8,7 @@ import org.apache.commons.pool2.impl.DefaultPooledObject;
 import org.collectd.api.Collectd;
 import org.collectd.api.OConfigItem;
 
-public class PooledSocketFactory implements PooledObjectFactory<Socket> {
+public class PooledSocketFactory implements PooledObjectFactory {
 
     private String host = null;
     private int port = 0;
@@ -81,12 +81,12 @@ public class PooledSocketFactory implements PooledObjectFactory<Socket> {
     }
 
     @Override
-    public PooledObject<Socket> makeObject() throws Exception {
-        return new DefaultPooledObject<>(connect());
+    public PooledObject makeObject() throws Exception {
+        return new DefaultPooledObject(connect());
     }
 
     @Override
-    public void destroyObject(PooledObject<Socket> pooledObject) throws Exception {
+    public void destroyObject(PooledObject pooledObject) throws Exception {
         try {
             Collectd.logDebug("Shutting down connection to Timely at " + host + ":" + port);
             Socket socket = (Socket) pooledObject.getObject();
@@ -103,7 +103,7 @@ public class PooledSocketFactory implements PooledObjectFactory<Socket> {
     }
 
     @Override
-    public boolean validateObject(PooledObject<Socket> pooledObject) {
+    public boolean validateObject(PooledObject pooledObject) {
         if (connectionTimeToLive > -1) {
             if (System.currentTimeMillis() > pooledObject.getCreateTime() + connectionTimeToLive) {
                 return false;
@@ -114,12 +114,12 @@ public class PooledSocketFactory implements PooledObjectFactory<Socket> {
     }
 
     @Override
-    public void activateObject(PooledObject<Socket> pooledObject) throws Exception {
+    public void activateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 
     @Override
-    public void passivateObject(PooledObject<Socket> pooledObject) throws Exception {
+    public void passivateObject(PooledObject pooledObject) throws Exception {
         // do nothing
     }
 }

collectd-timely-plugin/src/main/java/timely/collectd/plugin/WriteTimelyPlugin.java

@@ -86,13 +86,13 @@ public class WriteTimelyPlugin extends CollectDPluginParent
         PooledSocketFactory socketFactory = new PooledSocketFactory();
         retval = socketFactory.config(config);
         if (retval == 0) {
-            GenericObjectPoolConfig<Socket> poolConfig = new GenericObjectPoolConfig<>();
+            GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
             // use max size for maxTotal and maxIdle
             // no need to activate and passivate
             poolConfig.setMaxTotal(POOL_MAX_SIZE);
             poolConfig.setMaxIdle(POOL_MAX_SIZE);
             poolConfig.setTestOnReturn(true);
-            socketPool = new GenericObjectPool<>(socketFactory, poolConfig);
+            socketPool = new GenericObjectPool(socketFactory, poolConfig);
         }
         return retval;
     }

common/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.3.0</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>timely-common</artifactId>
   <dependencies>

grafana-auth/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.3.0</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>grafana-auth</artifactId>
   <dependencies>
@@ -166,6 +166,7 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-tcnative-boringssl-static</artifactId>
+      <version>${version.netty-tcnative}</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

grafana-auth/src/main/java/timely/grafana/auth/GrafanaAuth.java

@@ -81,11 +81,8 @@ public class GrafanaAuth {
         this.grafanaAuthConfig = grafanaAuthConfig;
     }
 
-    protected static ConfigurableApplicationContext initializeContext(String[] args) {
-        SpringApplicationBuilder builder = new SpringApplicationBuilder(SpringBootstrap.class);
-        builder.web(WebApplicationType.NONE);
-        builder.registerShutdownHook(false);
-        return builder.run(args);
+    protected static ConfigurableApplicationContext initializeConfiguration(String[] args) {
+        return new SpringApplicationBuilder(SpringBootstrap.class).web(WebApplicationType.NONE).run(args);
     }
 
     private void shutdownHook() {
@@ -112,11 +109,13 @@ public class GrafanaAuth {
             try {
                 f.get();
             } catch (final Exception e) {
-                LOG.error("Channel:" + f.channel().config() + " -> " + e.getMessage(), e);
+                LOG.error("Error while shutting down channel: {}", f.channel().config());
+                LOG.error("{}", e.getMessage());
+                e.printStackTrace();
             }
         });
 
-        int quietPeriod = grafanaAuthConfig.getShutdownQuietPeriod();
+        Integer quietPeriod = grafanaAuthConfig.getShutdownQuietPeriod();
         List<Future<?>> groupFutures = new ArrayList<>();
 
         if (httpBossGroup != null) {
@@ -133,7 +132,9 @@ public class GrafanaAuth {
             try {
                 f.get();
             } catch (final Exception e) {
-                LOG.error("Group:" + f.toString() + " -> " + e.getMessage(), e);
+                LOG.error("Error while shutting down group: {}", f.toString());
+                LOG.error("{}", e.getMessage());
+                e.printStackTrace();
             }
         });
 
@@ -271,13 +272,12 @@ public class GrafanaAuth {
 
     public static void main(String[] args) throws Exception {
 
-        GrafanaAuth.applicationContext = GrafanaAuth.initializeContext(args);
-        GrafanaAuthConfiguration grafanaAuthConf = GrafanaAuth.applicationContext
-                .getBean(GrafanaAuthConfiguration.class);
+        GrafanaAuth.applicationContext = GrafanaAuth.initializeConfiguration(args);
+        GrafanaAuthConfiguration balancerConf = applicationContext.getBean(GrafanaAuthConfiguration.class);
 
-        GrafanaAuth grafanaAuth = new GrafanaAuth(grafanaAuthConf);
+        GrafanaAuth b = new GrafanaAuth(balancerConf);
         try {
-            grafanaAuth.run();
+            b.run();
             LATCH.await();
         } catch (final InterruptedException e) {
             LOG.info("Server shutting down.");
@@ -285,7 +285,7 @@ public class GrafanaAuth {
             LOG.error("Error running server.", e);
         } finally {
             try {
-                grafanaAuth.shutdown();
+                b.shutdown();
             } catch (Exception e) {
                 System.exit(1);
             }
@@ -314,8 +314,7 @@ public class GrafanaAuth {
                 ch.pipeline().addLast("fileServer", new HttpStaticFileServerHandler());
                 ch.pipeline().addLast("login", new X509LoginRequestHandler(config.getSecurity(), config.getHttp()));
                 ch.pipeline().addLast("httpRelay", new GrafanaRelayHandler(config, httpClientPool));
-                ch.pipeline().addLast("error", new TimelyExceptionHandler()
-                        .setIgnoreSslHandshakeErrors(config.getSecurity().getServerSsl().isUseGeneratedKeypair()));
+                ch.pipeline().addLast("error", new TimelyExceptionHandler());
             }
         };
     }

grafana-auth/src/main/java/timely/grafana/auth/configuration/GrafanaAuthConfiguration.java

@@ -43,6 +43,8 @@ public class GrafanaAuthConfiguration {
     /**
      * Time to wait (in seconds) for connections to finish and to make sure no new
      * connections happen before shutting down Netty event loop groups.
+     *
+     * @return
      */
     public int getShutdownQuietPeriod() {
         return this.shutdownQuietPeriod;

grafana-auth/src/main/java/timely/grafana/auth/netty/http/GrafanaRelayHandler.java

@@ -1,6 +1,6 @@
 package timely.grafana.auth.netty.http;
 
-import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
+import static io.netty.handler.codec.http.HttpHeaders.Names.CONTENT_LENGTH;
 
 import java.io.ByteArrayOutputStream;
 import java.net.URLEncoder;
@@ -71,7 +71,7 @@ public class GrafanaRelayHandler extends SimpleChannelInboundHandler<HttpRequest
         try {
             try {
                 request = msg.getHttpRequest();
-                String originalURI = request.uri();
+                String originalURI = request.getUri();
                 originalURI = encodeURI(originalURI);
 
                 if (msg instanceof GrafanaRequest) {
@@ -87,42 +87,42 @@ public class GrafanaRelayHandler extends SimpleChannelInboundHandler<HttpRequest
                 String protocol = config.getGrafana().getProtocol();
                 String host = config.getGrafana().getHost();
                 Integer port = config.getGrafana().getPort();
-                k = TimelyBalancedHost.of(host, -1, port, -1, -1, null);
+                k = TimelyBalancedHost.of(host, -1, port, -1, -1);
                 client = httpClientPool.borrowObject(k);
                 Multimap<String, String> headers = HttpHeaderUtils.toMultimap(request.headers());
 
                 // If incoming user sets these headers, do not relay them
-                headers.removeAll("x-webauth-user");
-                headers.removeAll("x-webauth-name");
+                headers.removeAll("X-WEBAUTH-USER");
+                headers.removeAll("X-WEBAUTH-NAME");
                 TimelyPrincipal principal = token.getTimelyPrincipal();
                 TimelyUser user = principal.getPrimaryUser();
                 String subjectDn = user.getDn().subjectDN();
                 String userName = DnUtils.getCommonName(subjectDn);
                 String loginName = DnUtils.getShortName(subjectDn);
-                headers.put("x-webauth-user", loginName);
-                headers.put("x-webauth-name", userName);
+                headers.put("X-WEBAUTH-USER", loginName);
+                headers.put("X-WEBAUTH-NAME", userName);
                 List<Header> relayedHeaderList = new ArrayList<>();
                 for (Map.Entry<String, String> h : headers.entries()) {
-                    if (!h.getKey().equals(CONTENT_LENGTH.toString())) {
+                    if (!h.getKey().equals(CONTENT_LENGTH)) {
                         relayedHeaderList.add(new BasicHeader(h.getKey(), h.getValue()));
                     }
                 }
                 Header[] headerArray = new Header[relayedHeaderList.size()];
                 relayedHeaderList.toArray(headerArray);
                 relayURI = protocol + "://" + host + ":" + port + originalURI;
-                if (request.method().equals(HttpMethod.HEAD)) {
+                if (request.getMethod().equals(HttpMethod.HEAD)) {
                     HttpHead relayedRequest = new HttpHead(relayURI);
                     if (headerArray.length > 0) {
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.GET)) {
+                } else if (request.getMethod().equals(HttpMethod.GET)) {
                     HttpGet relayedRequest = new HttpGet(relayURI);
                     if (headerArray.length > 0) {
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.POST)) {
+                } else if (request.getMethod().equals(HttpMethod.POST)) {
                     HttpPost relayedRequest = new HttpPost(relayURI);
                     String content = request.content().toString(StandardCharsets.UTF_8);
                     StringEntity entity = new StringEntity(content);
@@ -131,7 +131,7 @@ public class GrafanaRelayHandler extends SimpleChannelInboundHandler<HttpRequest
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.PUT)) {
+                } else if (request.getMethod().equals(HttpMethod.PUT)) {
                     HttpPut relayedRequest = new HttpPut(relayURI);
                     String content = request.content().toString(StandardCharsets.UTF_8);
                     StringEntity entity = new StringEntity(content);
@@ -140,13 +140,13 @@ public class GrafanaRelayHandler extends SimpleChannelInboundHandler<HttpRequest
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.DELETE)) {
+                } else if (request.getMethod().equals(HttpMethod.DELETE)) {
                     HttpDelete relayedRequest = new HttpDelete(relayURI);
                     if (headerArray.length > 0) {
                         relayedRequest.setHeaders(headerArray);
                     }
                     relayedResponse = client.execute(relayedRequest);
-                } else if (request.method().equals(HttpMethod.OPTIONS)) {
+                } else if (request.getMethod().equals(HttpMethod.OPTIONS)) {
                     HttpOptions relayedRequest = new HttpOptions(relayURI);
                     if (headerArray.length > 0) {
                         relayedRequest.setHeaders(headerArray);
@@ -199,7 +199,7 @@ public class GrafanaRelayHandler extends SimpleChannelInboundHandler<HttpRequest
             if (client != null && k != null) {
                 httpClientPool.returnObject(k, client);
             } else {
-                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().uri());
+                LOG.error("NOT RETURNING CONNECTION! " + msg.getHttpRequest().getUri());
             }
         }
     }

grafana-auth/src/main/java/timely/grafana/auth/netty/http/GrafanaRequestDecoder.java

@@ -8,7 +8,7 @@ import com.google.common.collect.Multimap;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
 import io.netty.handler.codec.http.FullHttpRequest;
-import io.netty.handler.codec.http.HttpHeaderNames;
+import io.netty.handler.codec.http.HttpHeaders.Names;
 import io.netty.handler.codec.http.QueryStringDecoder;
 import io.netty.handler.codec.http.cookie.ServerCookieDecoder;
 import org.apache.commons.lang3.StringUtils;
@@ -47,7 +47,7 @@ public class GrafanaRequestDecoder extends MessageToMessageDecoder<FullHttpReque
 
     public static String getSessionId(FullHttpRequest msg) {
         Multimap<String, String> headers = HttpHeaderUtils.toMultimap(msg.headers());
-        Collection<String> cookies = headers.get(HttpHeaderNames.COOKIE.toString());
+        Collection<String> cookies = headers.get(Names.COOKIE);
         final StringBuilder buf = new StringBuilder();
         cookies.forEach(h -> {
             ServerCookieDecoder.STRICT.decode(h).forEach(c -> {
@@ -70,7 +70,7 @@ public class GrafanaRequestDecoder extends MessageToMessageDecoder<FullHttpReque
 
         LOG.trace(LOG_RECEIVED_REQUEST, msg);
 
-        final String uri = msg.uri();
+        final String uri = msg.getUri();
         final QueryStringDecoder decoder = new QueryStringDecoder(uri);
         if (decoder.path().equals(nonSecureRedirectAddress)) {
             out.add(new StrictTransportResponse());

grafana/assembly.xml

@@ -7,7 +7,7 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>timely-app/dist</directory>
+      <directory>timely-app</directory>
       <outputDirectory>timely-app</outputDirectory>
     </fileSet>
   </fileSets>

grafana/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>timely</groupId>
     <artifactId>timely</artifactId>
-    <version>1.3.0</version>
+    <version>1.2.3</version>
   </parent>
   <artifactId>timely-app</artifactId>
   <packaging>pom</packaging>

grafana/timely-app/Gruntfile.js

@@ -0,0 +1,65 @@
+module.exports = function(grunt) {
+
+  require('load-grunt-tasks')(grunt);
+
+  grunt.loadNpmTasks('grunt-execute');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+
+  grunt.initConfig({
+
+    clean: ["dist"],
+
+    copy: {
+      src_to_dist: {
+        cwd: 'src',
+        expand: true,
+        src: ['**/*', '!**/*.js', '!**/*.scss'],
+        dest: 'dist'
+      },
+      img_to_dist: {
+        cwd: 'src',
+        expand: true,
+        src: ['img/*'],
+        dest: 'dist/src/'
+      },
+      pluginDef: {
+        expand: true,
+        src: ['plugin.json', 'README.md'],
+        dest: 'dist',
+      }
+    },
+    watch: {
+      rebuild_all: {
+        files: ['src/**/*', 'plugin.json', 'README.md'],
+        tasks: ['default'],
+        options: {spawn: false}
+      },
+    },
+
+    babel: {
+      options: {
+        sourceMap: true,
+        presets:  ["es2015"],
+        plugins: ['transform-es2015-modules-systemjs', "transform-es2015-for-of"],
+      },
+      dist: {
+        files: [{
+          cwd: 'src',
+          expand: true,
+          src: ['**/*.js'],
+          dest: 'dist',
+          ext:'.js'
+        }]
+      },
+    }
+
+  });
+
+  grunt.registerTask('default',
+  ['clean',
+  'copy:src_to_dist',
+  'copy:pluginDef',
+  'copy:img_to_dist',
+  'babel'
+]);
+};

grafana/timely-app/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

grafana/timely-app/Magefile.go

@@ -1,18 +0,0 @@
-//+build mage
-
-package main
-
-import (
-	"fmt"
-
-	// mage:import
-	_ "github.com/grafana/grafana-plugin-sdk-go/build"
-)
-
-// CheckCheck builds production back-end components.
-func CheckCheck() {
-	fmt.Println("hello! TODO.... (the other commands are imported)")
-}
-
-// Default configures the default target.
-var Default = CheckCheck

grafana/timely-app/README.md

@@ -1,6 +1,3 @@
-# Timely Data Source Plugin
+# Timely
 
-Timely is a time series database application that provides secure access to time 
-series data. Timely is written in Java, uses 
-[Apache Accumulo](https://accumulo.apache.org/) for backend storage, and has 
-a configurable length memory cache.
+Timely: a scalable, distributed, **secure** time series database.

grafana/timely-app/appveyor.yml

@@ -1,26 +0,0 @@
-# Test against the latest version of this Node.js version
-environment:
-  nodejs_version: "10"
-
-# Local NPM Modules
-cache:
-  - node_modules
-
-# Install scripts. (runs after repo cloning)
-install:
-  # Get the latest stable version of Node.js or io.js
-  - ps: Install-Product node $env:nodejs_version
-  # install modules
-  - npm install -g yarn --quiet
-  - yarn install --pure-lockfile
-
-# Post-install test scripts.
-test_script:
-  # Output useful info for debugging.
-  - node --version
-  - npm --version
-
-# Run the build
-build_script:
-  - yarn dev   # This will also run prettier!
-  - yarn build # make sure both scripts work

grafana/timely-app/dist/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright {yyyy} {name of copyright owner}
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

grafana/timely-app/dist/README.md

@@ -1,6 +1,3 @@
-# Timely Data Source Plugin
+# Timely
 
-Timely is a time series database application that provides secure access to time 
-series data. Timely is written in Java, uses 
-[Apache Accumulo](https://accumulo.apache.org/) for backend storage, and has 
-a configurable length memory cache.
+Timely: a scalable, distributed, **secure** time series database.

grafana/timely-app/dist/components/annotations.editor.html

@@ -0,0 +1,10 @@
+<div class="gf-form-group">
+  <div class="gf-form">
+    <span class="gf-form-label width-13">OpenTSDB metrics query</span>
+    <input type="text" class="gf-form-input" ng-model='ctrl.annotation.target' placeholder="events.eventname"></input>
+  </div>
+  <div class="gf-form">
+    <span class="gf-form-label width-13">Show Global Annotations?</span>
+    <editor-checkbox text="" model="ctrl.annotation.isGlobal"></editor-checkbox>
+  </div>
+</div>

grafana/timely-app/dist/components/auths.html

@@ -0,0 +1,52 @@
+
+<div class="page-header">
+  <h1>Timely Login</h1>
+</div>
+
+<div ng-if="ctrl.datasources.length === 0">
+  <h4>No Timely datasources are defined.</h4>
+  <i><a href="datasources/new">Create one</a></i>
+</div>
+
+<div ng-repeat="source in ctrl.datasources" ng-init="d=source" ng-controller="AuthsCtrl as actrl">
+  <div class="gf-box">
+    <div class="gf-box-header p-x-1 p-y-1">
+      <h3 class="">{{d.name}}
+        <span class="pull-right">
+          <h6><i>https://{{d.jsonData.timelyHost}}:{{d.jsonData.httpsPort}}/login</i></h6>
+        </span>
+      </h3>
+    </div>
+
+    <div class="gf-box-body">
+      <div ng-if="d.jsonData.basicAuths" class="p-b-1">
+        <div class="gf-form">
+      		<span class="gf-form-label width-7">
+      			User
+      		</span>
+      		<input id="timlely-user" class="gf-form-input max-width-21" type="text" ng-model='actrl.basicAuthUser' placeholder="user" required></input>
+      	</div>
+
+      	<div class="gf-form">
+      		<span class="gf-form-label width-7">
+      			Password
+      		</span>
+      		<input id="timely-password" class="gf-form-input max-width-21" type="password" ng-model='actrl.basicAuthPassword' placeholder="password" required></input>
+      	</div>
+      </div>
+
+      <div ng-if="actrl.fetching" class="gf-row">
+  			<div class="alert-{{actrl.fetching.status}} alert">
+  				<div class="alert-title">{{actrl.fetching.title}}</div>
+  			</div>
+  		</div>
+
+      <div class="gf-form-button-row center-block">
+        <button type="submit" class="btn btn-success" ng-click="actrl.login(d)">
+          Login
+        </button>
+      </div>
+    </div>
+
+  </div>
+</div>

grafana/timely-app/dist/components/auths.js

@@ -0,0 +1,146 @@
+'use strict';
+
+System.register(['lodash'], function (_export, _context) {
+  "use strict";
+
+  var _, _createClass, AuthsCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }],
+    execute: function () {
+      _createClass = function () {
+        function defineProperties(target, props) {
+          for (var i = 0; i < props.length; i++) {
+            var descriptor = props[i];
+            descriptor.enumerable = descriptor.enumerable || false;
+            descriptor.configurable = true;
+            if ("value" in descriptor) descriptor.writable = true;
+            Object.defineProperty(target, descriptor.key, descriptor);
+          }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+          if (protoProps) defineProperties(Constructor.prototype, protoProps);
+          if (staticProps) defineProperties(Constructor, staticProps);
+          return Constructor;
+        };
+      }();
+
+      _export('AuthsCtrl', AuthsCtrl = function () {
+        function AuthsCtrl(backendSrv, $rootScope, $timeout) {
+          _classCallCheck(this, AuthsCtrl);
+
+          this.$rootScope = $rootScope;
+          this.$timeout = $timeout;
+          this.backendSrv = backendSrv;
+        }
+
+        _createClass(AuthsCtrl, [{
+          key: 'login',
+          value: function login(datasource) {
+            this.fetching = {};
+            this.fetching.done = false;
+            this.fetching.show = true;
+            this.fetching.status = 'warning';
+            this.fetching.title = 'Fetching auths...';
+
+            //this.$rootScope.appEvent('alert-success', ['Authorization Cookie Received', '']);
+            //this.$rootScope.appEvent('alert-error', ['Authorization Failed', '']);
+            //this.$rootScope.appEvent('alert-warning', ['Fetching Authorizations', '']);
+
+            var uri = this._getURI(datasource.jsonData);
+
+            if (datasource.jsonData.basicAuths) {
+              if (this.basicAuthUser && this.basicAuthPassword) {
+                var authBlob = { username: this.basicAuthUser, password: this.basicAuthPassword };
+                this.doPostLogin(uri, authBlob);
+              } else {
+                this.$rootScope.appEvent('alert-warning', [datasource.name, 'requires User/Password']);
+                this.fetching.status = 'warning';
+                this.fetching.title = 'User/Password required';
+
+                return;
+              }
+            } else {
+              this.doGetLogin(uri);
+            }
+          }
+        }, {
+          key: 'doPostLogin',
+          value: function doPostLogin(uri, authBlob) {
+            this.doXHR('POST', uri, authBlob);
+          }
+        }, {
+          key: 'doGetLogin',
+          value: function doGetLogin(uri) {
+            this.doXHR('GET', uri);
+          }
+        }, {
+          key: 'doXHR',
+          value: function doXHR(verb, uri, data) {
+            if (!data) {
+              data = "";
+            }
+            var r = new XMLHttpRequest();
+            r.open(verb, uri, true);
+            r.withCredentials = true;
+            r.setRequestHeader('Content-Type', 'application/json');
+            r.onreadystatechange = function () {
+              this.handleLoginResult(r);
+            }.bind(this);
+            r.send(JSON.stringify(data));
+          }
+        }, {
+          key: 'handleLoginResult',
+          value: function handleLoginResult(response) {
+            // wait for readyState to be '4 => done'
+            if (response.readyState != 4) return;
+
+            this.fetching.done = true;
+
+            switch (response.status) {
+              case 200:
+                var cookie = (document.cookie.match(/^(?:.*;)?TSESSIONID=([^;]+)(?:.*)?$/) || [, null])[1];
+                console.log(cookie);
+                console.log(document.cookie);
+
+                this.fetching.status = 'success';
+                this.fetching.title = 'Login successful';
+                this.$rootScope.appEvent('alert-success', ['Success', '']);
+                break;
+              default:
+                this.fetching.status = 'warning';
+                this.fetching.title = response.statusText;
+                this.$rootScope.appEvent('alert-warning', [response.status + ': ' + response.statusText, '']);
+                break;
+            }
+
+            if (r.readyState != 4 || r.status != 200) return;
+            alert("Success: " + r.getResponseHeader('Set-Cookie'));
+          }
+        }, {
+          key: '_getURI',
+          value: function _getURI(jsonData) {
+            return 'https://' + jsonData.timelyHost + ':' + jsonData.httpsPort + '/login';
+          }
+        }, {
+          key: '_showResults',
+          value: function _showResults() {}
+        }]);
+
+        return AuthsCtrl;
+      }());
+
+      _export('AuthsCtrl', AuthsCtrl);
+    }
+  };
+});
+//# sourceMappingURL=auths.js.map

grafana/timely-app/dist/components/auths.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/components/auths.js"],"names":["_","AuthsCtrl","backendSrv","$rootScope","$timeout","datasource","fetching","done","show","status","title","uri","_getURI","jsonData","basicAuths","basicAuthUser","basicAuthPassword","authBlob","username","password","doPostLogin","appEvent","name","doGetLogin","doXHR","verb","data","r","XMLHttpRequest","open","withCredentials","setRequestHeader","onreadystatechange","handleLoginResult","bind","send","JSON","stringify","response","readyState","cookie","document","match","console","log","statusText","alert","getResponseHeader","timelyHost","httpsPort"],"mappings":"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","file":"auths.js","sourcesContent":["import _ from 'lodash';\n\nexport class AuthsCtrl {\n\n  constructor(backendSrv, $rootScope, $timeout){\n    this.$rootScope = $rootScope;\n    this.$timeout = $timeout;\n    this.backendSrv = backendSrv;\n  }\n\n  login(datasource){\n    this.fetching = {};\n    this.fetching.done = false;\n    this.fetching.show = true;\n    this.fetching.status = 'warning';\n    this.fetching.title = 'Fetching auths...';\n\n    //this.$rootScope.appEvent('alert-success', ['Authorization Cookie Received', '']);\n    //this.$rootScope.appEvent('alert-error', ['Authorization Failed', '']);\n    //this.$rootScope.appEvent('alert-warning', ['Fetching Authorizations', '']);\n\n    var uri = this._getURI(datasource.jsonData);\n\n    if(datasource.jsonData.basicAuths){\n      if( this.basicAuthUser && this.basicAuthPassword){\n        var authBlob = {username: this.basicAuthUser, password: this.basicAuthPassword};\n        this.doPostLogin(uri, authBlob);\n      } else {\n        this.$rootScope.appEvent('alert-warning', [datasource.name, 'requires User/Password']);\n        this.fetching.status = 'warning';\n        this.fetching.title = 'User/Password required';\n\n        return;\n      }\n    } else {\n      this.doGetLogin(uri);\n    }\n\n  }\n\n  doPostLogin(uri, authBlob){\n    this.doXHR('POST', uri, authBlob);\n  }\n\n  doGetLogin(uri){\n    this.doXHR('GET', uri)\n  }\n\n  doXHR(verb, uri, data){\n    if( !data){\n      data = \"\";\n    }\n    var r = new XMLHttpRequest();\n    r.open(verb, uri, true);\n    r.withCredentials = true;\n    r.setRequestHeader('Content-Type', 'application/json');\n    r.onreadystatechange = function () {\n      this.handleLoginResult(r);\n    }.bind(this);\n    r.send(JSON.stringify(data));\n  }\n\n  handleLoginResult(response){\n    // wait for readyState to be '4 => done'\n    if (response.readyState != 4) return;\n\n    this.fetching.done = true;\n\n    switcLine truncated

grafana/timely-app/dist/components/authspage.js

@@ -0,0 +1,80 @@
+'use strict';
+
+System.register(['lodash', 'app/core/core', 'plugins/timely-app/components/auths'], function (_export, _context) {
+  "use strict";
+
+  var _, coreModule, appEvents, AuthsCtrl, _createClass, AuthsPageCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }, function (_appCoreCore) {
+      coreModule = _appCoreCore.coreModule;
+      appEvents = _appCoreCore.appEvents;
+    }, function (_pluginsTimelyAppComponentsAuths) {
+      AuthsCtrl = _pluginsTimelyAppComponentsAuths.AuthsCtrl;
+    }],
+    execute: function () {
+      _createClass = function () {
+        function defineProperties(target, props) {
+          for (var i = 0; i < props.length; i++) {
+            var descriptor = props[i];
+            descriptor.enumerable = descriptor.enumerable || false;
+            descriptor.configurable = true;
+            if ("value" in descriptor) descriptor.writable = true;
+            Object.defineProperty(target, descriptor.key, descriptor);
+          }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+          if (protoProps) defineProperties(Constructor.prototype, protoProps);
+          if (staticProps) defineProperties(Constructor, staticProps);
+          return Constructor;
+        };
+      }();
+
+      _export('AuthsPageCtrl', AuthsPageCtrl = function () {
+        function AuthsPageCtrl(backendSrv, datasourceSrv) {
+          _classCallCheck(this, AuthsPageCtrl);
+
+          this.datasourceSrv = datasourceSrv;
+          this.datasources = this.getTimelyDatasources();
+          coreModule.controller('AuthsCtrl', AuthsCtrl);
+        }
+
+        _createClass(AuthsPageCtrl, [{
+          key: 'getTimelyDatasources',
+          value: function getTimelyDatasources() {
+            var allSources = this.datasourceSrv.getAll();
+
+            var sources = _.map(allSources, function (value, key, col) {
+              var ret = {};
+              ret.meta = {};
+              ret.meta.type = col[key].meta.type;
+              ret.meta.id = col[key].meta.id;
+              ret.name = key;
+              ret.jsonData = col[key].jsonData;
+              return ret;
+            });
+            return _.filter(sources, function (d) {
+              return d.meta.type === 'datasource' && d.meta.id === 'timely-datasource';
+            });
+          }
+        }]);
+
+        return AuthsPageCtrl;
+      }());
+
+      _export('AuthsPageCtrl', AuthsPageCtrl);
+
+      AuthsPageCtrl.templateUrl = 'components/auths.html';
+    }
+  };
+});
+//# sourceMappingURL=authspage.js.map

grafana/timely-app/dist/components/authspage.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/components/authspage.js"],"names":["_","coreModule","appEvents","AuthsCtrl","AuthsPageCtrl","backendSrv","datasourceSrv","datasources","getTimelyDatasources","controller","allSources","getAll","sources","map","value","key","col","ret","meta","type","id","name","jsonData","filter","d","templateUrl"],"mappings":";;;;;;;;;;;;;;;AACOA,O;;AACCC,gB,gBAAAA,U;AAAYC,e,gBAAAA,S;;AACZC,e,oCAAAA,S;;;;;;;;;;;;;;;;;;;;;+BAEKC,a;AAEX,+BAAYC,UAAZ,EAAwBC,aAAxB,EAAsC;AAAA;;AACpC,eAAKA,aAAL,GAAqBA,aAArB;AACA,eAAKC,WAAL,GAAmB,KAAKC,oBAAL,EAAnB;AACAP,qBAAWQ,UAAX,CAAsB,WAAtB,EAAmCN,SAAnC;AACD;;;;iDAEqB;AACpB,gBAAIO,aAAa,KAAKJ,aAAL,CAAmBK,MAAnB,EAAjB;;AAEA,gBAAIC,UAAUZ,EAAEa,GAAF,CAAMH,UAAN,EAAkB,UAASI,KAAT,EAAgBC,GAAhB,EAAqBC,GAArB,EAAyB;AACvD,kBAAIC,MAAM,EAAV;AACAA,kBAAIC,IAAJ,GAAW,EAAX;AACAD,kBAAIC,IAAJ,CAASC,IAAT,GAAgBH,IAAID,GAAJ,EAASG,IAAT,CAAcC,IAA9B;AACAF,kBAAIC,IAAJ,CAASE,EAAT,GAAcJ,IAAID,GAAJ,EAASG,IAAT,CAAcE,EAA5B;AACAH,kBAAII,IAAJ,GAAWN,GAAX;AACAE,kBAAIK,QAAJ,GAAeN,IAAID,GAAJ,EAASO,QAAxB;AACA,qBAAOL,GAAP;AACD,aARa,CAAd;AASA,mBAAOjB,EAAEuB,MAAF,CAASX,OAAT,EAAkB,UAASY,CAAT,EAAW;AAClC,qBAAQA,EAAEN,IAAF,CAAOC,IAAP,KAAgB,YAAhB,IAAgCK,EAAEN,IAAF,CAAOE,EAAP,KAAc,mBAAtD;AACD,aAFM,CAAP;AAGD;;;;;;;;AAGHhB,oBAAcqB,WAAd,GAA4B,uBAA5B","file":"authspage.js","sourcesContent":["\nimport _ from 'lodash';\nimport {coreModule, appEvents} from 'app/core/core';\nimport {AuthsCtrl} from 'plugins/timely-app/components/auths';\n\nexport class AuthsPageCtrl {\n\n  constructor(backendSrv, datasourceSrv){\n    this.datasourceSrv = datasourceSrv;\n    this.datasources = this.getTimelyDatasources();\n    coreModule.controller('AuthsCtrl', AuthsCtrl);\n  }\n\n  getTimelyDatasources(){\n    var allSources = this.datasourceSrv.getAll();\n\n    var sources = _.map(allSources, function(value, key, col){\n      var ret = {};\n      ret.meta = {};\n      ret.meta.type = col[key].meta.type;\n      ret.meta.id = col[key].meta.id;\n      ret.name = key;\n      ret.jsonData = col[key].jsonData;\n      return ret;\n    });\n    return _.filter(sources, function(d){\n      return (d.meta.type === 'datasource' && d.meta.id === 'timely-datasource');\n    });\n  }\n\n}\nAuthsPageCtrl.templateUrl = 'components/auths.html';\n"]}

grafana/timely-app/dist/components/config.html

@@ -0,0 +1,10 @@
+
+<h3 class="page-heading">Timely App Configuration</h3>
+
+<div class="gf-form-group">
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<span class="gf-form-label">Currently, all configuration is done in the Timely datasource.</span>
+		</div>
+	</div>
+</div>

grafana/timely-app/dist/components/config.js

@@ -0,0 +1,27 @@
+'use strict';
+
+System.register([], function (_export, _context) {
+  "use strict";
+
+  var TimelyAppConfigCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [],
+    execute: function () {
+      _export('TimelyAppConfigCtrl', TimelyAppConfigCtrl = function TimelyAppConfigCtrl() {
+        _classCallCheck(this, TimelyAppConfigCtrl);
+      });
+
+      _export('TimelyAppConfigCtrl', TimelyAppConfigCtrl);
+
+      TimelyAppConfigCtrl.templateUrl = 'components/config.html';
+    }
+  };
+});
+//# sourceMappingURL=config.js.map

grafana/timely-app/dist/components/config.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/components/config.js"],"names":["TimelyAppConfigCtrl","templateUrl"],"mappings":";;;;;;;;;;;;;;;;qCACaA,mB,GAEX,+BAAc;AAAA;AAEb,O;;;;AAGHA,0BAAoBC,WAApB,GAAkC,wBAAlC","file":"config.js","sourcesContent":["\nexport class TimelyAppConfigCtrl {\n\n  constructor() {\n    \n  }\n\n}\nTimelyAppConfigCtrl.templateUrl = 'components/config.html';\n"]}

grafana/timely-app/dist/components/metrics.html

@@ -0,0 +1,53 @@
+<div class="page-header">
+  <h1>Metrics Browser</h1>
+</div>
+
+<div ng-hide="ctrl.hasDatasource" >
+  <h4>No Timely datasources are defined.</h4>
+  <i><a href="datasources/new">Create one</a></i>
+</div>
+
+<div class="gf-box" ng-show="ctrl.hasDatasource">
+
+  <div class="gf-box-header">
+    <div class="gf-form-inline">
+    	<div class="gf-form max-width-30">
+    		<span class="gf-label width-7 p-y-1 p-x-1">Datasource</span>
+    		<div class="gf-form-select-wrapper gf-form-select-wrapper--has-help-icon max-width-24">
+    			<select class="gf-form-input"
+            ng-model="ctrl.source"
+            ng-options="d.name for d in ctrl.datasources"
+            ng-change=ctrl.updateDatasource()></select>
+    			<info-popover mode="right-absolute">
+    				Select a Datasource<br>
+    			</info-popover>
+    		</div>
+
+
+    	</div>
+    </div>
+  </div>
+
+  <div class="gf-box-body">
+    <div class="grafana-options-table">
+      <div class="gf-form width-20 pull-right">
+        <input type="text" class="gf-form-input" placeholder="filter" ng-model="searchText">
+        </input>
+      </div>
+
+      <table>
+        <tr>
+          <th>Metric</th>
+          <th>Tags</th>
+        </tr>
+            <tr ng-repeat="metric in ctrl.metrics | filter:searchText">
+              <td>{{metric.metric}}</td>
+              <td class="p-x-1" ng-repeat="tag in metric.tags">
+                {{tag.name}} = {{tag.values}}
+              </td>
+            </tr>
+      </table>
+    </div>
+  </div>
+
+</div>

grafana/timely-app/dist/components/metrics.js

@@ -0,0 +1,124 @@
+'use strict';
+
+System.register(['lodash', 'plugins/timely-app/components/authspage'], function (_export, _context) {
+  "use strict";
+
+  var _, AuthsPageCtrl, _createClass, MetricsPageCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }, function (_pluginsTimelyAppComponentsAuthspage) {
+      AuthsPageCtrl = _pluginsTimelyAppComponentsAuthspage.AuthsPageCtrl;
+    }],
+    execute: function () {
+      _createClass = function () {
+        function defineProperties(target, props) {
+          for (var i = 0; i < props.length; i++) {
+            var descriptor = props[i];
+            descriptor.enumerable = descriptor.enumerable || false;
+            descriptor.configurable = true;
+            if ("value" in descriptor) descriptor.writable = true;
+            Object.defineProperty(target, descriptor.key, descriptor);
+          }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+          if (protoProps) defineProperties(Constructor.prototype, protoProps);
+          if (staticProps) defineProperties(Constructor, staticProps);
+          return Constructor;
+        };
+      }();
+
+      _export('MetricsPageCtrl', MetricsPageCtrl = function () {
+        function MetricsPageCtrl(backendSrv, datasourceSrv) {
+          _classCallCheck(this, MetricsPageCtrl);
+
+          this.hasDatasource = false;
+          this.backendSrv = backendSrv;
+          var apc = new AuthsPageCtrl(backendSrv, datasourceSrv);
+          this.datasources = apc.getTimelyDatasources();
+          if (this.datasources.length > 0) {
+            this.source = this.datasources[0];
+            this.updateDatasource();
+          }
+        }
+
+        _createClass(MetricsPageCtrl, [{
+          key: 'updateDatasource',
+          value: function updateDatasource() {
+            var _this = this;
+
+            this._clearMetrics();
+            var uri = this._getURI(this.source.jsonData);
+            this.backendSrv.request({ method: 'GET',
+              url: uri,
+              withCredentials: true,
+              params: "" }).then(function (response) {
+              _this.metrics = _this._transformMetrics(response.metrics);
+              _this.hasDatasource = true;
+            });
+          }
+        }, {
+          key: '_clearMetrics',
+          value: function _clearMetrics() {
+            this.metrics = [];
+          }
+        }, {
+          key: '_transformMetrics',
+          value: function _transformMetrics(metrics) {
+            var ret = [];
+            _.each(metrics, function (value, idx) {
+              var metric = {};
+              metric.metric = value.metric;
+              metric.tags = [];
+              _.map(value.tags, function (tag, key) {
+                //        result || (result = {});
+                //        result['name'] = tag.key;
+                //        result['values'] || (result['values'] = []);
+                //        result['values'].push(tag.value);
+                var gIdx = _.findIndex(metric.tags, { 'name': tag.key });
+                var grouped;
+                if (gIdx == -1) {
+                  grouped = { name: '', values: [] };
+                } else {
+                  grouped = metric.tags[gIdx];
+                }
+                grouped.values.push(tag.value);
+                grouped.values = _.sortBy(_.uniq(grouped.values));
+                grouped.name = tag.key;
+                if (gIdx > -1) {
+                  metric.tags[gIdx] = grouped;
+                } else {
+                  metric.tags.push(grouped);
+                }
+              }.bind(metric));
+              metric.tags = _.sortBy(metric.tags, 'name');
+              ret.push(metric);
+            }.bind(ret));
+
+            return _.sortBy(ret, 'metric');
+          }
+        }, {
+          key: '_getURI',
+          value: function _getURI(jsonData) {
+            return 'https://' + jsonData.timelyHost + ':' + jsonData.httpsPort + '/api/metrics';
+          }
+        }]);
+
+        return MetricsPageCtrl;
+      }());
+
+      _export('MetricsPageCtrl', MetricsPageCtrl);
+
+      MetricsPageCtrl.templateUrl = 'components/metrics.html';
+    }
+  };
+});
+//# sourceMappingURL=metrics.js.map

grafana/timely-app/dist/components/metrics.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/components/metrics.js"],"names":["_","AuthsPageCtrl","MetricsPageCtrl","backendSrv","datasourceSrv","hasDatasource","apc","datasources","getTimelyDatasources","length","source","updateDatasource","_clearMetrics","uri","_getURI","jsonData","request","method","url","withCredentials","params","then","metrics","_transformMetrics","response","ret","each","value","idx","metric","tags","map","tag","key","gIdx","findIndex","grouped","name","values","push","sortBy","uniq","bind","timelyHost","httpsPort","templateUrl"],"mappings":"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","file":"metrics.js","sourcesContent":["\nimport _ from 'lodash';\nimport {AuthsPageCtrl} from 'plugins/timely-app/components/authspage';\n\nexport class MetricsPageCtrl {\n\n  constructor(backendSrv, datasourceSrv){\n    this.hasDatasource = false;\n    this.backendSrv = backendSrv;\n    var apc = new AuthsPageCtrl(backendSrv, datasourceSrv);\n    this.datasources = apc.getTimelyDatasources();\n    if( this.datasources.length > 0){\n      this.source = this.datasources[0];\n      this.updateDatasource();\n    }\n  }\n\n  updateDatasource(){\n    this._clearMetrics();\n    var uri = this._getURI(this.source.jsonData);\n    this.backendSrv.request(\n      { method: 'GET',\n        url: uri,\n        withCredentials: true,\n        params: \"\" }\n    ).then(\n      response => {\n        this.metrics = this._transformMetrics(response.metrics);\n        this.hasDatasource = true;\n      });\n  }\n\n  _clearMetrics(){\n    this.metrics = [];\n  }\n\n  _transformMetrics(metrics){\n    var ret = [];\n    _.each(metrics, function(value, idx){\n      var metric = {};\n      metric.metric = value.metric;\n      metric.tags = [];\n      _.map(value.tags, function(tag, key){\n//        result || (result = {});\n//        result['name'] = tag.key;\n//        result['values'] || (result['values'] = []);\n//        result['values'].push(tag.value);\n        var gIdx = _.findIndex(metric.tags, {'name': tag.key});\n        var grouped;\n        if( gIdx == -1 ){\n          grouped = {name: '', values: []};\n        } else {\n          grouped = metric.tags[gIdx];\n        }\n        grouped.values.push(tag.value);\n        grouped.values = _.sortBy(_.uniq(grouped.values))\n        grouped.name = tag.key;\n        if( gIdx > -1 ){\n          metric.tags[gIdx] = grouped;\n        } else {\n          metric.tags.push(grouped);\n        }\n      }.bind(metric));\n      metric.tags = _.sortBy(metric.tags, 'name')\n      ret.push(metric);\n    }.bind(ret));\n\n    return _.sortBy(ret, 'metric');\n  }\n\n  _getURI(jsonData){\n    return 'https://'+jsonData.timelyHost+':'+jsonData.httpsPort+'/api/metrics'\n  }\n\n}\nMetricsPageCtrl.templateUrl = 'components/metrics.html';\n"]}

grafana/timely-app/dist/components/query.editor.html

@@ -0,0 +1,257 @@
+<query-editor-row query-ctrl="ctrl" can-collapse="false">
+	<div class="gf-form-inline">
+		<div class="gf-form max-width-25">
+			<label class="gf-form-label query-keyword width-8">
+				Metric
+				<label class="gf-form-label" bs-tooltip="ctrl.errors.metric" style="color: rgb(229, 189, 28)" ng-show="ctrl.errors.metric">
+					<i class="fa fa-warning"></i>
+				</label>
+			</label>
+			<input type="text" class="gf-form-input" ng-model="ctrl.target.metric"
+						 spellcheck='false' bs-typeahead="ctrl.suggestMetrics" placeholder="metric name" data-min-length=0 data-items=100
+						ng-blur="ctrl.targetBlur()">
+			</input>
+		</div>
+		<div class="gf-form">
+			<label class="gf-form-label query-keyword">
+				Aggregator
+				<a bs-tooltip="ctrl.errors.aggregator" style="color: rgb(229, 189, 28)" ng-show="ctrl.errors.aggregator">
+					<i class="fa fa-warning"></i>
+				</a>
+			</label>
+			<div class="gf-form-select-wrapper max-width-15">
+				<select ng-model="ctrl.target.aggregator" class="gf-form-input"
+								ng-options="agg for agg in ctrl.aggregators"
+								ng-change="ctrl.targetBlur()">
+		 	 </select>
+			</div>
+		</div>
+			<div class="gf-form max-width-20">
+				<label class="gf-form-label query-keyword width-6">
+					Alias:
+					<info-popover mode="right-normal">
+						Use patterns like $tag_tagname to replace part of the alias for a tag value
+					</info-popover>
+				</label>
+				<input  type="text" class="gf-form-input"
+		   					ng-model="ctrl.target.alias"
+								spellcheck='false'
+								placeholder="series alias"
+								data-min-length=0 data-items=100
+								ng-blur="ctrl.targetBlur()"></input>
+			</div>
+
+			<div class="gf-form gf-form--grow">
+				<div class="gf-form-label gf-form-label--grow"></div>
+			</div>
+	</div>
+
+	<div class="gf-form-inline">
+		<div class="gf-form max-width-25">
+			<label class="gf-form-label query-keyword width-8">Down sample</label>
+			<input type="text" class="gf-form-input"
+						 ng-model="ctrl.target.downsampleInterval"
+						 ng-model-onblur
+			       ng-change="ctrl.targetBlur()"
+			       placeholder="interval"></input>
+			<info-popover mode="right-absolute">
+				blank for auto, or for example <code>1m</code>
+			</info-popover>
+		</div>
+
+		<div class="gf-form">
+			<label class="gf-form-label query-keyword">Aggregator</label>
+			<div class="gf-form-select-wrapper">
+				<select ng-model="ctrl.target.downsampleAggregator" class="gf-form-input"
+								ng-options="agg for agg in ctrl.aggregators"
+				        ng-change="ctrl.targetBlur()">
+				</select>
+			</div>
+		</div>
+
+		<div class="gf-form" ng-if="ctrl.tsdbVersion >= 2">
+			<label class="gf-form-label query-keyword width-6">Fill</label>
+			<div class="gf-form-select-wrapper">
+				<select ng-model="ctrl.target.downsampleFillPolicy" class="gf-form-input"
+								ng-options="agg for agg in ctrl.fillPolicies"
+								ng-change="ctrl.targetBlur()">
+				</select>
+			</div>
+		</div>
+
+		<gf-form-switch class="gf-form"
+										label="Disable downsampling"
+                    label-class="query-keyword"
+										checked="ctrl.target.disableDownsampling"
+										on-change="ctrl.targetBlur()">
+		</gf-form-switch>
+
+		<div class="gf-form gf-form--grow">
+			<div class="gf-form-label gf-form-label--grow"></div>
+		</div>
+	</div>
+
+	<div class="gf-form-inline" ng-if="ctrl.tsdbVersion >= 2">
+		<div class="gf-form">
+
+			<label class="gf-form-label query-keyword width-8">
+				Filters
+				<info-popover mode="right-normal">
+					Filters does not work with tags, either of the two will work but not both.
+				</info-popover>
+			</label>
+
+			<div ng-repeat="fil in ctrl.target.filters track by $index" class="gf-form-label">
+				{{fil.tagk}}&nbsp;=&nbsp;{{fil.type}}&#40;{{fil.filter}}&#41;&nbsp;&#44&nbsp;groupBy&nbsp;=&nbsp;{{fil.groupBy}}
+				<a ng-click="ctrl.editFilter(fil, $index)">
+					<i class="fa fa-pencil"></i>
+				</a>
+				<a ng-click="ctrl.removeFilter($index)">
+					<i class="fa fa-remove"></i>
+				</a>
+			</div>
+			<label class="gf-form-label query-keyword" ng-hide="ctrl.addFilterMode">
+				<a ng-click="ctrl.addFilter()">
+					<i class="fa fa-plus"></i>
+				</a>
+			</label>
+ 		</div>
+
+		<div class="gf-form-inline" ng-show="ctrl.addFilterMode">
+			<div class="gf-form">
+				<input type="text" class="gf-form-input" spellcheck='false'
+						 bs-typeahead="ctrl.suggestTagKeys" data-min-length=0 data-items=100
+             ng-model="ctrl.target.currentFilterKey" placeholder="key">
+				</input>
+			</div>
+
+			<div class="gf-form">
+				<label class="gf-form-label query-keyword">Type</label>
+				<div class="gf-form-select-wrapper">
+					<select ng-model="ctrl.target.currentFilterType" class="gf-form-input" ng-options="filType for filType in ctrl.filterTypes">
+					</select>
+				</div>
+			</div>
+
+			<div class="gf-form">
+				<input type="text" class="gf-form-input" spellcheck='false' bs-typeahead="ctrl.suggestTagValues" data-min-length=0 data-items=100 ng-model="ctrl.target.currentFilterValue" placeholder="filter">
+				</input>
+			</div>
+
+      <gf-form-switch class="gf-form"
+                    label="Group by" 
+                    label-class="query-keyword"
+                    checked="ctrl.target.currentFilterGroupBy"
+                    on-change="ctrl.targetBlur()">
+			</gf-form-switch>
+
+			<div class="gf-form" ng-show="ctrl.addFilterMode">
+				<label class="gf-form-label" ng-show="ctrl.errors.filters">
+					<a bs-tooltip="ctrl.errors.filters" style="color: rgb(229, 189, 28)" >
+						<i class="fa fa-warning"></i>
+					</a>
+				</label>
+				<label class="gf-form-label">
+					<a ng-click="ctrl.addFilter()" ng-hide="ctrl.errors.filters">add filter</a>
+					<a ng-click="ctrl.closeAddFilterMode()">
+						<i class="fa fa-remove"></i>
+					</a>
+				</label>
+			</div>
+
+		</div>
+
+		<div class="gf-form gf-form--grow">
+			<div class="gf-form-label gf-form-label--grow"></div>
+		</div>
+	</div>
+
+	<div class="gf-form-inline">
+		<div class="gf-form">
+			<label class="gf-form-label query-keyword width-8">
+				Tags
+				<info-popover mode="right-normal" ng-if="ctrl.tsdbVersion >= 2">
+					Please use filters, tags are deprecated in opentsdb 2.2
+				</info-popover>
+			</label>
+		</div>
+
+		<div class="gf-form" ng-repeat="(key, value) in ctrl.target.tags track by $index" class="gf-form">
+			<label class="gf-form-label">
+				{{key}}&nbsp;=&nbsp;{{value}}
+				<a ng-click="ctrl.editTag(key, value)">
+					<i class="fa fa-pencil"></i>
+				</a>
+				<a ng-click="ctrl.removeTag(key)">
+					<i class="fa fa-remove"></i>
+				</a>
+			</label>
+		</div>
+
+		<div class="gf-form" ng-hide="ctrl.addTagMode">
+			<label class="gf-form-label query-keyword">
+				<a ng-click="ctrl.addTag()"><i class="fa fa-plus"></i></a>
+			</label>
+		</div>
+
+		<div class="gf-form" ng-show="ctrl.addTagMode">
+			<input type="text"
+						 class="gf-form-input" spellcheck='false'
+						 bs-typeahead="ctrl.suggestTagKeys" data-min-length=0 data-items=100
+					   ng-model="ctrl.target.currentTagKey" placeholder="key">
+			</input>
+
+			<input type="text" class="gf-form-input"
+						 spellcheck='false' bs-typeahead="ctrl.suggestTagValues"
+						 data-min-length=0 data-items=100 ng-model="ctrl.target.currentTagValue" placeholder="value">
+			</input>
+
+			<label class="gf-form-label" ng-show="ctrl.errors.tags">
+				<a bs-tooltip="ctrl.errors.tags" style="color: rgb(229, 189, 28)" >
+					<i class="fa fa-warning"></i>
+				</a>
+			</label>
+			<label class="gf-form-label" >
+				<a ng-click="ctrl.addTag()" ng-hide="ctrl.errors.tags">add tag</a>
+				<a ng-click="ctrl.closeAddTagMode()"><i class="fa fa-remove"></i></a>
+			</label>
+		</div>
+
+		<div class="gf-form gf-form--grow">
+			<div class="gf-form-label gf-form-label--grow"></div>
+		</div>
+	</div>
+
+	<div class="gf-form-inline">
+		<gf-form-switch class="gf-form" label="Rate" label-class="width-8 query-keyword" checked="ctrl.target.shouldComputeRate" on-change="ctrl.targetBlur()">
+		</gf-form-switch>
+
+		<gf-form-switch ng-hide="!ctrl.target.shouldComputeRate"
+										class="gf-form" label="Counter" label-class="query-keyword" checked="ctrl.target.isCounter" on-change="ctrl.targetBlur()">
+		</gf-form-switch>
+
+
+		<div class="gf-form" ng-hide="!ctrl.target.isCounter || !ctrl.target.shouldComputeRate">
+			<label class="gf-form-label query-keyword">Counter Max</label>
+			<input type="text" class="gf-form-input"
+					 	 ng-disabled="!ctrl.target.shouldComputeRate"
+						 ng-model="ctrl.target.counterMax" spellcheck='false'
+						 placeholder="max value" ng-model-onblur
+						 ng-blur="ctrl.targetBlur()">
+			</input>
+
+			<label class="gf-form-label query-keyword">Reset Value</label>
+			<input type="text" class="tight-form-input input-small"
+					   ng-disabled="!ctrl.target.shouldComputeRate"
+						 ng-model="ctrl.target.counterResetValue" spellcheck='false'
+						 placeholder="reset value" ng-model-onblur
+						 ng-blur="ctrl.targetBlur()">
+			</input>
+		</div>
+
+		<div class="gf-form gf-form--grow">
+			<div class="gf-form-label gf-form-label--grow"></div>
+		</div>
+	</div>
+</query-editor-row>
+

grafana/timely-app/dist/css/timely-app.css

@@ -0,0 +1,3 @@
+.timely-app-heading {
+  text-align: center;
+}

grafana/timely-app/dist/dark.js

@@ -1,101 +0,0 @@
-define(function() { return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "./styles/dark.css");
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ "./styles/dark.css":
-/*!*************************!*\
-  !*** ./styles/dark.css ***!
-  \*************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ })
-
-/******/ })});;
-//# sourceMappingURL=dark.js.map

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

@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./styles/dark.css"],"names":[],"mappings":";QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;AClFA,uC","file":"dark.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./styles/dark.css\");\n","// extracted by mini-css-extract-plugin"],"sourceRoot":""}

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

@@ -0,0 +1,35 @@
+'use strict';
+
+System.register(['lodash'], function (_export, _context) {
+  "use strict";
+
+  var _, DatasourceConfigCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }],
+    execute: function () {
+      _export('DatasourceConfigCtrl', DatasourceConfigCtrl = function DatasourceConfigCtrl() {
+        _classCallCheck(this, DatasourceConfigCtrl);
+
+        this.current.jsonData = this.current.jsonData || {};
+        this.current.access = 'direct';
+        this.current.basicAuth = false;
+        this.current.withCredentials = true;
+        this.current.suggestHost = 'localhost';
+      });
+
+      _export('DatasourceConfigCtrl', DatasourceConfigCtrl);
+
+      DatasourceConfigCtrl.templateUrl = 'datasource/partials/config.html';
+    }
+  };
+});
+//# sourceMappingURL=config.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/datasource/config.js"],"names":["_","DatasourceConfigCtrl","current","jsonData","access","basicAuth","withCredentials","suggestHost","templateUrl"],"mappings":";;;;;;;;;;;;;;;AAAOA,O;;;sCAGMC,oB,GAEX,gCAAc;AAAA;;AACZ,aAAKC,OAAL,CAAaC,QAAb,GAAwB,KAAKD,OAAL,CAAaC,QAAb,IAAyB,EAAjD;AACA,aAAKD,OAAL,CAAaE,MAAb,GAAsB,QAAtB;AACA,aAAKF,OAAL,CAAaG,SAAb,GAAyB,KAAzB;AACA,aAAKH,OAAL,CAAaI,eAAb,GAA+B,IAA/B;AACA,aAAKJ,OAAL,CAAaK,WAAb,GAA2B,WAA3B;AACD,O;;;;AAEHN,2BAAqBO,WAArB,GAAmC,iCAAnC","file":"config.js","sourcesContent":["import _ from 'lodash';\n\n\nexport class DatasourceConfigCtrl {\n\n  constructor() {\n    this.current.jsonData = this.current.jsonData || {};\n    this.current.access = 'direct';\n    this.current.basicAuth = false;\n    this.current.withCredentials = true;\n    this.current.suggestHost = 'localhost';\n  }\n}\nDatasourceConfigCtrl.templateUrl = 'datasource/partials/config.html';\n"]}

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

@@ -0,0 +1,710 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_TIMELY",
+      "label": "Timely",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "timely-datasource",
+      "pluginName": "Timely"
+    }
+  ],
+  "__requires": [
+    {
+      "type": "grafana",
+      "id": "grafana",
+      "name": "Grafana",
+      "version": "4.4.1"
+    },
+    {
+      "type": "panel",
+      "id": "graph",
+      "name": "Graph",
+      "version": ""
+    },
+    {
+      "type": "panel",
+      "id": "singlestat",
+      "name": "Singlestat",
+      "version": ""
+    },
+    {
+      "type": "datasource",
+      "id": "timely-datasource",
+      "name": "Timely",
+      "version": "1.0.0"
+    }
+  ],
+  "annotations": {
+    "list": []
+  },
+  "editable": true,
+  "gnetId": null,
+  "graphTooltip": 0,
+  "hideControls": false,
+  "id": null,
+  "links": [],
+  "refresh": "1m",
+  "rows": [
+    {
+      "collapse": false,
+      "height": "150",
+      "panels": [
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "format": "none",
+          "gauge": {
+            "maxValue": 100000,
+            "minValue": 0,
+            "show": true,
+            "thresholdLabels": false,
+            "thresholdMarkers": false
+          },
+          "height": "150",
+          "hideTimeOverride": true,
+          "id": 8,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 4,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "aggregator": "sum",
+              "downsampleAggregator": "sum",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1m",
+              "metric": "timely.metrics.received",
+              "refId": "A"
+            }
+          ],
+          "thresholds": "",
+          "timeFrom": null,
+          "timeShift": "1m",
+          "title": "Metrics Received Last Minute",
+          "transparent": true,
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "avg"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "height": "150",
+          "hideTimeOverride": true,
+          "id": 9,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 4,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "aggregator": "count",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "downsampleAggregator": "count",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1s",
+              "metric": "sys.collectd.cache_size",
+              "refId": "A",
+              "tags": {}
+            }
+          ],
+          "thresholds": "",
+          "timeShift": "1m",
+          "title": "CollectD Instances Reporting",
+          "transparent": true,
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "avg"
+        },
+        {
+          "cacheTimeout": null,
+          "colorBackground": false,
+          "colorValue": false,
+          "colors": [
+            "rgba(245, 54, 54, 0.9)",
+            "rgba(237, 129, 40, 0.89)",
+            "rgba(50, 172, 45, 0.97)"
+          ],
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "format": "none",
+          "gauge": {
+            "maxValue": 100,
+            "minValue": 0,
+            "show": false,
+            "thresholdLabels": false,
+            "thresholdMarkers": true
+          },
+          "height": "150",
+          "hideTimeOverride": true,
+          "id": 10,
+          "interval": null,
+          "links": [],
+          "mappingType": 1,
+          "mappingTypes": [
+            {
+              "name": "value to text",
+              "value": 1
+            },
+            {
+              "name": "range to text",
+              "value": 2
+            }
+          ],
+          "maxDataPoints": 100,
+          "nullPointMode": "connected",
+          "nullText": null,
+          "postfix": "",
+          "postfixFontSize": "50%",
+          "prefix": "",
+          "prefixFontSize": "50%",
+          "rangeMaps": [
+            {
+              "from": "null",
+              "text": "N/A",
+              "to": "null"
+            }
+          ],
+          "span": 4,
+          "sparkline": {
+            "fillColor": "rgba(31, 118, 189, 0.18)",
+            "full": false,
+            "lineColor": "rgb(31, 120, 193)",
+            "show": false
+          },
+          "tableColumn": "",
+          "targets": [
+            {
+              "aggregator": "sum",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "downsampleAggregator": "sum",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1m",
+              "metric": "sys.collectd.derive.dropped",
+              "refId": "A",
+              "tags": {}
+            }
+          ],
+          "thresholds": "",
+          "timeShift": "1m",
+          "title": "Metrics Dropped By CollectD",
+          "transparent": true,
+          "type": "singlestat",
+          "valueFontSize": "80%",
+          "valueMaps": [
+            {
+              "op": "=",
+              "text": "N/A",
+              "value": "null"
+            }
+          ],
+          "valueName": "avg"
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "New row",
+      "titleSize": "h6"
+    },
+    {
+      "collapse": false,
+      "height": "250px",
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "fill": 0,
+          "grid": {},
+          "id": 3,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 3,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "sum",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "downsampleAggregator": "sum",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1m",
+              "metric": "timely.keys.metric.inserted",
+              "refId": "A",
+              "tags": {
+                "host": ".*"
+              }
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Timely Metrics Inserted",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "none",
+              "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,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "fill": 0,
+          "grid": {},
+          "id": 4,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 3,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "sum",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "downsampleAggregator": "avg",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1m",
+              "metric": "timely.keys.meta.inserted",
+              "refId": "A",
+              "tags": {
+                "host": ".*"
+              }
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Timely Meta Inserted",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "none",
+              "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,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "fill": 0,
+          "grid": {},
+          "id": 5,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 3,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "sum",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "downsampleAggregator": "sum",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1m",
+              "metric": "timely.metrics.received",
+              "refId": "A",
+              "tags": {
+                "host": ".*"
+              }
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Timely Metrics Received",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "none",
+              "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,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY}",
+          "editable": true,
+          "error": false,
+          "fill": 0,
+          "grid": {},
+          "id": 7,
+          "legend": {
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 2,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 3,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "none",
+              "alias": "$tag_host",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "downsampleAggregator": "sum",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1m",
+              "metric": "sys.collectd.cache_size",
+              "refId": "A",
+              "tags": {
+                "host": ".*"
+              }
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CollectD Cache Sizes",
+          "tooltip": {
+            "msResolution": true,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "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
+            }
+          ]
+        }
+      ],
+      "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"
+  },
+  "timepicker": {
+    "now": true,
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "browser",
+  "title": "Timely Status",
+  "version": 4
+}

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

@@ -0,0 +1,479 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_TIMELY-STANDALONE",
+      "label": "Timely-Standalone",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "timely-datasource",
+      "pluginName": "Timely"
+    }
+  ],
+  "__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,
+  "id": null,
+  "links": [],
+  "refresh": "5s",
+  "rows": [
+    {
+      "collapse": false,
+      "height": "250px",
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "grid": {},
+          "id": 1,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": true,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": true,
+            "values": true
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "sum",
+              "disableDownsampling": false,
+              "downsampleAggregator": "avg",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "",
+              "errors": {},
+              "isCounter": false,
+              "metric": "timely.metrics.received",
+              "refId": "A",
+              "shouldComputeRate": false
+            },
+            {
+              "aggregator": "sum",
+              "disableDownsampling": false,
+              "downsampleAggregator": "avg",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "",
+              "errors": {},
+              "metric": "timely.keys.meta.inserted",
+              "refId": "B"
+            },
+            {
+              "aggregator": "sum",
+              "disableDownsampling": false,
+              "downsampleAggregator": "avg",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "",
+              "errors": {},
+              "metric": "timely.keys.metric.inserted",
+              "refId": "C"
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Timely Status",
+          "tooltip": {
+            "msResolution": true,
+            "shared": false,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "yaxes": [
+            {
+              "format": "short",
+              "label": "Keys",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": true
+            },
+            {
+              "format": "short",
+              "logBase": 1,
+              "max": null,
+              "min": null,
+              "show": false
+            }
+          ]
+        }
+      ],
+      "repeat": null,
+      "repeatIteration": null,
+      "repeatRowId": null,
+      "showTitle": false,
+      "title": "Row",
+      "titleSize": "h6"
+    },
+    {
+      "collapse": false,
+      "height": "250px",
+      "panels": [
+        {
+          "aliasColors": {},
+          "bars": false,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "grid": {},
+          "id": 2,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "none",
+              "alias": "$tag_host",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "disableDownsampling": false,
+              "downsampleAggregator": "max",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1s",
+              "metric": "sys.cpu.user",
+              "refId": "A",
+              "tags": {
+                "host": ".*"
+              }
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CPU User by Host",
+          "tooltip": {
+            "msResolution": false,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "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,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "grid": {},
+          "id": 3,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "none",
+              "alias": "$tag_rack",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "disableDownsampling": false,
+              "downsampleAggregator": "max",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1s",
+              "metric": "sys.cpu.user",
+              "refId": "A",
+              "tags": {
+                "rack": ".*"
+              }
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "CPU User by Rack",
+          "tooltip": {
+            "msResolution": false,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "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,
+          "dashLength": 10,
+          "dashes": false,
+          "datasource": "${DS_TIMELY-STANDALONE}",
+          "editable": true,
+          "error": false,
+          "fill": 1,
+          "grid": {},
+          "id": 4,
+          "legend": {
+            "alignAsTable": true,
+            "avg": false,
+            "current": false,
+            "max": false,
+            "min": false,
+            "rightSide": true,
+            "show": true,
+            "total": false,
+            "values": false
+          },
+          "lines": true,
+          "linewidth": 1,
+          "links": [],
+          "nullPointMode": "connected",
+          "percentage": false,
+          "pointradius": 5,
+          "points": false,
+          "renderer": "flot",
+          "seriesOverrides": [],
+          "spaceLength": 10,
+          "span": 12,
+          "stack": false,
+          "steppedLine": false,
+          "targets": [
+            {
+              "aggregator": "none",
+              "alias": "",
+              "currentTagKey": "",
+              "currentTagValue": "",
+              "disableDownsampling": false,
+              "downsampleAggregator": "max",
+              "downsampleFillPolicy": "none",
+              "downsampleInterval": "1s",
+              "metric": "sys.cpu.user",
+              "refId": "A",
+              "tags": {}
+            }
+          ],
+          "thresholds": [],
+          "timeFrom": null,
+          "timeShift": null,
+          "title": "Cumulative CPU",
+          "tooltip": {
+            "msResolution": false,
+            "shared": true,
+            "sort": 0,
+            "value_type": "cumulative"
+          },
+          "type": "graph",
+          "xaxis": {
+            "buckets": null,
+            "mode": "time",
+            "name": null,
+            "show": true,
+            "values": []
+          },
+          "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
+            }
+          ]
+        }
+      ],
+      "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"
+  },
+  "timepicker": {
+    "now": true,
+    "refresh_intervals": [
+      "5s",
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "browser",
+  "title": "Timely Standalone Demo",
+  "version": 6
+}

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

@@ -0,0 +1,547 @@
+'use strict';
+
+System.register(['lodash', 'angular', '../../../app/core/utils/datemath'], function (_export, _context) {
+  "use strict";
+
+  var _, angular, dateMath, _createClass, TimelyDatasource;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }, function (_angular) {
+      angular = _angular.default;
+    }, function (_appCoreUtilsDatemath) {
+      dateMath = _appCoreUtilsDatemath;
+    }],
+    execute: function () {
+      _createClass = function () {
+        function defineProperties(target, props) {
+          for (var i = 0; i < props.length; i++) {
+            var descriptor = props[i];
+            descriptor.enumerable = descriptor.enumerable || false;
+            descriptor.configurable = true;
+            if ("value" in descriptor) descriptor.writable = true;
+            Object.defineProperty(target, descriptor.key, descriptor);
+          }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+          if (protoProps) defineProperties(Constructor.prototype, protoProps);
+          if (staticProps) defineProperties(Constructor, staticProps);
+          return Constructor;
+        };
+      }();
+
+      _export('TimelyDatasource', TimelyDatasource = function () {
+
+        // arguments injected by angular
+        function TimelyDatasource(instanceSettings, $q, backendSrv, templateSrv, contextSrv) {
+          _classCallCheck(this, TimelyDatasource);
+
+          this.type = instanceSettings.type;
+          this.name = instanceSettings.name;
+
+          this.jsonData = instanceSettings.jsonData || {};
+          this.httpsPort = instanceSettings.jsonData.httpsPort;
+          this.timelyHost = instanceSettings.jsonData.timelyHost;
+          this.wsPort = instanceSettings.jsonData.wsPort;
+          if (!instanceSettings.jsonData.basicAuths) {
+            instanceSettings.jsonData.basicAuths = false;
+          }
+
+          this.url = this._makeHttpsUrl();
+          this.withCredentials = true;
+          this.basicAuth = false;
+
+          this.supportMetrics = true;
+          this.tagKeys = {};
+
+          this.$q = $q;
+          this.backendSrv = backendSrv;
+          this.templateSrv = templateSrv;
+          this.contextSrv = contextSrv;
+
+          this.aggregatorsPromise = null;
+          this.filterTypesPromise = null;
+        }
+
+        // REQUIRED INTERFACE
+
+
+        _createClass(TimelyDatasource, [{
+          key: 'query',
+          value: function query(options) {
+            var start = this.convertToTSDBTime(options.rangeRaw.from, false);
+            var end = this.convertToTSDBTime(options.rangeRaw.to, true);
+            var qs = [];
+
+            _.each(options.targets, function (target) {
+              if (!target.metric) {
+                return;
+              }
+              qs.push(this.convertTargetToQuery(target, options));
+            }.bind(this));
+
+            var queries = _.compact(qs);
+
+            // No valid targets, return the empty result to save a round trip.
+            if (_.isEmpty(queries)) {
+              var d = this.$q.defer();
+              d.resolve({ data: [] });
+              return d.promise;
+            }
+
+            var groupByTags = {};
+            _.each(queries, function (query) {
+              if (query.filters && query.filters.length > 0) {
+                _.each(query.filters, function (val) {
+                  groupByTags[val.tagk] = true;
+                });
+              } else {
+                _.each(query.tags, function (val, key) {
+                  groupByTags[key] = true;
+                });
+              }
+            });
+
+            return this.performTimeSeriesQuery(queries, start, end).then(function (response) {
+              var metricToTargetMapping = this.mapMetricsToTargets(response.data, options);
+              var result = _.map(response.data, function (metricData, index) {
+                index = metricToTargetMapping[index];
+                if (index === -1) {
+                  index = 0;
+                }
+                this._saveTagKeys(metricData);
+
+                return this.transformMetricData(metricData, groupByTags, options.targets[index], options);
+              }.bind(this));
+              return { data: result };
+            }.bind(this));
+          }
+        }, {
+          key: 'testDatasource',
+          value: function testDatasource() {
+            return this.backendSrv.datasourceRequest({
+              url: this.url + '/version',
+              method: 'GET'
+            }).then(function (response) {
+              if (response.status === 200) {
+                return { status: "success", message: "Data source is working", title: "Success" };
+              }
+            });
+          }
+        }, {
+          key: 'annotationQuery',
+          value: function annotationQuery(options) {
+            var start = convertToTSDBTime(options.rangeRaw.from, false);
+            var end = convertToTSDBTime(options.rangeRaw.to, true);
+            var qs = [];
+            var eventList = [];
+
+            qs.push({ aggregator: "sum", metric: options.annotation.target });
+
+            var queries = _.compact(qs);
+
+            return this.performTimeSeriesQuery(queries, start, end).then(function (results) {
+              if (results.data[0]) {
+                var annotationObject = results.data[0].annotations;
+                if (options.annotation.isGlobal) {
+                  annotationObject = results.data[0].globalAnnotations;
+                }
+                if (annotationObject) {
+                  _.each(annotationObject, function (annotation) {
+                    var event = {
+                      title: annotation.description,
+                      time: Math.floor(annotation.startTime) * 1000,
+                      text: annotation.notes,
+                      annotation: options.annotation
+                    };
+
+                    eventList.push(event);
+                  });
+                }
+              }
+              return eventList;
+            }.bind(this));
+          }
+        }, {
+          key: 'metricFindQuery',
+          value: function metricFindQuery(query) {
+            if (!query) {
+              return this.$q.when([]);
+            }
+
+            var interpolated;
+            try {
+              interpolated = this.templateSrv.replace(query);
+            } catch (err) {
+              return this.$q.reject(err);
+            }
+
+            var responseTransform = function responseTransform(result) {
+              return _.map(result, function (value) {
+                return { text: value };
+              });
+            };
+
+            var metrics_regex = /metrics\((.*)\)/;
+            var tag_names_regex = /tag_names\((.*)\)/;
+            var tag_values_regex = /tag_values\((.*?),\s?(.*)\)/;
+            var tag_names_suggest_regex = /suggest_tagk\((.*)\)/;
+            var tag_values_suggest_regex = /suggest_tagv\((.*)\)/;
+
+            var metrics_query = interpolated.match(metrics_regex);
+            if (metrics_query) {
+              return this._performSuggestQuery(metrics_query[1], 'metrics').then(responseTransform);
+            }
+
+            var tag_names_query = interpolated.match(tag_names_regex);
+            if (tag_names_query) {
+              return this._performMetricKeyLookup(tag_names_query[1]).then(responseTransform);
+            }
+
+            var tag_values_query = interpolated.match(tag_values_regex);
+            if (tag_values_query) {
+              return this._performMetricKeyValueLookup(tag_values_query[1], tag_values_query[2]).then(responseTransform);
+            }
+
+            var tag_names_suggest_query = interpolated.match(tag_names_suggest_regex);
+            if (tag_names_suggest_query) {
+              return this._performSuggestQuery(tag_names_suggest_query[1], 'tagk').then(responseTransform);
+            }
+
+            var tag_values_suggest_query = interpolated.match(tag_values_suggest_regex);
+            if (tag_values_suggest_query) {
+              return this._performSuggestQuery(tag_values_suggest_query[1], 'tagv').then(responseTransform);
+            }
+
+            return this.$q.when([]);
+          }
+        }, {
+          key: 'performTimeSeriesQuery',
+          value: function performTimeSeriesQuery(queries, start, end) {
+            var msResolution = true;
+            var responsePromises = [];
+
+            // execute backend datasourceRequests separately
+            // for better performance and load balancing
+            _.each(queries, function (query) {
+
+              var reqBody = {
+                start: start,
+                queries: [query],
+                msResolution: msResolution,
+                globalAnnotations: true,
+                showQuery: true
+              };
+
+              // Relative queries (e.g. last hour) don't include an end time
+              if (end) {
+                reqBody.end = end;
+              }
+
+              var options = {
+                method: 'POST',
+                url: this.url + '/api/query?metric=' + query.metric,
+                data: reqBody
+              };
+              this._addCredentialOptions(options);
+
+              // In case the backend is 3rd-party hosted and does not suport OPTIONS, urlencoded requests
+              // go as POST rather than OPTIONS+POST
+              options.headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
+              responsePromises.push(this.backendSrv.datasourceRequest(options));
+            }.bind(this));
+
+            // wait until all promised datasourceRequests complete
+            // and then return combined responses
+            return Promise.all(responsePromises).then(function (queryResponses) {
+              var combinedResponse = queryResponses[0];
+              for (var x = 1; x < queryResponses.length; x++) {
+                combinedResponse.data = combinedResponse.data.concat(queryResponses[x].data);
+              }
+              return combinedResponse;
+            }.bind(this));
+          }
+        }, {
+          key: '_saveTagKeys',
+          value: function _saveTagKeys(metricData) {
+            var tagKeys = Object.keys(metricData.tags);
+            _.each(metricData.aggregateTags, function (tag) {
+              tagKeys.push(tag);
+            });
+
+            this.tagKeys[metricData.metric] = tagKeys;
+          }
+        }, {
+          key: 'suggestTagKeys',
+          value: function suggestTagKeys(metric) {
+            return this.$q.when(this.tagKeys[metric] || []);
+          }
+        }, {
+          key: '_performSuggestQuery',
+          value: function _performSuggestQuery(query, type) {
+            return this._get('/api/suggest', { type: type, q: query, max: 1000 }).then(function (result) {
+              return result.data;
+            });
+          }
+        }, {
+          key: '_performMetricKeyValueLookup',
+          value: function _performMetricKeyValueLookup(metric, keys) {
+
+            if (!metric || !keys) {
+              return $q.when([]);
+            }
+
+            var keysArray = keys.split(",").map(function (key) {
+              return key.trim();
+            });
+            var key = keysArray[0];
+            var keysQuery = key + "=.*";
+
+            if (keysArray.length > 1) {
+              keysQuery += "," + keysArray.splice(1).join(",");
+            }
+
+            var m = metric + "{" + keysQuery + "}";
+
+            return this._get('/api/search/lookup', { m: m, limit: 3000 }).then(function (result) {
+              result = result.data.results;
+              var tagvs = [];
+              _.each(result, function (r) {
+                if (tagvs.indexOf(r.tags[key]) === -1) {
+                  tagvs.push(r.tags[key]);
+                }
+              });
+              return tagvs;
+            });
+          }
+        }, {
+          key: '_performMetricKeyLookup',
+          value: function _performMetricKeyLookup(metric) {
+            if (!metric) {
+              return this.$q.when([]);
+            }
+
+            return this._get('/api/search/lookup', { m: metric, limit: 1000 }).then(function (result) {
+              result = result.data.results;
+              var tagks = [];
+              _.each(result, function (r) {
+                _.each(r.tags, function (tagv, tagk) {
+                  if (tagks.indexOf(tagk) === -1) {
+                    tagks.push(tagk);
+                  }
+                });
+              });
+              return tagks;
+            });
+          }
+        }, {
+          key: '_get',
+          value: function _get(relativeUrl, params) {
+            var options = {
+              method: 'GET',
+              url: this.url + relativeUrl,
+              params: params
+            };
+
+            this._addCredentialOptions(options);
+
+            return this.backendSrv.datasourceRequest(options);
+          }
+        }, {
+          key: '_addCredentialOptions',
+          value: function _addCredentialOptions(options) {
+            if (this.basicAuth || this.withCredentials) {
+              options.withCredentials = true;
+            }
+            if (this.basicAuth) {
+              options.headers = { "Authorization": this.basicAuth };
+            }
+          }
+        }, {
+          key: 'getAggregators',
+          value: function getAggregators() {
+            if (this.aggregatorsPromise) {
+              return this.aggregatorsPromise;
+            }
+
+            this.aggregatorsPromise = this._get('/api/aggregators').then(function (result) {
+              if (result.data && _.isArray(result.data)) {
+                return result.data.sort();
+              }
+              return [];
+            });
+            return this.aggregatorsPromise;
+          }
+        }, {
+          key: 'getFilterTypes',
+          value: function getFilterTypes() {
+            if (this.filterTypesPromise) {
+              return this.filterTypesPromise;
+            }
+
+            // filters are for a newer opentsdb api version than Timely originally copied.
+            this.filterTypesPromise = this._get('/api/aggregators').then(function (result) {
+              return [];
+            });
+            return this.filterTypesPromise;
+          }
+        }, {
+          key: 'transformMetricData',
+          value: function transformMetricData(md, groupByTags, target, options) {
+            var metricLabel = this.createMetricLabel(md, target, groupByTags, options);
+            var dps = [];
+
+            // TSDB returns datapoints has a hash of ts => value.
+            // Can't use _.pairs(invert()) because it stringifies keys/values
+            _.each(md.dps, function (v, k) {
+              dps.push([v, k * 1]);
+            });
+
+            return { target: metricLabel, datapoints: dps };
+          }
+        }, {
+          key: 'createMetricLabel',
+          value: function createMetricLabel(md, target, groupByTags, options) {
+            if (target.alias) {
+              var scopedVars = _.clone(options.scopedVars || {});
+              _.each(md.tags, function (value, key) {
+                scopedVars['tag_' + key] = { value: value };
+              });
+              return this.templateSrv.replace(target.alias, scopedVars);
+            }
+
+            var label = md.metric;
+            var tagData = [];
+
+            if (!_.isEmpty(md.tags)) {
+              _.each(_.toPairs(md.tags), function (tag) {
+                if (_.has(groupByTags, tag[0])) {
+                  tagData.push(tag[0] + "=" + tag[1]);
+                }
+              });
+            }
+
+            if (!_.isEmpty(tagData)) {
+              label += "{" + tagData.join(", ") + "}";
+            }
+
+            return label;
+          }
+        }, {
+          key: 'convertTargetToQuery',
+          value: function convertTargetToQuery(target, options) {
+            if (!target.metric || target.hide) {
+              return null;
+            }
+
+            var query = {
+              metric: this.templateSrv.replace(target.metric, options.scopedVars),
+              aggregator: "avg"
+            };
+
+            if (target.aggregator) {
+              query.aggregator = this.templateSrv.replace(target.aggregator);
+            }
+
+            if (target.shouldComputeRate) {
+              query.rate = true;
+              query.rateOptions = {
+                counter: !!target.isCounter
+              };
+
+              if (target.counterMax && target.counterMax.length) {
+                query.rateOptions.counterMax = parseInt(target.counterMax);
+              }
+
+              if (target.counterResetValue && target.counterResetValue.length) {
+                query.rateOptions.resetValue = parseInt(target.counterResetValue);
+              }
+            }
+
+            if (!target.disableDownsampling) {
+              var interval = this.templateSrv.replace(target.downsampleInterval || options.interval);
+
+              if (interval.match(/\.[0-9]+s/)) {
+                interval = parseFloat(interval) * 1000 + "ms";
+              }
+
+              query.downsample = interval + "-" + target.downsampleAggregator;
+
+              if (target.downsampleFillPolicy && target.downsampleFillPolicy !== "none") {
+                query.downsample += "-" + target.downsampleFillPolicy;
+              }
+            }
+
+            if (target.filters && target.filters.length > 0) {
+              query.filters = angular.copy(target.filters);
+              if (query.filters) {
+                for (var filter_key in query.filters) {
+                  query.filters[filter_key].filter = this.templateSrv.replace(query.filters[filter_key].filter, options.scopedVars, 'pipe');
+                }
+              }
+            } else {
+              query.tags = angular.copy(target.tags);
+              if (query.tags) {
+                for (var tag_key in query.tags) {
+                  query.tags[tag_key] = this.templateSrv.replace(query.tags[tag_key], options.scopedVars, 'pipe');
+                }
+              }
+            }
+
+            return query;
+          }
+        }, {
+          key: 'mapMetricsToTargets',
+          value: function mapMetricsToTargets(metrics, options) {
+            var interpolatedTagValue;
+            return _.map(metrics, function (metricData) {
+              return _.findIndex(options.targets, function (target) {
+                if (target.filters && target.filters.length > 0) {
+                  return target.metric === metricData.metric;
+                } else {
+                  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));
+                }
+              }.bind(this));
+            }.bind(this));
+          }
+        }, {
+          key: 'convertToTSDBTime',
+          value: function convertToTSDBTime(date, roundUp) {
+            if (date === 'now') {
+              return null;
+            }
+
+            date = dateMath.parse(date, roundUp);
+            return date.valueOf();
+          }
+        }, {
+          key: '_makeHttpsUrl',
+          value: function _makeHttpsUrl() {
+            return 'https://' + this.timelyHost + ':' + this.httpsPort;
+          }
+        }, {
+          key: '_makeWsUrl',
+          value: function _makeWsUrl() {
+            return 'ws://' + this.timelyHost + ':' + this.wsPort;
+          }
+        }]);
+
+        return TimelyDatasource;
+      }());
+
+      _export('TimelyDatasource', TimelyDatasource);
+    }
+  };
+});
+//# sourceMappingURL=datasource.js.map

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

@@ -0,0 +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","responsePromises","reqBody","showQuery","_addCredentialOptions","headers","Promise","all","queryResponses","combinedResponse","x","concat","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":"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 truncated

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

@@ -0,0 +1,39 @@
+'use strict';
+
+System.register(['./datasource', './query_ctrl', './config'], function (_export, _context) {
+  "use strict";
+
+  var TimelyDatasource, TimelyQueryCtrl, DatasourceConfigCtrl, TimelyAnnotationsQueryCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  return {
+    setters: [function (_datasource) {
+      TimelyDatasource = _datasource.TimelyDatasource;
+    }, function (_query_ctrl) {
+      TimelyQueryCtrl = _query_ctrl.TimelyQueryCtrl;
+    }, function (_config) {
+      DatasourceConfigCtrl = _config.DatasourceConfigCtrl;
+    }],
+    execute: function () {
+      _export('AnnotationsQueryCtrl', TimelyAnnotationsQueryCtrl = function TimelyAnnotationsQueryCtrl() {
+        _classCallCheck(this, TimelyAnnotationsQueryCtrl);
+      });
+
+      TimelyAnnotationsQueryCtrl.templateUrl = 'components/annotations.editor.html';
+
+      _export('Datasource', TimelyDatasource);
+
+      _export('QueryCtrl', TimelyQueryCtrl);
+
+      _export('ConfigCtrl', DatasourceConfigCtrl);
+
+      _export('AnnotationsQueryCtrl', TimelyAnnotationsQueryCtrl);
+    }
+  };
+});
+//# sourceMappingURL=module.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/datasource/module.js"],"names":["TimelyDatasource","TimelyQueryCtrl","DatasourceConfigCtrl","TimelyAnnotationsQueryCtrl","templateUrl"],"mappings":";;;;;;;;;;;;;;;AAAQA,sB,eAAAA,gB;;AACAC,qB,eAAAA,e;;AACAC,0B,WAAAA,oB;;;sCAEFC,0B;;;;AACNA,iCAA2BC,WAA3B,GAAyC,oCAAzC;;4BAGEJ,gB;;2BACAC,e;;4BACAC,oB;;sCACAC,0B","file":"module.js","sourcesContent":["import {TimelyDatasource} from './datasource';\nimport {TimelyQueryCtrl} from './query_ctrl';\nimport {DatasourceConfigCtrl} from './config';\n\nclass TimelyAnnotationsQueryCtrl {}\nTimelyAnnotationsQueryCtrl.templateUrl = 'components/annotations.editor.html';\n\nexport {\n  TimelyDatasource as Datasource,\n  TimelyQueryCtrl as QueryCtrl,\n  DatasourceConfigCtrl as ConfigCtrl,\n  TimelyAnnotationsQueryCtrl as AnnotationsQueryCtrl\n};\n"]}

grafana/timely-app/dist/datasource/partials/config.html

@@ -0,0 +1,66 @@
+<div class="gf-form-group">
+
+  <div class="gf-form-group">
+  	<h3 class="page-heading">Server Settings</h3>
+
+  	<div class="gf-form-inline">
+  		<div class="gf-form max-width-30">
+  			<span class="gf-form-label width-7">Hostname</span>
+  			<input class="gf-form-input" type="text"
+  						 ng-model="ctrl.current.jsonData.timelyHost" placeholder="{{ctrl.current.jsonData.suggestHost}}"
+               min-length="0"
+  						 ng-pattern="/(\w+:{0,1}\w*@)?(\S+)?$/" required></input>
+  			<info-popover mode="right-absolute">
+  				<p>Hostname of timely server</p>
+  			</info-popover>
+  		</div>
+  	</div>
+
+    <div class="gf-form-inline">
+  		<div class="gf-form max-width-30">
+  			<span class="gf-form-label width-7">HTTPS Port</span>
+  			<input class="gf-form-input" type="text"
+  						 ng-model="ctrl.current.jsonData.httpsPort"
+               min-length="0"
+  						 ng-pattern="/[0-9]+/" required></input>
+  			<info-popover mode="right-absolute">
+  				<p>Port number for Timely HTTPS access</p>
+  			</info-popover>
+  		</div>
+  	</div>
+
+    <div class="gf-form-inline">
+  		<div class="gf-form max-width-30">
+  			<span class="gf-form-label width-7">WS Port</span>
+  			<input class="gf-form-input" type="text"
+  						 ng-model="ctrl.current.jsonData.wsPort"
+               min-length="0"
+  						 ng-pattern="/[0-9]+/"></input>
+  			<info-popover mode="right-absolute">
+  				<p>Port number for Timely WebSocket access</p>
+  			</info-popover>
+  		</div>
+  	</div>
+
+    <gf-form-switch class="gf-form "
+									label="Basic Auths"
+				 checked="ctrl.current.jsonData.basicAuths" switch-class="max-width-6">
+		</gf-form-switch>
+
+  </div>
+
+  <div class="gf-form-group">
+    <div class="gf-form">
+      <span class="gf-form-label">
+        <a ng-href="https://{{ctrl.current.jsonData.timelyHost}}:{{ctrl.current.jsonData.httpsPort}}/version" target="_blank">
+          Browser Cert Check
+        </a>
+
+      <info-popover mode="right">
+        <p>Opens a new browser to test https access, allows you to accept a cert, etc.</p>
+      </info-popover>
+    </span>
+    </div>
+  </div>
+
+</div>

grafana/timely-app/dist/datasource/plugin.json

@@ -0,0 +1,28 @@
+{
+  "type": "datasource",
+  "name": "Timely",
+  "id": "timely-datasource",
+
+  "metrics": true,
+  "defaultMatchFormat": "pipe",
+  "annotations": true,
+
+  "includes": [
+    {"type": "dashboard", "name": "Timely Standalone Test", "path": "dashboards/standalone_test.json"},
+    {"type": "dashboard", "name": "Accumulo Overview", "path": "dashboards/AccumuloOverview.json"},
+    {"type": "dashboard", "name": "Hadoop Overview", "path": "dashboards/HadoopOverview.json"},
+    {"type": "dashboard", "name": "System Overview", "path": "dashboards/SystemOverview.json"},
+    {"type": "dashboard", "name": "Timely Status", "path": "dashboards/TimelyStatus.json"}
+  ],
+
+  "info": {
+    "author": {
+      "name": "National Security Agency",
+      "url": "http://github.com/NationalSecurityAgency/timely"
+    },
+    "logos": {
+      "small": "../timely-app/img/brand_small.png",
+      "large": "../timely-app/img/brand_large.png"
+    }
+  }
+}

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

@@ -0,0 +1,277 @@
+'use strict';
+
+System.register(['lodash', 'app/plugins/sdk'], function (_export, _context) {
+  "use strict";
+
+  var _, QueryCtrl, _createClass, TimelyQueryCtrl;
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  function _possibleConstructorReturn(self, call) {
+    if (!self) {
+      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    }
+
+    return call && (typeof call === "object" || typeof call === "function") ? call : self;
+  }
+
+  function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+      throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+    }
+
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+    if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+  }
+
+  return {
+    setters: [function (_lodash) {
+      _ = _lodash.default;
+    }, function (_appPluginsSdk) {
+      QueryCtrl = _appPluginsSdk.QueryCtrl;
+    }],
+    execute: function () {
+      _createClass = function () {
+        function defineProperties(target, props) {
+          for (var i = 0; i < props.length; i++) {
+            var descriptor = props[i];
+            descriptor.enumerable = descriptor.enumerable || false;
+            descriptor.configurable = true;
+            if ("value" in descriptor) descriptor.writable = true;
+            Object.defineProperty(target, descriptor.key, descriptor);
+          }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+          if (protoProps) defineProperties(Constructor.prototype, protoProps);
+          if (staticProps) defineProperties(Constructor, staticProps);
+          return Constructor;
+        };
+      }();
+
+      _export('TimelyQueryCtrl', TimelyQueryCtrl = function (_QueryCtrl) {
+        _inherits(TimelyQueryCtrl, _QueryCtrl);
+
+        function TimelyQueryCtrl($scope, $injector, uiSegmentSrv) {
+          _classCallCheck(this, TimelyQueryCtrl);
+
+          var _this = _possibleConstructorReturn(this, (TimelyQueryCtrl.__proto__ || Object.getPrototypeOf(TimelyQueryCtrl)).call(this, $scope, $injector));
+
+          _this.errors = _this.validateTarget();
+          _this.aggregators = ['avg', 'sum', 'min', 'max', 'dev', 'zimsum', 'mimmin', 'mimmax'];
+          _this.fillPolicies = ['none', 'nan', 'null', 'zero'];
+          _this.filterTypes = ['wildcard', 'iliteral_or', 'not_iliteral_or', 'not_literal_or', 'iwildcard', 'literal_or', 'regexp'];
+
+          if (!_this.target.aggregator) {
+            _this.target.aggregator = 'sum';
+          }
+
+          if (!_this.target.downsampleAggregator) {
+            _this.target.downsampleAggregator = 'avg';
+          }
+
+          if (!_this.target.downsampleFillPolicy) {
+            _this.target.downsampleFillPolicy = 'none';
+          }
+
+          _this.datasource.getAggregators().then(function (aggs) {
+            if (aggs.length !== 0) {
+              _this.aggregators = aggs;
+            }
+          });
+
+          _this.datasource.getFilterTypes().then(function (filterTypes) {
+            if (filterTypes.length !== 0) {
+              _this.filterTypes = filterTypes;
+            }
+          });
+
+          // needs to be defined here as it is called from typeahead
+          _this.suggestMetrics = function (query, callback) {
+            _this.datasource.metricFindQuery('metrics(' + query + ')').then(_this.getTextValues).then(callback);
+          };
+
+          _this.suggestTagKeys = function (query, callback) {
+            _this.datasource.suggestTagKeys(_this.target.metric).then(callback);
+          };
+
+          _this.suggestTagValues = function (query, callback) {
+            _this.datasource.metricFindQuery('suggest_tagv(' + query + ')').then(_this.getTextValues).then(callback);
+          };
+
+          return _this;
+        }
+
+        _createClass(TimelyQueryCtrl, [{
+          key: 'targetBlur',
+          value: function targetBlur() {
+            this.errors = this.validateTarget();
+            this.refresh();
+          }
+        }, {
+          key: 'getTextValues',
+          value: function getTextValues(metricFindResult) {
+            return _.map(metricFindResult, function (value) {
+              return value.text;
+            });
+          }
+        }, {
+          key: 'addTag',
+          value: function addTag() {
+
+            if (this.target.filters && this.target.filters.length > 0) {
+              this.errors.tags = "Please remove filters to use tags, tags and filters are mutually exclusive.";
+            }
+
+            if (!this.addTagMode) {
+              this.addTagMode = true;
+              return;
+            }
+
+            if (!this.target.tags) {
+              this.target.tags = {};
+            }
+
+            this.errors = this.validateTarget();
+
+            if (!this.errors.tags) {
+              this.target.tags[this.target.currentTagKey] = this.target.currentTagValue;
+              this.target.currentTagKey = '';
+              this.target.currentTagValue = '';
+              this.targetBlur();
+            }
+
+            this.addTagMode = false;
+          }
+        }, {
+          key: 'removeTag',
+          value: function removeTag(key) {
+            delete this.target.tags[key];
+            this.targetBlur();
+          }
+        }, {
+          key: 'editTag',
+          value: function editTag(key, value) {
+            this.removeTag(key);
+            this.target.currentTagKey = key;
+            this.target.currentTagValue = value;
+            this.addTag();
+          }
+        }, {
+          key: 'closeAddTagMode',
+          value: function closeAddTagMode() {
+            this.addTagMode = false;
+            return;
+          }
+        }, {
+          key: 'addFilter',
+          value: function addFilter() {
+
+            if (this.target.tags && _.size(this.target.tags) > 0) {
+              this.errors.filters = "Please remove tags to use filters, tags and filters are mutually exclusive.";
+            }
+
+            if (!this.addFilterMode) {
+              this.addFilterMode = true;
+              return;
+            }
+
+            if (!this.target.filters) {
+              this.target.filters = [];
+            }
+
+            if (!this.target.currentFilterType) {
+              this.target.currentFilterType = 'iliteral_or';
+            }
+
+            if (!this.target.currentFilterGroupBy) {
+              this.target.currentFilterGroupBy = false;
+            }
+
+            this.errors = this.validateTarget();
+
+            if (!this.errors.filters) {
+              var currentFilter = {
+                type: this.target.currentFilterType,
+                tagk: this.target.currentFilterKey,
+                filter: this.target.currentFilterValue,
+                groupBy: this.target.currentFilterGroupBy
+              };
+              this.target.filters.push(currentFilter);
+              this.target.currentFilterType = 'literal_or';
+              this.target.currentFilterKey = '';
+              this.target.currentFilterValue = '';
+              this.target.currentFilterGroupBy = false;
+              this.targetBlur();
+            }
+
+            this.addFilterMode = false;
+          }
+        }, {
+          key: 'removeFilter',
+          value: function removeFilter(index) {
+            this.target.filters.splice(index, 1);
+            this.targetBlur();
+          }
+        }, {
+          key: 'editFilter',
+          value: function editFilter(fil, index) {
+            this.removeFilter(index);
+            this.target.currentFilterKey = fil.tagk;
+            this.target.currentFilterValue = fil.filter;
+            this.target.currentFilterType = fil.type;
+            this.target.currentFilterGroupBy = fil.groupBy;
+            this.addFilter();
+          }
+        }, {
+          key: 'closeAddFilterMode',
+          value: function closeAddFilterMode() {
+            this.addFilterMode = false;
+            return;
+          }
+        }, {
+          key: 'validateTarget',
+          value: function validateTarget() {
+            var errs = {};
+
+            if (this.target.shouldDownsample) {
+              try {
+                if (this.target.downsampleInterval) {
+                  kbn.describe_interval(this.target.downsampleInterval);
+                } else {
+                  errs.downsampleInterval = "You must supply a downsample interval (e.g. '1m' or '1h').";
+                }
+              } catch (err) {
+                errs.downsampleInterval = err.message;
+              }
+            }
+
+            if (this.target.tags && _.has(this.target.tags, this.target.currentTagKey)) {
+              errs.tags = "Duplicate tag key '" + this.target.currentTagKey + "'.";
+            }
+
+            return errs;
+          }
+        }]);
+
+        return TimelyQueryCtrl;
+      }(QueryCtrl));
+
+      _export('TimelyQueryCtrl', TimelyQueryCtrl);
+
+      TimelyQueryCtrl.templateUrl = 'components/query.editor.html';
+    }
+  };
+});
+//# sourceMappingURL=query_ctrl.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/datasource/query_ctrl.js"],"names":["_","QueryCtrl","TimelyQueryCtrl","$scope","$injector","uiSegmentSrv","errors","validateTarget","aggregators","fillPolicies","filterTypes","target","aggregator","downsampleAggregator","downsampleFillPolicy","datasource","getAggregators","then","aggs","length","getFilterTypes","suggestMetrics","query","callback","metricFindQuery","getTextValues","suggestTagKeys","metric","suggestTagValues","refresh","metricFindResult","map","value","text","filters","tags","addTagMode","currentTagKey","currentTagValue","targetBlur","key","removeTag","addTag","size","addFilterMode","currentFilterType","currentFilterGroupBy","currentFilter","type","tagk","currentFilterKey","filter","currentFilterValue","groupBy","push","index","splice","fil","removeFilter","addFilter","errs","shouldDownsample","downsampleInterval","kbn","describe_interval","err","message","has","templateUrl"],"mappings":"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 truncated

grafana/timely-app/dist/light.js

@@ -1,101 +0,0 @@
-define(function() { return /******/ (function(modules) { // webpackBootstrap
-/******/ 	// The module cache
-/******/ 	var installedModules = {};
-/******/
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/
-/******/ 		// Check if module is in cache
-/******/ 		if(installedModules[moduleId]) {
-/******/ 			return installedModules[moduleId].exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = installedModules[moduleId] = {
-/******/ 			i: moduleId,
-/******/ 			l: false,
-/******/ 			exports: {}
-/******/ 		};
-/******/
-/******/ 		// Execute the module function
-/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
-/******/
-/******/ 		// Flag the module as loaded
-/******/ 		module.l = true;
-/******/
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/
-/******/
-/******/ 	// expose the modules object (__webpack_modules__)
-/******/ 	__webpack_require__.m = modules;
-/******/
-/******/ 	// expose the module cache
-/******/ 	__webpack_require__.c = installedModules;
-/******/
-/******/ 	// define getter function for harmony exports
-/******/ 	__webpack_require__.d = function(exports, name, getter) {
-/******/ 		if(!__webpack_require__.o(exports, name)) {
-/******/ 			Object.defineProperty(exports, name, { enumerable: true, get: getter });
-/******/ 		}
-/******/ 	};
-/******/
-/******/ 	// define __esModule on exports
-/******/ 	__webpack_require__.r = function(exports) {
-/******/ 		if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 			Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 		}
-/******/ 		Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 	};
-/******/
-/******/ 	// create a fake namespace object
-/******/ 	// mode & 1: value is a module id, require it
-/******/ 	// mode & 2: merge all properties of value into the ns
-/******/ 	// mode & 4: return value when already ns object
-/******/ 	// mode & 8|1: behave like require
-/******/ 	__webpack_require__.t = function(value, mode) {
-/******/ 		if(mode & 1) value = __webpack_require__(value);
-/******/ 		if(mode & 8) return value;
-/******/ 		if((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;
-/******/ 		var ns = Object.create(null);
-/******/ 		__webpack_require__.r(ns);
-/******/ 		Object.defineProperty(ns, 'default', { enumerable: true, value: value });
-/******/ 		if(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));
-/******/ 		return ns;
-/******/ 	};
-/******/
-/******/ 	// getDefaultExport function for compatibility with non-harmony modules
-/******/ 	__webpack_require__.n = function(module) {
-/******/ 		var getter = module && module.__esModule ?
-/******/ 			function getDefault() { return module['default']; } :
-/******/ 			function getModuleExports() { return module; };
-/******/ 		__webpack_require__.d(getter, 'a', getter);
-/******/ 		return getter;
-/******/ 	};
-/******/
-/******/ 	// Object.prototype.hasOwnProperty.call
-/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
-/******/
-/******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/";
-/******/
-/******/
-/******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = "./styles/light.css");
-/******/ })
-/************************************************************************/
-/******/ ({
-
-/***/ "./styles/light.css":
-/*!**************************!*\
-  !*** ./styles/light.css ***!
-  \**************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ })
-
-/******/ })});;
-//# sourceMappingURL=light.js.map

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

@@ -1 +0,0 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///./styles/light.css"],"names":[],"mappings":";QAAA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;;QAEA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;;;QAGA;QACA;;QAEA;QACA;;QAEA;QACA;QACA;QACA,0CAA0C,gCAAgC;QAC1E;QACA;;QAEA;QACA;QACA;QACA,wDAAwD,kBAAkB;QAC1E;QACA,iDAAiD,cAAc;QAC/D;;QAEA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA;QACA,yCAAyC,iCAAiC;QAC1E,gHAAgH,mBAAmB,EAAE;QACrI;QACA;;QAEA;QACA;QACA;QACA,2BAA2B,0BAA0B,EAAE;QACvD,iCAAiC,eAAe;QAChD;QACA;QACA;;QAEA;QACA,sDAAsD,+DAA+D;;QAErH;QACA;;;QAGA;QACA;;;;;;;;;;;;AClFA,uC","file":"light.js","sourcesContent":[" \t// The module cache\n \tvar installedModules = {};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, { enumerable: true, get: getter });\n \t\t}\n \t};\n\n \t// define __esModule on exports\n \t__webpack_require__.r = function(exports) {\n \t\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n \t\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n \t\t}\n \t\tObject.defineProperty(exports, '__esModule', { value: true });\n \t};\n\n \t// create a fake namespace object\n \t// mode & 1: value is a module id, require it\n \t// mode & 2: merge all properties of value into the ns\n \t// mode & 4: return value when already ns object\n \t// mode & 8|1: behave like require\n \t__webpack_require__.t = function(value, mode) {\n \t\tif(mode & 1) value = __webpack_require__(value);\n \t\tif(mode & 8) return value;\n \t\tif((mode & 4) && typeof value === 'object' && value && value.__esModule) return value;\n \t\tvar ns = Object.create(null);\n \t\t__webpack_require__.r(ns);\n \t\tObject.defineProperty(ns, 'default', { enumerable: true, value: value });\n \t\tif(mode & 2 && typeof value != 'string') for(var key in value) __webpack_require__.d(ns, key, function(key) { return value[key]; }.bind(null, key));\n \t\treturn ns;\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"/\";\n\n\n \t// Load entry module and return exports\n \treturn __webpack_require__(__webpack_require__.s = \"./styles/light.css\");\n","// extracted by mini-css-extract-plugin"],"sourceRoot":""}

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

@@ -1 +1 @@
-{"version":3,"sources":["webpack:///webpack/bootstrap","webpack:///../node_modules/@babel/runtime/helpers/assertThisInitialized.js","webpack:///../node_modules/@babel/runtime/helpers/defineProperty.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayLikeToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js","webpack:///../node_modules/@babel/runtime/helpers/esm/arrayWithoutHoles.js","webpack:///../node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js","webpack:///../node_modules/@babel/runtime/helpers/esm/classCallCheck.js","webpack:///../node_modules/@babel/runtime/helpers/esm/createClass.js","webpack:///../node_modules/@babel/runtime/helpers/esm/defineProperty.js","webpack:///../node_modules/@babel/runtime/helpers/esm/extends.js","webpack:///../node_modules/@babel/runtime/helpers/esm/getPrototypeOf.js","webpack:///../node_modules/@babel/runtime/helpers/esm/inherits.js","webpack:///../node_modules/@babel/runtime/helpers/esm/inheritsLoose.js","webpack:///../node_modules/@babel/runtime/helpers/esm/iterableToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/iterableToArrayLimit.js","webpack:///../node_modules/@babel/runtime/helpers/esm/nonIterableRest.js","webpack:///../node_modules/@babel/runtime/helpers/esm/nonIterableSpread.js","webpack:///../node_modules/@babel/runtime/helpers/esm/objectWithoutProperties.js","webpack:///../node_modules/@babel/runtime/helpers/esm/objectWithoutPropertiesLoose.js","webpack:///../node_modules/@babel/runtime/helpers/esm/possibleConstructorReturn.js","webpack:///../node_modules/@babel/runtime/helpers/esm/setPrototypeOf.js","webpack:///../node_modules/@babel/runtime/helpers/esm/slicedToArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/toArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/toConsumableArray.js","webpack:///../node_modules/@babel/runtime/helpers/esm/typeof.js","webpack:///../node_modules/@babel/runtime/helpers/esm/unsupportedIterableToArray.js","webpack:///../node_modules/@babel/runtime/helpers/extends.js","webpack:///../node_modules/@babel/runtime/helpers/inheritsLoose.js","webpack:///../node_modules/@babel/runtime/helpers/objectWithoutPropertiesLoose.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/Accordion.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/AccordionContext.js","webpack:///../node_modules/@material-ui/core/esm/Accordion/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionActions/AccordionActions.js","webpack:///../node_modules/@material-ui/core/esm/AccordionActions/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionDetails/AccordionDetails.js","webpack:///../node_modules/@material-ui/core/esm/AccordionDetails/index.js","webpack:///../node_modules/@material-ui/core/esm/AccordionSummary/AccordionSummary.js","webpack:///../node_modules/@material-ui/core/esm/AccordionSummary/index.js","webpack:///../node_modules/@material-ui/core/esm/AppBar/AppBar.js","webpack:///../node_modules/@material-ui/core/esm/AppBar/index.js","webpack:///../node_modules/@material-ui/core/esm/Avatar/Avatar.js","webpack:///../node_modules/@material-ui/core/esm/Avatar/index.js","webpack:///../node_modules/@material-ui/core/esm/Backdrop/Backdrop.js","webpack:///../node_modules/@material-ui/core/esm/Backdrop/index.js","webpack:///../node_modules/@material-ui/core/esm/Badge/Badge.js","webpack:///../node_modules/@material-ui/core/esm/Badge/index.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigation/BottomNavigation.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigation/index.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigationAction/BottomNavigationAction.js","webpack:///../node_modules/@material-ui/core/esm/BottomNavigationAction/index.js","webpack:///../node_modules/@material-ui/core/esm/Box/Box.js","webpack:///../node_modules/@material-ui/core/esm/Box/index.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/BreadcrumbCollapsed.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/Breadcrumbs.js","webpack:///../node_modules/@material-ui/core/esm/Breadcrumbs/index.js","webpack:///../node_modules/@material-ui/core/esm/Button/Button.js","webpack:///../node_modules/@material-ui/core/esm/Button/index.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/ButtonBase.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/Ripple.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/TouchRipple.js","webpack:///../node_modules/@material-ui/core/esm/ButtonBase/index.js","webpack:///../node_modules/@material-ui/core/esm/ButtonGroup/ButtonGroup.js","webpack:///../node_modules/@material-ui/core/esm/ButtonGroup/index.js","webpack:///../node_modules/@material-ui/core/esm/Card/Card.js","webpack:///../node_modules/@material-ui/core/esm/Card/index.js","webpack:///../node_modules/@material-ui/core/esm/CardActionArea/CardActionArea.js"Line truncated
+{"version":3,"sources":["../src/module.js"],"names":["TimelyAppConfigCtrl","MetricsPageCtrl","AuthsPageCtrl"],"mappings":";;;;;;;;AAAQA,yB,qBAAAA,mB;;AACAC,qB,sBAAAA,e;;AACAC,mB,wBAAAA,a;;;4BAGNF,mB;;iCACAC,e;;+BACAC,a","file":"module.js","sourcesContent":["import {TimelyAppConfigCtrl} from './components/config';\nimport {MetricsPageCtrl} from './components/metrics';\nimport {AuthsPageCtrl} from './components/authspage';\n\nexport {\n  TimelyAppConfigCtrl as ConfigCtrl,\n  MetricsPageCtrl,\n  AuthsPageCtrl\n};\n"]}

grafana/timely-app/dist/plugin.json

@@ -1,42 +1,41 @@
 {
-  "type": "datasource",
+  "type": "app",
   "name": "Timely",
-  "id": "nsa-timely-datasource",
-  "category": "tsdb",
-  "metrics": true,
-  "backend": true,
-  "alerting": true,
-  "executable": "timely_datasource_backend",
+  "id": "timely-app",
+
+  "css": {
+    "dark":  "css/dark.css",
+    "light":  "css/light.css"
+  },
+
   "info": {
-    "description": "Open source time series database backed by Accumulo",
+    "description": "Timely App",
     "author": {
-      "name": "National Security Agency"
+      "name": "National Security Agency",
+      "url": "http://github.com/NationalSecurityAgency"
     },
-    "keywords": [
-      "Simple"
-    ],
+    "keywords": ["timely app datasource"],
     "logos": {
-      "small": "static/img/timely_square_small.png",
-      "large": "static/img/timely_square_large.png"
+      "small": "img/brand_small.png",
+      "large": "img/brand_large.png"
     },
     "links": [
-      {
-        "name": "Website",
-        "url": "https://code.nsa.gov/timely"
-      },
-      {
-        "name": "License",
-        "url": "https://github.com/NationalSecurityAgency/timely/blob/master/LICENSE"
-      }
+      {"name": "Project site", "url": "https://github.com/NationalSecurityAgency/timely"},
+      {"name": "License & Terms", "url": "https://raw.githubusercontent.com/NationalSecurityAgency/timely/master/LICENSE"}
     ],
-    "screenshots": [],
-    "version": "1.3.0",
-    "updated": "2020-09-25"
+    "version": "1.2.3",
+    "updated": "2019-04-18"
   },
+
+  "includes": [
+    {"type": "datasource", "name": "Timely"},
+    { "type": "page", "name": "Login", "component": "AuthsPageCtrl", "role": "Viewer", "addToNav": true},
+    { "type": "page", "name": "Metrics", "component": "MetricsPageCtrl", "role": "Viewer", "addToNav": true}
+  ],
+
   "dependencies": {
-    "classnames": "2.2.6",
-    "slate-plain-serializer": "0.7.10",
-    "grafanaVersion": "6.5.x",
+    "grafanaVersion": "4.x.x",
     "plugins": []
   }
+
 }

grafana/timely-app/dist/static/css/Typeahead-bs4.scss

@@ -1,54 +0,0 @@
-$box-shadow-dimensions: 0 0 0 0.2rem;
-$placeholder-color: #6c757d;
-
-.rbt {
-  &-input-multi {
-    // Bootstrap 4 focus style
-    &.focus {
-      background-color: #fff;
-      border-color: #80bdff;
-      box-shadow: $box-shadow-dimensions rgba(0, 123, 255, 0.25);
-      color: #495057;
-      outline: 0;
-    }
-
-    &.is-invalid.focus {
-      border-color: #dc3545;
-      box-shadow: $box-shadow-dimensions rgba(220, 53, 69, 0.25);
-    }
-
-    &.is-valid.focus {
-      border-color: #28a745;
-      box-shadow: $box-shadow-dimensions rgba(40, 167, 69, 0.25);
-    }
-
-    input {
-      // Firefox
-      &::-moz-placeholder {
-        color: $placeholder-color;
-        opacity: 1;
-      }
-
-      // Internet Explorer 10+
-      &:-ms-input-placeholder {
-        color: $placeholder-color;
-      }
-
-      // Safari and Chrome
-      &::-webkit-input-placeholder  {
-        color: $placeholder-color;
-      }
-    }
-
-    // Override height in main CSS file :/
-    & .rbt-input-main,
-    &.form-control-lg .rbt-input-main,
-    &.form-control-sm .rbt-input-main {
-      height: auto;
-    }
-  }
-
-  &-token {
-    margin: 1px 3px 2px 0;
-  }
-}

grafana/timely-app/dist/static/css/Typeahead.css

@@ -1,201 +0,0 @@
-.rbt .rbt-input-main::-ms-clear {
-    display: none !important;
-}
-
-/**
- * Menu
- */
-.rbt-menu {
-    margin-bottom: 2px !important;
-}
-
-.rbt-menu > .dropdown-item {
-    overflow: hidden !important;
-    text-overflow: ellipsis !important;
-}
-
-.rbt-menu > .dropdown-item:focus {
-    outline: none !important;
-}
-
-.rbt-menu-pagination-option {
-    text-align: center !important;
-}
-
-/**
- * Multi-select Input
- */
-.rbt-input-multi {
-    cursor: text !important;
-    overflow: hidden !important;
-    position: relative !important;
-}
-
-.rbt-input-multi.focus {
-    border-color: #80bdff !important;
-    box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25) !important;
-    color: #495057 !important;
-    outline: 0 !important;
-}
-
-.rbt-input-multi.form-control {
-    height: auto !important;
-}
-
-.rbt-input-multi.form-control[disabled] {
-    background-color: #e9ecef !important;
-    opacity: 1 !important;
-}
-
-.rbt-input-multi.is-invalid.focus {
-    border-color: #dc3545 !important;
-    box-shadow: 0 0 0 0.2rem rgba(220, 53, 69, 0.25) !important;
-}
-
-.rbt-input-multi.is-valid.focus {
-    border-color: #28a745 !important;
-    box-shadow: 0 0 0 0.2rem rgba(40, 167, 69, 0.25) !important;
-}
-
-.rbt-input-multi input::-moz-placeholder {
-    color: #6c757d !important;
-    opacity: 1 !important;
-}
-
-.rbt-input-multi input:-ms-input-placeholder {
-    color: #6c757d !important;
-}
-
-.rbt-input-multi input::-webkit-input-placeholder {
-    color: #6c757d !important;
-}
-
-.rbt-input-multi .rbt-input-wrapper {
-    align-items: flex-start !important;
-    display: flex !important;
-    flex-wrap: wrap !important;
-    margin-bottom: -4px !important;
-    margin-top: -1px !important;
-    overflow: hidden !important;
-}
-
-.rbt-input-multi .rbt-input-main {
-    margin: 1px 0 4px !important;
-}
-
-/**
- * Close Button
- */
-.rbt-close {
-    z-index: 1 !important;
-}
-
-.rbt-close-lg {
-    font-size: 24px !important;
-}
-
-/**
- * Token
- */
-.rbt-token {
-    background-color: #e7f4ff !important;
-    border: 0 !important;
-    border-radius: .25rem !important;
-    color: #007bff !important;
-    display: inline-block !important;
-    line-height: 1em !important;
-    margin: 1px 3px 2px 0 !important;
-    padding: 4px 7px !important;
-    position: relative !important;
-}
-
-.rbt-token-disabled {
-    background-color: rgba(0, 0, 0, 0.1) !important;
-    color: #495057 !important;
-    pointer-events: none !important;
-}
-
-.rbt-token-removeable {
-    cursor: pointer !important;
-    padding-right: 21px !important;
-}
-
-.rbt-token-active {
-    background-color: #007bff !important;
-    color: #fff !important;
-    outline: none !important;
-    text-decoration: none !important;
-}
-
-.rbt-token .rbt-token-remove-button {
-    bottom: 0 !important;
-    color: inherit !important;
-    font-size: inherit !important;
-    font-weight: normal !important;
-    opacity: 1 !important;
-    outline: none !important;
-    padding: 3px 7px !important;
-    position: absolute !important;
-    right: 0 !important;
-    text-shadow: none !important;
-    top: -2px !important;
-}
-
-/**
- * Loader + CloseButton container
- */
-.rbt-aux {
-    align-items: center !important;
-    display: flex !important;
-    bottom: 0 !important;
-    justify-content: center !important;
-    pointer-events: none !important;
-    /* Don't block clicks on the input */
-    position: absolute !important;
-    right: 0 !important;
-    top: 0 !important;
-    width: 34px !important;
-}
-
-.rbt-aux-lg {
-    width: 46px !important;
-}
-
-.rbt-aux .rbt-close {
-    margin-top: -4px !important;
-    pointer-events: auto !important;
-    /* Override pointer-events: none; above */
-}
-
-.has-aux .rbt-input {
-    padding-right: 34px !important;
-}
-
-.rbt-highlight-text {
-    background-color: inherit !important;
-    color: inherit !important;
-    font-weight: bold !important;
-    padding: 0 !important;
-}
-
-/**
- * Input Groups
- */
-.input-group > .rbt {
-    flex: 1 !important;
-}
-
-.input-group > .rbt .rbt-input-hint,
-.input-group > .rbt .rbt-aux {
-    z-index: 5 !important;
-}
-
-.input-group > .rbt:not(:first-child) .form-control {
-    border-top-left-radius: 0 !important;
-    border-bottom-left-radius: 0 !important;
-}
-
-.input-group > .rbt:not(:last-child) .form-control {
-    border-top-right-radius: 0 !important;
-    border-bottom-right-radius: 0 !important;
-}

grafana/timely-app/dist/static/css/Typeahead.scss

@@ -1,240 +0,0 @@
-$animation: loader-animation 600ms infinite linear;
-$inset: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-$placeholder-color: #999;
-
-.rbt {
-  &-menu {
-    margin-bottom: 2px; // Spacing for dropup
-
-    & > li a {
-      overflow: hidden;
-      text-overflow: ellipsis;
-
-      &:focus {
-        outline: none;
-      }
-    }
-
-    &-pagination-option {
-      text-align: center;
-    }
-  }
-
-  // Hide IE's native "clear" button
-  & .rbt-input-main::-ms-clear {
-    display: none;
-  }
-
-  &-input-multi {
-    cursor: text;
-    overflow: hidden;
-    position: relative;
-    height: auto;
-
-    // Apply Bootstrap focus styles
-    &.focus {
-      box-shadow: $inset, 0 0 8px rgba(102, 175, 233, 0.6);
-      border-color: #66afe9;
-      outline: 0;
-    }
-
-    // BS4 uses the :disabled pseudo-class, which doesn't work with non-inputs.
-    &.form-control[disabled] {
-      background-color: #e9ecef;
-      opacity: 1;
-    }
-
-    // Apply Bootstrap placeholder styles
-    input {
-      // Firefox
-      &::-moz-placeholder {
-        color: $placeholder-color;
-        opacity: 1;
-      }
-
-      // Internet Explorer 10+
-      &:-ms-input-placeholder {
-        color: $placeholder-color;
-      }
-
-      // Safari and Chrome
-      &::-webkit-input-placeholder  {
-        color: $placeholder-color;
-      }
-    }
-
-    .rbt-input-wrapper {
-      align-items: flex-start;
-      display: flex;
-      flex-wrap: wrap;
-      margin-bottom: -4px;
-      margin-top: -1px;
-      overflow: hidden;
-    }
-
-    .rbt-input-main {
-      // Set input height for cross-browser consistency
-      height: 20px;
-      margin: 1px 0 4px;
-    }
-
-    &.input,
-    &.form-control {
-      &-lg {
-        .rbt-input-main {
-          height: 24px;
-        }
-      }
-
-      &-sm {
-        .rbt-input-main {
-          height: 18px;
-        }
-      }
-    }
-  }
-
-  &-close {
-    z-index: 1;
-
-    &-lg {
-      font-size: 24px;
-    }
-  }
-
-  &-token {
-    background-color: #e7f4ff;
-    border: 0;
-    border-radius: 2px;
-    color: #1f8dd6;
-    display: inline-block;
-    line-height: 1em;
-    margin: 0 3px 3px 0;
-    padding: 4px 7px;
-    position: relative;
-
-    &-disabled {
-      background-color: #ddd;
-      color: #888;
-      pointer-events: none;
-    }
-
-    &-removeable {
-      cursor: pointer;
-      padding-right: 21px;
-    }
-
-    &-active {
-      background-color: #1f8dd6;
-      color: #fff;
-      outline: none;
-      text-decoration: none;
-    }
-
-    & &-remove-button {
-      bottom: 0;
-      color: inherit;
-      font-size: inherit;
-      font-weight: normal;
-      opacity: 1;
-      outline: none;
-      padding: 3px 7px;
-      position: absolute;
-      right: 0;
-      text-shadow: none;
-      top: -2px;
-    }
-  }
-
-  &-loader {
-    -moz-animation: $animation;
-    -webkit-animation: $animation;
-    animation: $animation;
-    border: 1px solid #d5d5d5;
-    border-radius: 50%;
-    border-top-color: #1f8dd6;
-    display: block;
-    height: 16px;
-    width: 16px;
-
-    &-lg {
-      height: 20px;
-      width: 20px;
-    }
-  }
-
-  &-aux {
-    align-items: center;
-    display: flex;
-    bottom: 0;
-    justify-content: center;
-    pointer-events: none; /* Don't block clicks on the input */
-    position: absolute;
-    right: 0;
-    top: 0;
-    width: 34px;
-
-    &-lg {
-      width: 46px;
-    }
-
-    & .rbt-close {
-      margin-top: -4px;
-      pointer-events: auto; /* Override pointer-events: none; above */
-    }
-  }
-
-  .has-aux &-input {
-    padding-right: 34px;
-  }
-
-  &-highlight-text {
-    background-color: inherit;
-    color: inherit;
-    font-weight: bold;
-    padding: 0;
-  }
-}
-
-/* Input Groups */
-.input-group > .rbt {
-  flex: 1;
-
-  // Form-controls within input-groups have a higher z-index.
-  & .rbt-input-hint,
-  & .rbt-aux {
-    z-index: 5;
-  }
-
-  &:not(:first-child) .form-control {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-  }
-
-  &:not(:last-child) .form-control {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-/* Validation States */
-.has-error .rbt-input-multi.focus {
-  border-color: #843534;
-  box-shadow: $inset, 0 0 6px #ce8483;
-}
-
-.has-warning .rbt-input-multi.focus {
-  border-color: #66512c;
-  box-shadow: $inset, 0 0 6px #c0a16b;
-}
-
-.has-success .rbt-input-multi.focus {
-  border-color: #2b542c;
-  box-shadow: $inset, 0 0 6px #67b168;
-}
-
-@keyframes loader-animation {
-  to {
-    transform: rotate(1turn);
-  }
-}

grafana/timely-app/dist/static/css/bootstrap-timely.css

@@ -1,408 +0,0 @@
-div.timely .form-control {
-    display: block;
-    width: 100%;
-    height: calc(1.5em + 0.75rem + 2px);
-    padding: 0.375rem 0.75rem;
-    font-size: 1rem;
-    font-weight: 400;
-    line-height: 1.5;
-    color: #495057;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid #ced4da;
-    border-radius: 0.25rem;
-    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
-
-/*@media (prefers-reduced-motion: reduce) {*/
-/*    .form-control {*/
-/*        transition: none;*/
-/*    }*/
-/*}*/
-
-div.timely .form-control::-ms-expand {
-    background-color: transparent;
-    border: 0;
-}
-
-div.timely .form-control:-moz-focusring {
-    color: transparent;
-    text-shadow: 0 0 0 #495057;
-}
-
-div.timely .form-control:focus {
-    color: #495057;
-    /*background-color: #fff;*/
-    border-color: #80bdff;
-    outline: 0;
-    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    /*box-shadow: 0 0 0 0.2rem rgba(0, 123, 255, 0.25);*/
-}
-
-div.timely .form-control::-webkit-input-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control::-moz-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control:-ms-input-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control::-ms-input-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control::placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control:disabled, div.timely .form-control[readonly] {
-    background-color: #e9ecef;
-    opacity: 1;
-}
-
-div.timely select.form-control:focus::-ms-value {
-    color: #495057;
-    background-color: #fff;
-}
-
-div.timely .form-control-file,
-div.timely .form-control-range {
-    display: block;
-    width: 100%;
-}
-
-div.timely .form-control-plaintext {
-    display: block;
-    width: 100%;
-    padding: 0.375rem 0;
-    margin-bottom: 0;
-    font-size: 1rem;
-    line-height: 1.5;
-    color: #212529;
-    background-color: transparent;
-    border: solid transparent;
-    border-width: 1px 0;
-}
-
-div.timely .form-control-plaintext.form-control-sm, div.timely .form-control-plaintext.form-control-lg {
-    padding-right: 0;
-    padding-left: 0;
-}
-
-div.timely .form-control-sm {
-    height: calc(1.5em + 0.5rem + 2px);
-    padding: 0.25rem 0.5rem;
-    font-size: 0.875rem;
-    line-height: 1.5;
-    border-radius: 0.2rem;
-}
-
-div.timely .form-control-lg {
-    height: calc(1.5em + 1rem + 2px);
-    padding: 0.5rem 1rem;
-    font-size: 1.25rem;
-    line-height: 1.5;
-    border-radius: 0.3rem;
-}
-
-div.timely select.form-control[size], div.timely select.form-control[multiple] {
-    height: auto;
-}
-
-div.timely textarea.form-control {
-    height: auto;
-}
-
-div.timely .dropdown-item {
-    display: block;
-    width: 100%;
-    padding: 0.25rem 1.5rem;
-    clear: both;
-    font-weight: 400;
-    color: #212529;
-    text-align: inherit;
-    white-space: nowrap;
-    background-color: transparent;
-    border: 0;
-}
-
-div.timely .dropdown-item:hover, div.timely .dropdown-item:focus {
-    color: #16181b;
-    text-decoration: none;
-    background-color: #f8f9fa;
-}
-
-div.timely .dropdown-item.active, div.timely .dropdown-item:active {
-    color: #fff;
-    text-decoration: none;
-    background-color: #007bff;
-}
-
-div.timely .dropdown-item.disabled, div.timely .dropdown-item:disabled {
-    color: #6c757d;
-    pointer-events: none;
-    background-color: transparent;
-}
-
-div.timely .dropdown-item-text {
-    display: block;
-    padding: 0.25rem 1.5rem;
-    color: #212529;
-}
-
-div.timely .dropup,
-div.timely .dropright,
-div.timely .dropdown,
-div.timely .dropleft {
-    position: relative;
-}
-
-div.timely .dropdown-toggle {
-    white-space: nowrap;
-}
-
-div.timely .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid;
-    border-right: 0.3em solid transparent;
-    border-bottom: 0;
-    border-left: 0.3em solid transparent;
-}
-
-div.timely .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 10rem;
-    padding: 0.5rem 0;
-    margin: 0.125rem 0 0;
-    font-size: 1rem;
-    color: #212529;
-    text-align: left;
-    list-style: none;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0.25rem;
-}
-
-div.timely .dropdown-menu-left {
-    right: auto;
-    left: 0;
-}
-
-div.timely .dropdown-menu-right {
-    right: 0;
-    left: auto;
-}
-
-/*@media (min-width: 576px) {*/
-/*    .dropdown-menu-sm-left {*/
-/*        right: auto;*/
-/*        left: 0;*/
-/*    }*/
-/*    .dropdown-menu-sm-right {*/
-/*        right: 0;*/
-/*        left: auto;*/
-/*    }*/
-/*}*/
-
-/*@media (min-width: 768px) {*/
-/*    .dropdown-menu-md-left {*/
-/*        right: auto;*/
-/*        left: 0;*/
-/*    }*/
-/*    .dropdown-menu-md-right {*/
-/*        right: 0;*/
-/*        left: auto;*/
-/*    }*/
-/*}*/
-
-/*@media (min-width: 992px) {*/
-/*    .dropdown-menu-lg-left {*/
-/*        right: auto;*/
-/*        left: 0;*/
-/*    }*/
-/*    .dropdown-menu-lg-right {*/
-/*        right: 0;*/
-/*        left: auto;*/
-/*    }*/
-/*}*/
-
-/*@media (min-width: 1200px) {*/
-/*    .dropdown-menu-xl-left {*/
-/*        right: auto;*/
-/*        left: 0;*/
-/*    }*/
-/*    .dropdown-menu-xl-right {*/
-/*        right: 0;*/
-/*        left: auto;*/
-/*    }*/
-/*}*/
-
-div.timely .dropup .dropdown-menu {
-    top: auto;
-    bottom: 100%;
-    margin-top: 0;
-    margin-bottom: 0.125rem;
-}
-
-div.timely .dropup .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0;
-    border-right: 0.3em solid transparent;
-    border-bottom: 0.3em solid;
-    border-left: 0.3em solid transparent;
-}
-
-div.timely .dropup .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropright .dropdown-menu {
-    top: 0;
-    right: auto;
-    left: 100%;
-    margin-top: 0;
-    margin-left: 0.125rem;
-}
-
-div.timely .dropright .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid transparent;
-    border-right: 0;
-    border-bottom: 0.3em solid transparent;
-    border-left: 0.3em solid;
-}
-
-div.timely .dropright .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropright .dropdown-toggle::after {
-    vertical-align: 0;
-}
-
-div.timely .dropleft .dropdown-menu {
-    top: 0;
-    right: 100%;
-    left: auto;
-    margin-top: 0;
-    margin-right: 0.125rem;
-}
-
-div.timely .dropleft .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-}
-
-div.timely .dropleft .dropdown-toggle::after {
-    display: none;
-}
-
-div.timely .dropleft .dropdown-toggle::before {
-    display: inline-block;
-    margin-right: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid transparent;
-    border-right: 0.3em solid;
-    border-bottom: 0.3em solid transparent;
-}
-
-div.timely .dropleft .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropleft .dropdown-toggle::before {
-    vertical-align: 0;
-}
-
-div.timely .dropdown-menu[x-placement^="top"], div.timely .dropdown-menu[x-placement^="right"], div.timely .dropdown-menu[x-placement^="bottom"], div.timely .dropdown-menu[x-placement^="left"] {
-    right: auto;
-    bottom: auto;
-}
-
-div.timely .dropdown-divider {
-    height: 0;
-    margin: 0.5rem 0;
-    overflow: hidden;
-    border-top: 1px solid #e9ecef;
-}
-
-div.timely .dropdown-item {
-    display: block;
-    width: 100%;
-    padding: 0.25rem 1.5rem;
-    clear: both;
-    font-weight: 400;
-    color: #212529;
-    text-align: inherit;
-    white-space: nowrap;
-    background-color: transparent;
-    border: 0;
-}
-
-div.timely .dropdown-item:hover, div.timely .dropdown-item:focus {
-    color: #16181b;
-    text-decoration: none;
-    background-color: #f8f9fa;
-}
-
-div.timely .dropdown-item.active, div.timely .dropdown-item:active {
-    color: #fff;
-    text-decoration: none;
-    background-color: #007bff;
-}
-
-div.timely .dropdown-item.disabled, div.timely .dropdown-item:disabled {
-    color: #6c757d;
-    pointer-events: none;
-    background-color: transparent;
-}
-
-div.timely .dropdown-menu.show {
-    display: block;
-}
-
-div.timely .dropdown-header {
-    display: block;
-    padding: 0.5rem 1.5rem;
-    margin-bottom: 0;
-    font-size: 0.875rem;
-    color: #6c757d;
-    white-space: nowrap;
-}
-
-div.timely .dropdown-item-text {
-    display: block;
-    padding: 0.25rem 1.5rem;
-    color: #212529;
-}

grafana/timely-app/dist/static/css/timely-bootstrap.css

@@ -1,359 +0,0 @@
-div.timely .form-control {
-    display: block;
-    width: 100%;
-    /*height: calc(1.5em + 0.75rem + 2px);*/
-    height: 32px;
-    /*padding: 0.375rem 0.75rem;*/
-    padding: 0px 8px;
-    /*font-size: 1rem;*/
-    font-size: 14px;
-    font-weight: 400;
-    line-height: 1.5;
-    border: 1px solid #ced4da;
-    /*border-radius: 0.25rem;*/
-    border-radius: 2px;
-    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-    color: #495057;
-    background-color: #fff;
-    background-clip: padding-box;
-}
-
-div.timely .form-control::-ms-expand {
-    background-color: transparent;
-    border: 0;
-}
-
-div.timely .form-control:-moz-focusring {
-    color: transparent;
-    text-shadow: 0 0 0 #495057;
-}
-
-div.timely .form-control:focus, div.timely input:focus {
-    border-color: #80bdff;
-    outline: 0;
-    transition: border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
-
-div.timely .form-control::-webkit-input-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control::-moz-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control:-ms-input-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control::-ms-input-placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control::placeholder {
-    color: #6c757d;
-    opacity: 1;
-}
-
-div.timely .form-control:disabled, div.timely .form-control[readonly] {
-    background-color: #e9ecef;
-    opacity: 1;
-}
-
-div.timely select.form-control:focus::-ms-value {
-    color: #495057;
-    background-color: #fff;
-}
-
-div.timely .form-control-file,
-div.timely .form-control-range {
-    display: block;
-    width: 100%;
-}
-
-div.timely .form-control-plaintext {
-    display: block;
-    width: 100%;
-    padding: 0.375rem 0;
-    margin-bottom: 0;
-    font-size: 1rem;
-    line-height: 1.5;
-    color: #212529;
-    background-color: transparent;
-    border: solid transparent;
-    border-width: 1px 0;
-}
-
-div.timely .form-control-plaintext.form-control-sm, div.timely .form-control-plaintext.form-control-lg {
-    padding-right: 0;
-    padding-left: 0;
-}
-
-div.timely .form-control-sm {
-    height: calc(1.5em + 0.5rem + 2px);
-    padding: 0.25rem 0.5rem;
-    font-size: 0.875rem;
-    line-height: 1.5;
-    border-radius: 0.2rem;
-}
-
-div.timely .form-control-lg {
-    height: calc(1.5em + 1rem + 2px);
-    padding: 0.5rem 1rem;
-    font-size: 1.25rem;
-    line-height: 1.5;
-    border-radius: 0.3rem;
-}
-
-div.timely select.form-control[size], div.timely select.form-control[multiple] {
-    height: auto;
-}
-
-div.timely textarea.form-control {
-    height: auto;
-}
-
-div.timely .dropdown-item {
-    display: block;
-    width: 100%;
-    padding: 0.25rem 1.5rem;
-    clear: both;
-    font-weight: 400;
-    color: #212529;
-    text-align: inherit;
-    white-space: nowrap;
-    background-color: transparent;
-    border: 0;
-}
-
-div.timely .dropdown-item:hover, div.timely .dropdown-item:focus {
-    color: #16181b;
-    text-decoration: none;
-    background-color: #f8f9fa;
-}
-
-div.timely .dropdown-item.active, div.timely .dropdown-item:active {
-    color: #fff;
-    text-decoration: none;
-    background-color: #007bff;
-}
-
-div.timely .dropdown-item.disabled, div.timely .dropdown-item:disabled {
-    color: #6c757d;
-    pointer-events: none;
-    background-color: transparent;
-}
-
-div.timely .dropdown-item-text {
-    display: block;
-    padding: 0.25rem 1.5rem;
-    color: #212529;
-}
-
-div.timely .dropup,
-div.timely .dropright,
-div.timely .dropdown,
-div.timely .dropleft {
-    position: relative;
-}
-
-div.timely .dropdown-toggle {
-    white-space: nowrap;
-}
-
-div.timely .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid;
-    border-right: 0.3em solid transparent;
-    border-bottom: 0;
-    border-left: 0.3em solid transparent;
-}
-
-div.timely .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropdown-menu {
-    position: absolute;
-    top: 100%;
-    left: 0;
-    z-index: 1000;
-    display: none;
-    float: left;
-    min-width: 10rem;
-    padding: 0.5rem 0;
-    margin: 0.125rem 0 0;
-    font-size: 1rem;
-    color: #212529;
-    text-align: left;
-    list-style: none;
-    background-color: #fff;
-    background-clip: padding-box;
-    border: 1px solid rgba(0, 0, 0, 0.15);
-    border-radius: 0.25rem;
-}
-
-div.timely .dropdown-menu-left {
-    right: auto;
-    left: 0;
-}
-
-div.timely .dropdown-menu-right {
-    right: 0;
-    left: auto;
-}
-
-div.timely .dropup .dropdown-menu {
-    top: auto;
-    bottom: 100%;
-    margin-top: 0;
-    margin-bottom: 0.125rem;
-}
-
-div.timely .dropup .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0;
-    border-right: 0.3em solid transparent;
-    border-bottom: 0.3em solid;
-    border-left: 0.3em solid transparent;
-}
-
-div.timely .dropup .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropright .dropdown-menu {
-    top: 0;
-    right: auto;
-    left: 100%;
-    margin-top: 0;
-    margin-left: 0.125rem;
-}
-
-div.timely .dropright .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid transparent;
-    border-right: 0;
-    border-bottom: 0.3em solid transparent;
-    border-left: 0.3em solid;
-}
-
-div.timely .dropright .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropright .dropdown-toggle::after {
-    vertical-align: 0;
-}
-
-div.timely .dropleft .dropdown-menu {
-    top: 0;
-    right: 100%;
-    left: auto;
-    margin-top: 0;
-    margin-right: 0.125rem;
-}
-
-div.timely .dropleft .dropdown-toggle::after {
-    display: inline-block;
-    margin-left: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-}
-
-div.timely .dropleft .dropdown-toggle::after {
-    display: none;
-}
-
-div.timely .dropleft .dropdown-toggle::before {
-    display: inline-block;
-    margin-right: 0.255em;
-    vertical-align: 0.255em;
-    content: "";
-    border-top: 0.3em solid transparent;
-    border-right: 0.3em solid;
-    border-bottom: 0.3em solid transparent;
-}
-
-div.timely .dropleft .dropdown-toggle:empty::after {
-    margin-left: 0;
-}
-
-div.timely .dropleft .dropdown-toggle::before {
-    vertical-align: 0;
-}
-
-div.timely .dropdown-menu[x-placement^="top"], div.timely .dropdown-menu[x-placement^="right"], div.timely .dropdown-menu[x-placement^="bottom"], div.timely .dropdown-menu[x-placement^="left"] {
-    right: auto;
-    bottom: auto;
-}
-
-div.timely .dropdown-divider {
-    height: 0;
-    margin: 0.5rem 0;
-    overflow: hidden;
-    border-top: 1px solid #e9ecef;
-}
-
-div.timely .dropdown-item {
-    display: block;
-    width: 100%;
-    padding: 0.25rem 1.5rem;
-    clear: both;
-    font-weight: 400;
-    color: #212529;
-    text-align: inherit;
-    white-space: nowrap;
-    background-color: transparent;
-    border: 0;
-}
-
-div.timely .dropdown-item:hover, div.timely .dropdown-item:focus {
-    color: #16181b;
-    text-decoration: none;
-    background-color: #f8f9fa;
-}
-
-div.timely .dropdown-item.active, div.timely .dropdown-item:active {
-    color: #fff;
-    text-decoration: none;
-    background-color: #007bff;
-}
-
-div.timely .dropdown-item.disabled, div.timely .dropdown-item:disabled {
-    color: #6c757d;
-    pointer-events: none;
-    background-color: transparent;
-}
-
-div.timely .dropdown-menu.show {
-    display: block;
-}
-
-div.timely .dropdown-header {
-    display: block;
-    padding: 0.5rem 1.5rem;
-    margin-bottom: 0;
-    font-size: 0.875rem;
-    color: #6c757d;
-    white-space: nowrap;
-}
-
-div.timely .dropdown-item-text {
-    display: block;
-    padding: 0.25rem 1.5rem;
-    color: #212529;
-}

grafana/timely-app/dist/static/css/timely.css

@@ -1,81 +0,0 @@
-div.timely input:focus {
-    z-index: 1;
-}
-
-div.timely-edior-row div.gf-form-inline {
-    height: 40px !important;
-}
-
-div.timely input.form-control {
-    border-color: rgb(44, 50, 53);
-    border-top-color: rgb(44, 50, 53);
-    border-right-color: rgb(44, 50, 53);
-    border-bottom-color: rgb(44, 50, 53);
-    border-left-color: rgb(44, 50, 53);
-}
-
-div.timely.tag {
-    min-width: 16px !important;
-    padding-left: 2px;
-    padding-right: 2px;
-}
-
-div.timely-edior-row div.gf-form {
-    margin-right: 4px !important;
-}
-
-div.timely.tag.error {
-    margin-left: 4px;
-}
-
-div.timely.tag.error svg {
-    color: #f19d06;
-}
-
-div.timely.tag.edit {
-    margin-left: 6px;
-}
-
-div.timely.tag.edit svg {
-    color: #62A562;
-}
-
-div.timely.tag.save {
-    margin-left: 6px;
-}
-
-div.timely.tag.save svg {
-    color: #62A562;
-}
-
-div.timely.tag.delete svg {
-    color: #D9162D;
-}
-
-div.timely.tag.addtag svg {
-    color: #62A562;
-}
-
-button[title="Move query down"] div svg {
-    color: #B3BFBD;
-}
-
-button[title="Move query up"] div svg {
-    color: #B3BFBD;
-}
-
-button[title="Duplicate query"] div svg {
-    color: #62A562;
-}
-
-button[title="Disable/enable query"] div svg {
-    color: #2AB4F5;
-}
-
-button[title="Remove query"] div svg {
-    color: #D9162D;
-}
-
-
-
-