From 26225d6247939d81ff4d0e997ff245ca2ac4c046 Mon Sep 17 00:00:00 2001
From: Craig Bryant <craig.bryant@hp.com>
Date: Tue, 14 Apr 2015 11:17:55 -0600
Subject: [PATCH] AlarmStateTransitionedEvent timestamp now in ms

This will ensure a unique timestamp. Influx V9 will only keep one
entry with the same timestamp

Change-Id: I9c59e3bf15e731c1f636418c0ffad90356010441
---
 .../persister/repository/influxdb/InfluxV8AlarmRepo.java        | 2 +-
 .../persister/repository/influxdb/InfluxV9AlarmRepo.java        | 2 +-
 java/src/main/resources/persister-config.yml                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV8AlarmRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV8AlarmRepo.java
index a6fb2fee..e4d86e02 100644
--- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV8AlarmRepo.java
+++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV8AlarmRepo.java
@@ -85,7 +85,7 @@ public class InfluxV8AlarmRepo extends InfluxAlarmRepo {
       this.influxV8RepoWriter.logColValues(series[0]);
     }
 
-    this.influxV8RepoWriter.write(TimeUnit.SECONDS, series);
+    this.influxV8RepoWriter.write(TimeUnit.MILLISECONDS, series);
   }
 
 }
diff --git a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
index 284f6350..ef857193 100644
--- a/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
+++ b/java/src/main/java/monasca/persister/repository/influxdb/InfluxV9AlarmRepo.java
@@ -82,7 +82,7 @@ public class InfluxV9AlarmRepo extends InfluxAlarmRepo {
       valueMap.put("reason", event.stateChangeReason);
       valueMap.put("reason_data", "{}");
 
-      DateTime dateTime = new DateTime(event.timestamp * 1000, DateTimeZone.UTC);
+      DateTime dateTime = new DateTime(event.timestamp, DateTimeZone.UTC);
       String dateString = this.dateFormatter.print(dateTime);
 
       Map<String, String> tags = new HashMap<>();
diff --git a/java/src/main/resources/persister-config.yml b/java/src/main/resources/persister-config.yml
index c1ccd9be..1aad120b 100644
--- a/java/src/main/resources/persister-config.yml
+++ b/java/src/main/resources/persister-config.yml
@@ -52,7 +52,7 @@ influxDbConfiguration:
   # Version and retention policy must be set for V9. If no
   # version set then defaults to V8.
   # version can be (V8 | V9)
-  version: V8
+  version: V9
   # Retention policy may be left blank to indicate default policy.
   retentionPolicy:
   # Used only if version is V9.