honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/elasticsearch/elasticsearch-alerts 

Original commit: elastic/x-pack-elasticsearch@db6f1ac43b
This commit is contained in:
Brian Murphy 2014-11-14 16:01:38 +00:00
parent b04d8261de f6e28c96ca
commit dfc645a589
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/elasticsearch/alerts/actions/AlertActionEntry.java
View File

@ -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();

2
src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
View File

@ -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";