ENTESB-12268 Integration uptime doesn't contain any data

https://issues.jboss.org/browse/ENTESB-12268
syndesisio · Nov 14, 2019 · a96e272 · a96e272
1 parent 914e125
commit a96e272
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/...us/src/main/java/io/syndesis/server/metrics/prometheus/PrometheusMetricsProviderImpl.java b/...us/src/main/java/io/syndesis/server/metrics/prometheus/PrometheusMetricsProviderImpl.java
@@ -15,8 +15,6 @@
  */
 package io.syndesis.server.metrics.prometheus;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Comparator;
@@ -26,6 +24,8 @@
 import java.util.function.BinaryOperator;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 
 import io.fabric8.kubernetes.api.model.LabelSelector;
 import io.fabric8.kubernetes.api.model.Pod;

diff --git a/app/server/metrics/prometheus/src/main/java/io/syndesis/server/metrics/prometheus/Utils.java b/app/server/metrics/prometheus/src/main/java/io/syndesis/server/metrics/prometheus/Utils.java
@@ -47,6 +47,8 @@ public final class Utils {
             .registerModules(new Jdk8Module(), new EpochMillisTimeModule(), new JavaTimeModule())
             .setPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_EMPTY, JsonInclude.Include.NON_EMPTY))
             .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)
+            // disable read as nanoseconds as the values are read as integers from prometheus, with no nano part
+            .disable(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS)
             .enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING)
             .enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING)
             .disable(JsonParser.Feature.AUTO_CLOSE_SOURCE);

diff --git a/app/ui-react/packages/ui/src/Integration/Metrics/IntegrationDetailMetrics.tsx b/app/ui-react/packages/ui/src/Integration/Metrics/IntegrationDetailMetrics.tsx
@@ -35,7 +35,7 @@ export class IntegrationDetailMetrics extends React.Component<
   > {
   public render() {
     const okMessagesCount = this.props.messages! - this.props.errors!;
-    const startAsDate = new Date(this.props.start!);
+    const startAsDate = new Date(this.props.start! * 1000);
     const startAsHuman = this.props.i18nSince + startAsDate.toLocaleString();
     return (
       <PageSection className="integration-detail-metrics">

diff --git a/app/ui-react/syndesis/src/modules/integrations/pages/detail/MetricsPage.tsx b/app/ui-react/syndesis/src/modules/integrations/pages/detail/MetricsPage.tsx
@@ -105,7 +105,7 @@ export class MetricsPage extends React.Component {
                                                     parseInt(
                                                       metricsData.lastProcessed,
                                                       10
-                                                    )
+                                                    ) * 1000
                                                   ).toLocaleString()
                                                 : t('metrics.NoDataAvailable')
                                             }