From f6e28c96cacf4bfb58223abfcdaa30cd989377b9 Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Fri, 14 Nov 2014 11:16:32 +0100 Subject: [PATCH] Core: move errorMessage field to error_message field Closes elastic/elasticsearch#25 Original commit: elastic/x-pack-elasticsearch@186f8129195ee17e7ee752c0bb63db89016bf57e --- .../java/org/elasticsearch/alerts/actions/AlertActionEntry.java | 2 +- .../org/elasticsearch/alerts/actions/AlertActionManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/elasticsearch/alerts/actions/AlertActionEntry.java b/src/main/java/org/elasticsearch/alerts/actions/AlertActionEntry.java index ca9ae8938ff..43b4b2bb31a 100644 --- a/src/main/java/org/elasticsearch/alerts/actions/AlertActionEntry.java +++ b/src/main/java/org/elasticsearch/alerts/actions/AlertActionEntry.java @@ -216,7 +216,7 @@ public class AlertActionEntry implements ToXContent{ historyEntry.field(AlertActionState.FIELD_NAME, entryState.toString()); if (errorMsg != null) { - historyEntry.field("errorMsg", errorMsg); + historyEntry.field("error_msg", errorMsg); } historyEntry.endObject(); diff --git a/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java index a61e80d0253..0a0a3620790 100644 --- a/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java +++ b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java @@ -45,7 +45,7 @@ public class AlertActionManager extends AbstractComponent { public static final String TRIGGERED_FIELD = "triggered"; public static final String FIRE_TIME_FIELD = "fire_time"; public static final String SCHEDULED_FIRE_TIME_FIELD = "scheduled_fire_time"; - public static final String ERROR_MESSAGE = "errorMsg"; + public static final String ERROR_MESSAGE = "error_msg"; public static final String TRIGGER_FIELD = "trigger"; public static final String REQUEST = "request"; public static final String RESPONSE = "response_binary";