HWKALERTS-74 fix master rebase issues

- get File action to work on windows - don't assume unix filename - change Alert Ids to be usable in windows filenames, replace '|' delimiter with '-', which is what we use elsewhere in Condition and Dampening.
hawkular · Aug 3, 2015 · b5b1253 · b5b1253
1 parent f138332
commit b5b1253
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...wkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java b/...wkular-alerts-actions-file/src/main/java/org/hawkular/alerts/actions/file/FilePlugin.java
@@ -46,7 +46,8 @@ public class FilePlugin implements ActionPluginListener {
     private ObjectMapper objectMapper;
 
     public FilePlugin() {
-        defaultProperties.put("path", "/tmp/hawkular/actions/file");
+        defaultProperties.put("path",
+                new File(System.getProperty("java.io.tmpdir"), "hawkular/actions/file").getAbsolutePath());
         objectMapper = new ObjectMapper();
     }
 

diff --git a/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java b/hawkular-alerts-api/src/main/java/org/hawkular/alerts/api/model/condition/Alert.java
@@ -133,7 +133,7 @@ public Alert(String tenantId, String triggerId, Severity severity, List<Set<Cond
         this.ctime = System.currentTimeMillis();
         this.status = Status.OPEN;
 
-        this.alertId = triggerId + "|" + ctime;
+        this.alertId = triggerId + "-" + ctime;
     }
 
     public String getTenantId() {