Merge pull request #29 from tchiotludo/micronaut

Move to Micronaut

Author: tchiotludo

.gitignore

@@ -18,7 +18,7 @@ build/*
 .gradletasknamecache
 
 ### Assets
-public/static
+src/main/resources/static
 node_modules
 node/
 
@@ -36,7 +36,7 @@ out/*
 logs/*
 
 ### Kafka HQ ###
-conf/*.dev.conf
+src/**/*-dev.yml
 
 ## Docker
 .env

Dockerfile

@@ -1,5 +1,5 @@
 FROM openjdk:8-jre-alpine
 WORKDIR /app
 COPY docker /
-ENTRYPOINT ["docker-entrypoint.sh"]
+ENV MICRONAUT_CONFIG_FILES=/app/application.yml
 CMD ["./kafkahq"]

README.md

@@ -64,58 +64,78 @@ First you need a [configuration files](#configuration) in order to configure Kaf
 ```sh
 docker run -d \
     -p 8080:8080 \
-    -v /tmp/application.conf:/app/application.conf \
+    -v /tmp/application.yml:/app/application.yml \
     tchiotludo/kafkahq
 ```
-* With `-v /tmp/application.conf` must be an absolute path to configuration file
+* With `-v /tmp/application.yml` must be an absolute path to configuration file
 * Go to http://localhost:8080
 
 
 ### Stand Alone
 
 * Install Java 8
 * Download the latest jar on [release page](https://github.com/tchiotludo/kafkahq/releases)
-* Create an `application.conf` in the same directory
-* Launch the application with `java -jar kafkahq.jar prod`
+* Create an [configuration files](#configuration) 
+* Launch the application with `java -Dmicronaut.config.files=/path/to/application.yml -jar kafkahq.jar`
 * Go to http://localhost:8080
 
 
 ## Configuration
-Configuration file is a [HOCON configuration](https://github.com/lightbend/config/blob/master/HOCON.md) file with an example below :
-```
-{
-  kafka {
-    connections {
-      my-cluster-1 {
-        properties {
-          bootstrap.servers: "kafka:9092"
-        }
-        registry: "http://schema-registry:8085"
-      }
-      my-cluster-2 {
-        properties {
-          bootstrap.servers: "kafka:9093"
-          security.protocol: SSL
-          ssl.truststore.location: /app/truststore.jks
-          ssl.truststore.password: password
-          ssl.keystore.location: /app/keystore.jks
-          ssl.keystore.password: password
-          ssl.key.password: password
-        }
-      }
-    }
-  }
-}
+Configuration file can by default be provided in either Java properties, YAML, JSON or Groovy files.
+Configuration file example in YML :
+
+```yml
+kafkahq:
+  server:
+    # if behind a reverse proxy, path to kafkahq with trailing slash
+    base-path: ""
+
+  # default kafka properties for each clients, available for admin / producer / consumer (optionnal)
+  clients-defaults:
+    consumer:
+      properties:
+        isolation.level: read_committed
+
+  # list of kafka cluster available for kafkahq
+  connections:
+    # url friendly name for the cluster
+    my-cluster-1:
+      # standard kafka properties (optionnal)
+      properties:
+        bootstrap.servers: "kafka:9092"
+      # schema registry url (optionnal)
+      schema-registry: "http://schema-registry:8085"
+
+    my-cluster-2:
+      properties:
+        bootstrap.servers: "kafka:9093"
+        security.protocol: SSL
+        ssl.truststore.location: /app/truststore.jks
+        ssl.truststore.password: password
+        ssl.keystore.location: /app/keystore.jks
+        ssl.keystore.password: password
+        ssl.key.password: password
+        
+  topic-data:
+    # default sort order (OLDEST, NEWEST)
+    sort: OLDEST
+    # max record per page
+    size: 50
 ```
 
-`kafka.connections` is a key value configuration with :
-* `key`: must be an url friendly string the identify your cluster (`my-cluster-1` and `my-cluster-2` is the example above)
-* `properties`: all the configurations found on [Kafka consumer documentation](https://kafka.apache.org/documentation/#consumerconfigs). Most important is `bootstrap.servers` that is a list of host:port of your Kafka brokers.
-* `registry`: the schema registry url *(optional)*
+* `kafkahq.server.base-path`: if behind a reverse proxy, path to kafkahq with trailing slash
+* `kafkahq.clients-defaults.{{admin|producer|consumer}}.properties`: if behind a reverse proxy, path to kafkahq with trailing slash
+* `kafkahq.connections` is a key value configuration with :
+  * `key`: must be an url friendly string the identify your cluster (`my-cluster-1` and `my-cluster-2` is the example above)
+  * `properties`: all the configurations found on [Kafka consumer documentation](https://kafka.apache.org/documentation/#consumerconfigs). Most important is `bootstrap.servers` that is a list of host:port of your Kafka brokers.
+  * `schema-registry`: the schema registry url *(optional)*
 
-KafkaHQ docker image support 1 environment variables to handle configuraiton :
-* `KAFKAHQ_CONFIGURATION`: a string that contains the full configuration that will be written on /app/configuration.conf on container.
+> Since KafkaHQ is based on [Micronaut](https://micronaut.io/), you can customize configurations (server port, ssl, ...) with [Micronaut configuration](https://docs.micronaut.io/snapshot/guide/configurationreference.html#io.micronaut.http.server.HttpServerConfiguration).
+> More information can be found on [Micronaut documentation](https://docs.micronaut.io/snapshot/guide/index.html#config)
 
+KafkaHQ docker image support 2 environment variables to handle configuraiton :
+* `MICRONAUT_APPLICATION_JSON`: a string that contains the full configuration in JSON format
+* `MICRONAUT_CONFIG_FILES`: a path to to a configuration file on container. Default path is `/app/application.yml`
 
 ## Development Environment
 A docker-compose is provide to start a development environnement.

assets/modules/datas/search-sse.js

@@ -38,28 +38,26 @@ $.widget("khq.search-sse", $.khq.widget, {
         this._eventSource.addEventListener('searchBody', function(e) {
             let searchBody = JSON.parse(e.data);
 
-            if (searchBody.body.trim()) {
+            if (searchBody.body) {
                 table.append(searchBody.body);
                 $(document).trigger('khq.refresh');
             }
 
-            if (searchBody.progress && searchBody.offsets) {
-                self._updateProgress(searchBody.offsets, searchBody.progress)
+            if (searchBody.after !== null) {
+                self._updateAfter(searchBody.percent);
+            }
+
+            if (searchBody.percent) {
+                self._updateProgressBar(searchBody.percent);
             }
         }, false);
 
         this._eventSource.addEventListener("searchEnd", function(e) {
             self._close(e);
             let searchEnd = JSON.parse(e.data);
 
-            if (searchEnd.after !== null) {
-                self._after
-                    .removeClass('disabled')
-                    .find('.page-link')
-                    .attr('href', self._url().setSearch("after", searchEnd.after));
-            } else {
-                self._updateProgressBar(100);
-            }
+            self._updateAfter(searchEnd.percent);
+            self._updateProgressBar(100);
         });
     },
 
@@ -68,24 +66,16 @@ $.widget("khq.search-sse", $.khq.widget, {
         this._cancelButton.addClass('disabled btn-outline-dark');
     },
 
-    _updateProgress(offsets, progress) {
-        let current = 0;
-        let total = 0;
-
-        $.each(offsets, function (partition, offset) {
-            total += offset.end - offset.begin;
-        });
-
-        $.each(progress, function (partition, remaining) {
-            current += remaining;
-        });
-
-        this._updateProgressBar(100-(current*100/total));
-    },
-
     _updateProgressBar(number) {
         this._progressBar
             .css('width', number + "%")
             .text((Math.round(number  * 100) / 100) + "%");
+    },
+
+    _updateAfter(after) {
+        this._after
+            .removeClass('disabled')
+            .find('.page-link')
+            .attr('href', this._url().setSearch("after", after));
     }
 });