Release version 1.3.6

Bump golang.org/x/net from 0.7.0 to 0.17.0 in /grafana/timely-app (#246 )
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2026-11-10 03:41:25 -10:00 · 2023-10-13 10:25:43 -04:00 · 2023-10-13 10:18:12 -04:00 · 2023-10-13 10:02:33 -04:00 · 2023-10-11 14:26:51 -04:00 · 2023-10-11 14:26:07 -04:00
27 changed files with 3551 additions and 2972 deletions
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>timely-analytics</artifactId>
  <!--
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>timely-balancer</artifactId>
  <dependencies>
@@ -4,13 +4,13 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</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.5</python.client.version>
+    <python.client.version>1.3.6</python.client.version>
  </properties>
  <dependencies>
    <dependency>
@@ -33,7 +33,7 @@ public class TcpClient implements AutoCloseable {

    /**
     * Opens a TCP connection to the specified host and port
-     * 
+     *
     * @throws IOException
     *             if an error occurs
     */
@@ -45,7 +45,7 @@ public class TcpClient implements AutoCloseable {

    /**
     * Write a metric to Timely
-     * 
+     *
     * @param metric
     *            newline terminated string representation of Timely metric
     */
@@ -69,7 +69,7 @@ public class TcpClient implements AutoCloseable {

    /**
     * Closes the tcp connection to Timely
-     * 
+     *
     * @throws IOException
     *             if an error occurs
     */
@@ -6,7 +6,6 @@ import java.util.Map;
 import javax.websocket.CloseReason;
 import javax.websocket.Endpoint;
 import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
 import javax.websocket.Session;

 import org.slf4j.Logger;
@@ -19,12 +18,8 @@ public abstract class ClientHandler extends Endpoint {
    @Override
    public void onOpen(Session session, EndpointConfig config) {
        LOG.info("Websocket session {} opened.", session.getId());
-        session.addMessageHandler(new MessageHandler.Whole<String>() {
-
-            @Override
-            public void onMessage(String message) {
-                LOG.info("Message received on Websocket session {}: {}", session.getId(), message);
-            }
+        session.addMessageHandler(String.class, message -> {
+            LOG.info("Message received on Websocket session {}: {}", session.getId(), message);
        });
    }

@@ -46,7 +46,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
-     * 
+     *
     * @return string representation
     */
    public String combine(Map<String, String> tags) {
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>collectd-nsq-plugin</artifactId>
  <dependencies>
@@ -36,6 +36,7 @@ public class WriteNSQPlugin extends CollectDPluginParent
    private String topic = "metrics#ephemeral";
    private String endpoint = null;
    private GenericObjectPool<CloseableHttpClient> clientPool = null;
+    private Random random = new Random();

    // pool should be limited by the number of WriteThreads configured in
    // collectd
@@ -88,10 +89,10 @@ public class WriteNSQPlugin extends CollectDPluginParent
            if (client != null) {
                clientPool.returnObject(client);
            }
-                try {
-                    out.close();
-                } catch (IOException e) {
-                }
+            try {
+                out.close();
+            } catch (IOException e) {
+            }
        }
        return 0;
    }
@@ -139,7 +140,7 @@ public class WriteNSQPlugin extends CollectDPluginParent
                    if (hosts.length == 1) {
                        host = hosts[0];
                    } else {
-                        host = hosts[new Random().nextInt(hosts.length)];
+                        host = hosts[random.nextInt(hosts.length)];
                    }
                    break;
                case "Port":
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>collectd-plugin-parent</artifactId>
  <dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>collectd-timely-plugin</artifactId>
  <dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>timely-common</artifactId>
  <dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>grafana-auth</artifactId>
  <dependencies>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>timely-app</artifactId>
  <packaging>pom</packaging>
@@ -28,8 +28,8 @@
      }
    ],
    "screenshots": [],
-    "version": "1.3.5",
-    "updated": "2022-01-07"
+    "version": "1.3.6",
+    "updated": "2023-10-13"
  },
  "dependencies": {
    "classnames": "2.2.6",
@@ -7,5 +7,5 @@ require (
 	github.com/hashicorp/go-hclog v0.16.1
 	github.com/mattn/go-colorable v0.1.6 // indirect
 	github.com/prometheus/common v0.29.0 // indirect
-	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/net v0.17.0 // indirect
 )
@@ -398,6 +398,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk=
@@ -423,6 +424,8 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -453,6 +456,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -490,9 +495,13 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
-golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -509,6 +518,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -556,16 +567,30 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210309074719-68d13333faf2/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40 h1:JWgyZ1qgdTaF3N3oxC+MdTV7qvEEgHo3otj+HB5CM7Q=
 golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -618,6 +643,8 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
 golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -1,6 +1,6 @@
 {
  "name": "timely-datasource",
-  "version": "1.3.5",
+  "version": "1.3.6",
  "description": "Timely",
  "backend": true,
  "alerting": true,
@@ -14,17 +14,17 @@
  "author": "Grafana Labs",
  "license": "Apache-2.0",
  "devDependencies": {
-    "@grafana/toolkit": "^8.2.2"
+    "@grafana/toolkit": "^8.4.5"
  },
  "engines": {
-    "node": ">=12 <13"
+    "node": ">=12 <17"
  },
  "dependencies": {
-    "@grafana/data": "8.2.3",
-    "@grafana/runtime": "8.2.2",
+    "@grafana/data": "^8.4.5",
+    "@grafana/runtime": "^8.4.5",
    "@grafana/slate-react": "0.22.10-grafana",
-    "@grafana/ui": "8.2.2",
-    "@material-ui/core": "4.12.3",
+    "@grafana/ui": "^8.4.5",
+    "@material-ui/core": "^4.12.3",
    "@types/classnames": "2.3.1",
    "@types/lodash": "4.14.176",
    "@types/react-bootstrap-typeahead": "5.1.8",
@@ -3,7 +3,7 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>timely</groupId>
  <artifactId>timely</artifactId>
-  <version>1.3.5</version>
+  <version>1.3.6</version>
  <packaging>pom</packaging>
  <name>Timely</name>
  <description>A secure and scalable time series database based on Apache Accumulo</description>
@@ -41,7 +41,7 @@
    <os.detection.classifierWithLikes>fedora</os.detection.classifierWithLikes>
    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <version.accumulo>1.9.3</version.accumulo>
+    <version.accumulo>1.10.3</version.accumulo>
    <version.buildnumber-maven>1.4</version.buildnumber-maven>
    <version.caffeine>2.6.2</version.caffeine>
    <version.collectd>5.7.1</version.collectd>
@@ -55,20 +55,21 @@
    <version.fast-classpath-scanner>3.1.13</version.fast-classpath-scanner>
    <version.flink>1.1.4</version.flink>
    <version.google-flatbuffers>1.10.0</version.google-flatbuffers>
-    <version.guava>29.0-jre</version.guava>
-    <version.hadoop>2.7.7</version.hadoop>
+    <version.guava>32.0.0-jre</version.guava>
+    <version.hadoop>3.3.3</version.hadoop>
    <version.httpcomponents>4.5.13</version.httpcomponents>
-    <version.impsort>1.6.2</version.impsort>
-    <version.jackson>2.10.0</version.jackson>
-    <version.jackson.databind>2.10.0</version.jackson.databind>
+    <version.impsort>1.9.0</version.impsort>
+    <version.jackson>2.12.7</version.jackson>
+    <version.jackson.databind>2.12.7.1</version.jackson.databind>
    <version.jacoco>0.8.4</version.jacoco>
+    <version.jakarta.websocket-api>1.1.1</version.jakarta.websocket-api>
    <version.javacsv>2.0</version.javacsv>
    <version.javassist>3.24.1-GA</version.javassist>
    <version.jcip-annotations>1.0</version.jcip-annotations>
    <version.jjwt>0.11.2</version.jjwt>
-    <version.jsoup>1.14.2</version.jsoup>
+    <version.jsoup>1.15.3</version.jsoup>
    <version.junit>4.13.1</version.junit>
-    <version.log4j>2.17.1</version.log4j>
+    <version.log4j>2.20.0</version.log4j>
    <version.maven-assembly>3.1.1</version.maven-assembly>
    <version.maven-build-helper>3.0.0</version.maven-build-helper>
    <version.maven-compiler>3.8.1</version.maven-compiler>
@@ -179,6 +180,11 @@
        <artifactId>netty-tcnative-boringssl-static</artifactId>
        <version>${version.netty-tcnative}</version>
      </dependency>
+      <dependency>
+        <groupId>jakarta.websocket</groupId>
+        <artifactId>jakarta.websocket-api</artifactId>
+        <version>${version.jakarta.websocket-api}</version>
+      </dependency>
      <dependency>
        <groupId>net.sourceforge.javacsv</groupId>
        <artifactId>javacsv</artifactId>
@@ -265,6 +271,14 @@
            <groupId>io.netty</groupId>
            <artifactId>netty</artifactId>
          </exclusion>
+          <exclusion>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-client-api</artifactId>
+          </exclusion>
          <exclusion>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
@@ -303,6 +317,14 @@
            <groupId>io.netty</groupId>
            <artifactId>netty</artifactId>
          </exclusion>
+          <exclusion>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.websocket</groupId>
+            <artifactId>javax.websocket-client-api</artifactId>
+          </exclusion>
          <exclusion>
            <groupId>org.slf4j</groupId>
            <artifactId>slf4j-log4j12</artifactId>
@@ -419,14 +441,13 @@
        <plugin>
          <groupId>net.revelc.code.formatter</groupId>
          <artifactId>formatter-maven-plugin</artifactId>
-          <version>2.11.0</version>
+          <version>2.22.0</version>
          <configuration>
            <compilerCompliance>${maven.compiler.source}</compilerCompliance>
            <compilerSource>${maven.compiler.source}</compilerSource>
            <compilerTargetPlatform>${maven.compiler.target}</compilerTargetPlatform>
            <configFile>${project.parent.basedir}/eclipse/Eclipse-Formatter.xml</configFile>
            <lineEnding>LF</lineEnding>
-            <overrideConfigCompilerVersion>true</overrideConfigCompilerVersion>
            <skipCssFormatting>true</skipCssFormatting>
            <skipHtmlFormatting>true</skipHtmlFormatting>
            <skipJsFormatting>true</skipJsFormatting>
@@ -4,7 +4,7 @@
  <parent>
    <groupId>timely</groupId>
    <artifactId>timely</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
  </parent>
  <artifactId>timely-server</artifactId>
  <dependencies>
@@ -60,6 +60,10 @@
      <groupId>io.netty</groupId>
      <artifactId>netty-all</artifactId>
    </dependency>
+    <dependency>
+      <groupId>jakarta.websocket</groupId>
+      <artifactId>jakarta.websocket-api</artifactId>
+    </dependency>
    <dependency>
      <groupId>org.apache.accumulo</groupId>
      <artifactId>accumulo-core</artifactId>
@@ -125,7 +125,7 @@ public class AuthCache {
    }

    public static Collection<Authorizations> getAuthorizations(AuthenticatedRequest request, Security security) {
-        Collection<Authorizations> auths;
+        Collection<Authorizations> auths = Collections.singletonList(Authorizations.EMPTY);
        boolean anonAccessAllowed;
        if (request instanceof AuthenticatedWebSocketRequest) {
            anonAccessAllowed = security.isAllowAnonymousWsAccess();
@@ -137,7 +137,7 @@ public class AuthCache {
        String oauthToken = request.getRequestHeader(AuthenticationService.AUTH_HEADER);
        if (oauthToken != null) {
            auths = getAuthorizations(token.getTimelyPrincipal().getName());
-        } else if (StringUtils.isBlank(sessionId) && token.getClientCert() == null) {
+        } else if (StringUtils.isBlank(sessionId) && token != null && token.getClientCert() == null) {
            if (anonAccessAllowed) {
                auths = Collections.singletonList(Authorizations.EMPTY);
            } else {
@@ -146,7 +146,7 @@ public class AuthCache {
            }
        } else if (StringUtils.isNotBlank(sessionId)) {
            auths = getAuthorizations(sessionId);
-        } else {
+        } else if (token != null && token.getTimelyPrincipal() != null) {
            auths = getAuthorizations(token.getTimelyPrincipal().getName());
        }
        return auths;
@@ -1,7 +1,6 @@
 package timely.auth.util;

 import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -11,7 +10,6 @@ import java.util.Set;
 import java.util.stream.Collectors;

 import com.google.common.base.Splitter;
-import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import org.apache.accumulo.core.security.Authorizations;
@@ -38,8 +36,8 @@ public class AuthorizationsUtil {
    }

    public static List<String> splitAuths(String requestedAuths) {
-        return Arrays.asList(Iterables.toArray(Splitter.on(',').omitEmptyStrings().trimResults().split(requestedAuths),
-                String.class));
+        return Splitter.on(',').omitEmptyStrings().trimResults().splitToStream(requestedAuths)
+                .collect(Collectors.toList());
    }

    public static Set<Authorizations> buildAuthorizations(Collection<? extends Collection<String>> userAuths) {
@@ -14,7 +14,7 @@ public interface Aggregator {
    /**
     * Given the current value, and the current count, incorporate the new value
     * into current and return the result.
-     * 
+     *
     * @param current
     *            last returned value from aggregate, or zero
     * @param count
@@ -28,7 +28,7 @@ public interface Aggregator {
    /**
     * Compute the final value given the aggregated amount and the number of items
     * in the aggregate.
-     * 
+     *
     * @param current
     *            the last value returned from aggregate
     * @param count
@@ -142,8 +142,8 @@ public class MetricAgeOffIterator extends WrappingIterator implements OptionDesc
            Pair<String, Long> start = MetricAdapter.decodeRowKey(startKey);
            byte[] newStartRow = MetricAdapter.encodeRowKey(start.getFirst(), timeTarget);
            // @formatter:off
-            Key newStartKey = new Key(newStartRow, 
-                    null != startKey.getColumnFamily() ? startKey.getColumnFamilyData().getBackingArray() : null, 
+            Key newStartKey = new Key(newStartRow,
+                    null != startKey.getColumnFamily() ? startKey.getColumnFamilyData().getBackingArray() : null,
                    null != startKey.getColumnQualifier() ? startKey.getColumnQualifierData().getBackingArray() : null,
                    null != startKey.getColumnVisibility() ? startKey.getColumnVisibility().getBytes() : null,
                    timeTarget, startKey.isDeleted());
@@ -231,30 +231,32 @@ public class DataStoreCache {
    }

    private void readNonCachedMetricsIP() {
-        try {
-            nonCachedMetricsIPRWLock.readLock().acquire();
-            byte[] nonCachedMetricsUpdateBytes = nonCachedMetricsIP.get().postValue();
-            Set<String> nonCachedMetricsUpdate;
-            if (nonCachedMetricsUpdateBytes == null) {
-                nonCachedMetricsUpdate = new TreeSet<>();
-            } else {
-                nonCachedMetricsUpdate = SerializationUtils.deserialize(nonCachedMetricsIP.get().postValue());
-            }
-
-            if (nonCachedMetrics.containsAll(nonCachedMetricsUpdate)) {
-                LOG.info("local nonCachedMetrics already contains {}", nonCachedMetricsUpdate);
-            } else {
-                nonCachedMetricsUpdate.removeAll(nonCachedMetrics);
-                LOG.info("Adding {} to local nonCachedMetrics", nonCachedMetricsUpdate);
-                nonCachedMetrics.addAll(nonCachedMetricsUpdate);
-            }
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-        } finally {
+        if (nonCachedMetricsIPRWLock != null) {
            try {
-                nonCachedMetricsIPRWLock.readLock().release();
+                nonCachedMetricsIPRWLock.readLock().acquire();
+                byte[] nonCachedMetricsUpdateBytes = nonCachedMetricsIP.get().postValue();
+                Set<String> nonCachedMetricsUpdate;
+                if (nonCachedMetricsUpdateBytes == null) {
+                    nonCachedMetricsUpdate = new TreeSet<>();
+                } else {
+                    nonCachedMetricsUpdate = SerializationUtils.deserialize(nonCachedMetricsIP.get().postValue());
+                }
+
+                if (nonCachedMetrics.containsAll(nonCachedMetricsUpdate)) {
+                    LOG.info("local nonCachedMetrics already contains {}", nonCachedMetricsUpdate);
+                } else {
+                    nonCachedMetricsUpdate.removeAll(nonCachedMetrics);
+                    LOG.info("Adding {} to local nonCachedMetrics", nonCachedMetricsUpdate);
+                    nonCachedMetrics.addAll(nonCachedMetricsUpdate);
+                }
            } catch (Exception e) {
-                LOG.error(e.getMessage());
+                LOG.error(e.getMessage(), e);
+            } finally {
+                try {
+                    nonCachedMetricsIPRWLock.readLock().release();
+                } catch (Exception e) {
+                    LOG.error(e.getMessage());
+                }
            }
        }
    }
@@ -66,7 +66,7 @@ public class BasicAuthLoginRequestHandlerTest {
        Configuration config = TestConfiguration.createMinimalConfigurationForTest();

        // @formatter:off
-        String form = 
+        String form =
        "{\n" +
        "    \"username\": \"test\",\n" +
        "    \"password\": \"test1\"\n" +
@@ -105,7 +105,7 @@ public class BasicAuthLoginRequestHandlerTest {
        Configuration config = TestConfiguration.createMinimalConfigurationForTest();

        // @formatter:off
-        String form = 
+        String form =
        "{\n" +
        "    \"username\": \"test\",\n" +
        "    \"password\": \"test2\"\n" +
@@ -10,7 +10,6 @@ import java.util.concurrent.TimeUnit;
 import javax.net.ssl.SSLContext;
 import javax.websocket.CloseReason;
 import javax.websocket.EndpointConfig;
-import javax.websocket.MessageHandler;
 import javax.websocket.Session;

 import io.netty.handler.ssl.ApplicationProtocolConfig;
@@ -93,13 +92,9 @@ public class WebSocketClientIT extends OneWaySSLBase {

            @Override
            public void onOpen(Session session, EndpointConfig config) {
-                session.addMessageHandler(String.class, new MessageHandler.Whole<String>() {
-
-                    @Override
-                    public void onMessage(String message) {
-                        messages.add(message);
-                        LOG.debug("Message received on Websocket session {}: {}", session.getId(), message);
-                    }
+                session.addMessageHandler(String.class, message -> {
+                    messages.add(message);
+                    LOG.debug("Message received on Websocket session {}: {}", session.getId(), message);
                });
            }
Author	SHA1	Message	Date
Bill Oley	a0e47d0b48	Release version 1.3.6	2023-10-13 10:25:43 -04:00
dependabot[bot]	d3dc324d84	Bump golang.org/x/net from 0.7.0 to 0.17.0 in /grafana/timely-app (#246 ) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.7.0 to 0.17.0. - [Commits](https://github.com/golang/net/compare/v0.7.0...v0.17.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-13 10:18:12 -04:00
Bill Oley	4871b3a4a9	Update dependencies, protect against NPE in AuthCache, AuthorizationsUtil	2023-10-13 10:02:33 -04:00
dependabot[bot]	8d5d5eeca8	Bump terser from 4.8.0 to 4.8.1 in /grafana/timely-app (#235 ) Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-11 14:26:51 -04:00
dependabot[bot]	a006a44372	Bump decode-uri-component from 0.2.0 to 0.2.2 in /grafana/timely-app (#240 ) Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-11 14:26:07 -04:00
dependabot[bot]	6cfcdc1030	Bump golang.org/x/net in /grafana/timely-app (#241 ) Bumps [golang.org/x/net](https://github.com/golang/net) from 0.0.0-20210614182718-04defd469f4e to 0.7.0. - [Release notes](https://github.com/golang/net/releases) - [Commits](https://github.com/golang/net/commits/v0.7.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-11 14:25:46 -04:00
dependabot[bot]	4eb7ceff8c	Bump semver from 5.7.1 to 5.7.2 in /grafana/timely-app (#244 ) Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v5.7.1...v5.7.2) --- updated-dependencies: - dependency-name: semver dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-11 14:25:13 -04:00
dependabot[bot]	6ad8da2b99	Bump word-wrap from 1.2.3 to 1.2.4 in /grafana/timely-app (#245 ) Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-10-11 14:24:12 -04:00
dependabot[bot]	7f56a36906	Bump guava from 29.0-jre to 32.0.0-jre (#243 ) Bumps [guava](https://github.com/google/guava) from 29.0-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-06-15 12:53:29 -04:00
Christopher Tubbs	1443fdceb9	Bump formatter and impsort plugins for newer Maven	2023-06-07 11:01:29 -04:00
Christopher Tubbs	3cff14eb03	Bump NPM/Yarn deps * This avoids warnings about CVEs from GitHub in the referenced dependencies * This required relaxing the node version constraint, since I didn't have version 12, only 16	2022-04-11 15:49:13 -04:00
dependabot[bot]	8fa5b56e62	Bump hadoop-common from 2.7.7 to 2.10.1 (#230 ) Bumps hadoop-common from 2.7.7 to 2.10.1. --- updated-dependencies: - dependency-name: org.apache.hadoop:hadoop-common dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-04-11 14:22:59 -04:00
dependabot[bot]	b2f2cef834	Bump follow-redirects from 1.14.1 to 1.14.8 in /grafana/timely-app (#232 ) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.8. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.1...v1.14.8) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-04-11 14:22:18 -04:00
dependabot[bot]	c6a2988083	Bump accumulo-core from 1.9.3 to 1.10.1 (#231 ) Bumps [accumulo-core](https://github.com/apache/accumulo) from 1.9.3 to 1.10.1. - [Release notes](https://github.com/apache/accumulo/releases) - [Commits](https://github.com/apache/accumulo/compare/rel/1.9.3...rel/1.10.1) --- updated-dependencies: - dependency-name: org.apache.accumulo:accumulo-core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-04-11 14:21:50 -04:00
Bill Oley	d54817cc9a	Bump version to 1.3.6-SNAPSHOT	2022-01-07 14:43:04 -05:00