Cleanup after UI migration, updated docs, fixed retransmission bug (#…

…1786)

.github/workflows/ci-console.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./hermes-console-vue
+        working-directory: ./hermes-console
     steps:
       - name: Checkout
         uses: actions/checkout@v3

docs/docs/configuration/console.md

@@ -15,14 +15,12 @@ dashboard.docs    | link to documentation, available on Console home page
 
 ## Metric Store integration
 
-Hermes Console can be integrated with Metric Store. This means, that metrics shown in Console can link to actual graphs
-plotted by Metric Store. At the moment only Graphite is supported.
-
-Option                  | Description
------------------------ | ---------------------------------------------------------------------------
-metrics.type            | type of metrics storage to link to (currently only `graphite` is supported)
-metrics.graphite.url    | URL to graphite
-metrics.graphite.prefix | prefix to graphite metrics
+Hermes console could have a button on the topics and subscriptions view that takes you to a dashboard with metrics.
+In order to make it work you have to provide an implementation of `pl.allegro.tech.hermes.management.domain.MetricsDashboardUrlService`.
+
+ Option                              | Description                                                                      
+-------------------------------------|--------------------------------------------------------------------------------------
+ metrics.fetchingDashboardUrlEnabled | enable fetching dashboard url from hermes-management and show the referring UI button 
 
 ## Authorization
 

hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionRequest.java

@@ -8,27 +8,54 @@
 import pl.allegro.tech.hermes.api.jackson.InstantIsoSerializer;
 
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.util.List;
 
 public class OfflineRetransmissionRequest {
+
+    private static final List<DateTimeFormatter> formatters = List.of(
+            DateTimeFormatter.ISO_INSTANT,
+            DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm'Z'").withZone(ZoneId.of("UTC"))
+    );
+
     @NotEmpty
     private final String sourceTopic;
     @NotEmpty
     private final String targetTopic;
     @NotNull
-    private final Instant startTimestamp;
+    private Instant startTimestamp;
     @NotNull
-    private final Instant endTimestamp;
+    private Instant endTimestamp;
 
     @JsonCreator
     public OfflineRetransmissionRequest(
             @JsonProperty("sourceTopic") String sourceTopic,
             @JsonProperty("targetTopic") String targetTopic,
-            @JsonProperty("startTimestamp") Instant startTimestamp,
-            @JsonProperty("endTimestamp") Instant endTimestamp) {
+            @JsonProperty("startTimestamp") String startTimestamp,
+            @JsonProperty("endTimestamp") String endTimestamp) {
         this.sourceTopic = sourceTopic;
         this.targetTopic = targetTopic;
-        this.startTimestamp = startTimestamp;
-        this.endTimestamp = endTimestamp;
+        initializeTimestamps(startTimestamp, endTimestamp);
+    }
+
+    private void initializeTimestamps(String startTimestamp, String endTimestamp) {
+        if (startTimestamp == null || endTimestamp == null) {
+            this.startTimestamp = null;
+            this.endTimestamp = null;
+            return;
+        }
+
+        for (DateTimeFormatter formatter : formatters) {
+            try {
+                this.startTimestamp = formatter.parse(startTimestamp, Instant::from);
+                this.endTimestamp = formatter.parse(endTimestamp, Instant::from);
+                break;
+            } catch (DateTimeParseException e) {
+                // ignore
+            }
+        }
     }
 
     public String getSourceTopic() {

hermes-api/src/main/java/pl/allegro/tech/hermes/api/OfflineRetransmissionTask.java

@@ -21,7 +21,12 @@ public OfflineRetransmissionTask(
             @JsonProperty("startTimestamp") Instant startTimestamp,
             @JsonProperty("endTimestamp") Instant endTimestamp,
             @JsonProperty("createdAt") Instant createdAt) {
-        this(taskId, new OfflineRetransmissionRequest(sourceTopic, targetTopic, startTimestamp, endTimestamp), createdAt);
+        this(taskId, new OfflineRetransmissionRequest(
+                        sourceTopic,
+                        targetTopic,
+                        startTimestamp.toString(),
+                        endTimestamp.toString()),
+                createdAt);
     }
 
     public OfflineRetransmissionTask(String taskId, OfflineRetransmissionRequest request, Instant createdAt) {