diff --git a/src/main/java/org/elasticsearch/alerting/Alert.java b/src/main/java/org/elasticsearch/alerts/Alert.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/Alert.java rename to src/main/java/org/elasticsearch/alerts/Alert.java index 1e7ff649a0c..dff646c9087 100644 --- a/src/main/java/org/elasticsearch/alerting/Alert.java +++ b/src/main/java/org/elasticsearch/alerts/Alert.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting; +package org.elasticsearch.alerts; -import org.elasticsearch.alerting.actions.AlertAction; -import org.elasticsearch.alerting.triggers.AlertTrigger; +import org.elasticsearch.alerts.actions.AlertAction; +import org.elasticsearch.alerts.triggers.AlertTrigger; import org.elasticsearch.common.joda.time.DateTime; import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.ToXContent; diff --git a/src/main/java/org/elasticsearch/alerting/AlertManager.java b/src/main/java/org/elasticsearch/alerts/AlertManager.java similarity index 96% rename from src/main/java/org/elasticsearch/alerting/AlertManager.java rename to src/main/java/org/elasticsearch/alerts/AlertManager.java index 38d9b5e1343..44617ddd3ea 100644 --- a/src/main/java/org/elasticsearch/alerting/AlertManager.java +++ b/src/main/java/org/elasticsearch/alerts/AlertManager.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting; +package org.elasticsearch.alerts; import org.elasticsearch.ElasticsearchException; @@ -20,11 +20,11 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.update.UpdateRequest; -import org.elasticsearch.alerting.actions.AlertAction; -import org.elasticsearch.alerting.actions.AlertActionManager; -import org.elasticsearch.alerting.scheduler.AlertScheduler; -import org.elasticsearch.alerting.triggers.AlertTrigger; -import org.elasticsearch.alerting.triggers.TriggerManager; +import org.elasticsearch.alerts.actions.AlertAction; +import org.elasticsearch.alerts.actions.AlertActionManager; +import org.elasticsearch.alerts.scheduler.AlertScheduler; +import org.elasticsearch.alerts.triggers.AlertTrigger; +import org.elasticsearch.alerts.triggers.TriggerManager; import org.elasticsearch.client.Client; import org.elasticsearch.client.Requests; import org.elasticsearch.common.Nullable; @@ -49,10 +49,10 @@ import java.util.concurrent.atomic.AtomicBoolean; public class AlertManager extends AbstractLifecycleComponent { - public final String ALERT_INDEX = ".alerts"; - public final String ALERT_TYPE = "alert"; - public final String ALERT_HISTORY_INDEX = "alerthistory"; - public final String ALERT_HISTORY_TYPE = "alertHistory"; + public static final String ALERT_INDEX = ".alerts"; + public static final String ALERT_TYPE = "alert"; + public static final String ALERT_HISTORY_INDEX = "alerthistory"; + public static final String ALERT_HISTORY_TYPE = "alertHistory"; public static final ParseField QUERY_FIELD = new ParseField("query"); public static final ParseField SCHEDULE_FIELD = new ParseField("schedule"); @@ -78,6 +78,8 @@ public class AlertManager extends AbstractLifecycleComponent { private AlertActionManager actionManager; final TimeValue defaultTimePeriod = new TimeValue(300*1000); //TODO : read from config + + class StarterThread implements Runnable { @Override public void run() { @@ -86,7 +88,7 @@ public class AlertManager extends AbstractLifecycleComponent { while (attempts < 2) { try { logger.warn("Sleeping [{}]", attempts); - Thread.sleep(20000); + Thread.sleep(5000); logger.warn("Slept"); break; } catch (InterruptedException ie) { @@ -260,11 +262,11 @@ public class AlertManager extends AbstractLifecycleComponent { } private void loadAlerts() { - if (!client.admin().indices().prepareExists(ALERT_INDEX).execute().actionGet().isExists()) { - createAlertsIndex(); - } - synchronized (alertMap) { + if (!client.admin().indices().prepareExists(ALERT_INDEX).execute().actionGet().isExists()) { + createAlertsIndex(); + } + SearchResponse searchResponse = client.prepareSearch().setSource( "{ \"query\" : " + "{ \"match_all\" : {}}," + @@ -391,6 +393,10 @@ public class AlertManager extends AbstractLifecycleComponent { public boolean addAlert(String alertName, Alert alert, boolean persist) { synchronized (alertMap) { + if (!client.admin().indices().prepareExists(ALERT_INDEX).execute().actionGet().isExists()) { + createAlertsIndex(); + } + if (alertMap.containsKey(alertName)) { throw new ElasticsearchIllegalArgumentException("There is already an alert named ["+alertName+"]"); } else { diff --git a/src/main/java/org/elasticsearch/alerting/AlertResult.java b/src/main/java/org/elasticsearch/alerts/AlertResult.java similarity index 96% rename from src/main/java/org/elasticsearch/alerting/AlertResult.java rename to src/main/java/org/elasticsearch/alerts/AlertResult.java index 0ed1bd5bfb6..9f22545fd1a 100644 --- a/src/main/java/org/elasticsearch/alerting/AlertResult.java +++ b/src/main/java/org/elasticsearch/alerts/AlertResult.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting; +package org.elasticsearch.alerts; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.alerting.triggers.AlertTrigger; +import org.elasticsearch.alerts.triggers.AlertTrigger; import org.elasticsearch.common.joda.time.DateTime; import java.util.Arrays; diff --git a/src/main/java/org/elasticsearch/alerting/AlertingModule.java b/src/main/java/org/elasticsearch/alerts/AlertingModule.java similarity index 71% rename from src/main/java/org/elasticsearch/alerting/AlertingModule.java rename to src/main/java/org/elasticsearch/alerts/AlertingModule.java index 6628cc14cd9..81030852fd3 100644 --- a/src/main/java/org/elasticsearch/alerting/AlertingModule.java +++ b/src/main/java/org/elasticsearch/alerts/AlertingModule.java @@ -3,12 +3,12 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting; +package org.elasticsearch.alerts; -import org.elasticsearch.alerting.actions.AlertActionManager; -import org.elasticsearch.alerting.rest.AlertRestHandler; -import org.elasticsearch.alerting.scheduler.AlertScheduler; -import org.elasticsearch.alerting.triggers.TriggerManager; +import org.elasticsearch.alerts.actions.AlertActionManager; +import org.elasticsearch.alerts.rest.AlertRestHandler; +import org.elasticsearch.alerts.scheduler.AlertScheduler; +import org.elasticsearch.alerts.triggers.TriggerManager; import org.elasticsearch.common.inject.AbstractModule; public class AlertingModule extends AbstractModule { diff --git a/src/main/java/org/elasticsearch/alerting/actions/AlertAction.java b/src/main/java/org/elasticsearch/alerts/actions/AlertAction.java similarity index 87% rename from src/main/java/org/elasticsearch/alerting/actions/AlertAction.java rename to src/main/java/org/elasticsearch/alerts/actions/AlertAction.java index ccaf611e840..f1724204696 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/AlertAction.java +++ b/src/main/java/org/elasticsearch/alerts/actions/AlertAction.java @@ -3,9 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; -import org.elasticsearch.alerting.AlertResult; +import org.elasticsearch.alerts.AlertResult; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/alerting/actions/AlertActionFactory.java b/src/main/java/org/elasticsearch/alerts/actions/AlertActionFactory.java similarity index 88% rename from src/main/java/org/elasticsearch/alerting/actions/AlertActionFactory.java rename to src/main/java/org/elasticsearch/alerts/actions/AlertActionFactory.java index f034e9b59e0..19920458524 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/AlertActionFactory.java +++ b/src/main/java/org/elasticsearch/alerts/actions/AlertActionFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; public interface AlertActionFactory { AlertAction createAction(Object parameters); diff --git a/src/main/java/org/elasticsearch/alerting/actions/AlertActionManager.java b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java similarity index 82% rename from src/main/java/org/elasticsearch/alerting/actions/AlertActionManager.java rename to src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java index c4119ee6453..c44beaf0fff 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/AlertActionManager.java +++ b/src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java @@ -3,15 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; -import org.elasticsearch.alerting.Alert; -import org.elasticsearch.alerting.AlertManager; -import org.elasticsearch.alerting.AlertResult; -import org.elasticsearch.alerting.actions.AlertAction; -import org.elasticsearch.alerting.actions.AlertActionFactory; -import org.elasticsearch.alerting.actions.EmailAlertActionFactory; -import org.elasticsearch.alerting.actions.IndexAlertActionFactory; +import org.elasticsearch.alerts.Alert; +import org.elasticsearch.alerts.AlertManager; +import org.elasticsearch.alerts.AlertResult; import org.elasticsearch.client.Client; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; diff --git a/src/main/java/org/elasticsearch/alerting/actions/EmailAlertAction.java b/src/main/java/org/elasticsearch/alerts/actions/EmailAlertAction.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/actions/EmailAlertAction.java rename to src/main/java/org/elasticsearch/alerts/actions/EmailAlertAction.java index 0ca4980915c..7be6135a8e5 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/EmailAlertAction.java +++ b/src/main/java/org/elasticsearch/alerts/actions/EmailAlertAction.java @@ -3,10 +3,10 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; import org.elasticsearch.ElasticsearchException; -import org.elasticsearch.alerting.AlertResult; +import org.elasticsearch.alerts.AlertResult; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.search.SearchHit; diff --git a/src/main/java/org/elasticsearch/alerting/actions/EmailAlertActionFactory.java b/src/main/java/org/elasticsearch/alerts/actions/EmailAlertActionFactory.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/actions/EmailAlertActionFactory.java rename to src/main/java/org/elasticsearch/alerts/actions/EmailAlertActionFactory.java index 1a875109bee..57ef4b68a32 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/EmailAlertActionFactory.java +++ b/src/main/java/org/elasticsearch/alerts/actions/EmailAlertActionFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.ElasticsearchIllegalArgumentException; diff --git a/src/main/java/org/elasticsearch/alerting/actions/IndexAlertAction.java b/src/main/java/org/elasticsearch/alerts/actions/IndexAlertAction.java similarity index 96% rename from src/main/java/org/elasticsearch/alerting/actions/IndexAlertAction.java rename to src/main/java/org/elasticsearch/alerts/actions/IndexAlertAction.java index c87774e4b95..fa5d62387f4 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/IndexAlertAction.java +++ b/src/main/java/org/elasticsearch/alerts/actions/IndexAlertAction.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.alerting.AlertResult; +import org.elasticsearch.alerts.AlertResult; import org.elasticsearch.client.Client; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; diff --git a/src/main/java/org/elasticsearch/alerting/actions/IndexAlertActionFactory.java b/src/main/java/org/elasticsearch/alerts/actions/IndexAlertActionFactory.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/actions/IndexAlertActionFactory.java rename to src/main/java/org/elasticsearch/alerts/actions/IndexAlertActionFactory.java index 6213a165131..f4df489edca 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/IndexAlertActionFactory.java +++ b/src/main/java/org/elasticsearch/alerts/actions/IndexAlertActionFactory.java @@ -3,7 +3,7 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.actions; +package org.elasticsearch.alerts.actions; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.client.Client; diff --git a/src/main/java/org/elasticsearch/alerting/actions/package-info.java b/src/main/java/org/elasticsearch/alerts/actions/package-info.java similarity index 85% rename from src/main/java/org/elasticsearch/alerting/actions/package-info.java rename to src/main/java/org/elasticsearch/alerts/actions/package-info.java index eb8c8ea1c62..bd6023ea8c6 100644 --- a/src/main/java/org/elasticsearch/alerting/actions/package-info.java +++ b/src/main/java/org/elasticsearch/alerts/actions/package-info.java @@ -5,4 +5,4 @@ */ /** */ -package org.elasticsearch.alerting.actions; \ No newline at end of file +package org.elasticsearch.alerts.actions; \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/alerting/package-info.java b/src/main/java/org/elasticsearch/alerts/package-info.java similarity index 88% rename from src/main/java/org/elasticsearch/alerting/package-info.java rename to src/main/java/org/elasticsearch/alerts/package-info.java index c67ff256c8d..01b86a19d65 100644 --- a/src/main/java/org/elasticsearch/alerting/package-info.java +++ b/src/main/java/org/elasticsearch/alerts/package-info.java @@ -6,4 +6,4 @@ /** * Created by brian on 8/12/14. */ -package org.elasticsearch.alerting; \ No newline at end of file +package org.elasticsearch.alerts; \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/alerting/rest/AlertRestHandler.java b/src/main/java/org/elasticsearch/alerts/rest/AlertRestHandler.java similarity index 98% rename from src/main/java/org/elasticsearch/alerting/rest/AlertRestHandler.java rename to src/main/java/org/elasticsearch/alerts/rest/AlertRestHandler.java index 340be1ba092..849a487de41 100644 --- a/src/main/java/org/elasticsearch/alerting/rest/AlertRestHandler.java +++ b/src/main/java/org/elasticsearch/alerts/rest/AlertRestHandler.java @@ -3,11 +3,11 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.rest; +package org.elasticsearch.alerts.rest; import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.alerting.Alert; -import org.elasticsearch.alerting.AlertManager; +import org.elasticsearch.alerts.Alert; +import org.elasticsearch.alerts.AlertManager; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.logging.ESLogger; import org.elasticsearch.common.logging.Loggers; diff --git a/src/main/java/org/elasticsearch/alerting/rest/package-info.java b/src/main/java/org/elasticsearch/alerts/rest/package-info.java similarity index 86% rename from src/main/java/org/elasticsearch/alerting/rest/package-info.java rename to src/main/java/org/elasticsearch/alerts/rest/package-info.java index f6b1f0b8d00..5a546ae1503 100644 --- a/src/main/java/org/elasticsearch/alerting/rest/package-info.java +++ b/src/main/java/org/elasticsearch/alerts/rest/package-info.java @@ -5,4 +5,4 @@ */ /** */ -package org.elasticsearch.alerting.rest; \ No newline at end of file +package org.elasticsearch.alerts.rest; \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/alerting/scheduler/AlertExecutorJob.java b/src/main/java/org/elasticsearch/alerts/scheduler/AlertExecutorJob.java similarity index 88% rename from src/main/java/org/elasticsearch/alerting/scheduler/AlertExecutorJob.java rename to src/main/java/org/elasticsearch/alerts/scheduler/AlertExecutorJob.java index 05252734467..3640b24cc5a 100644 --- a/src/main/java/org/elasticsearch/alerting/scheduler/AlertExecutorJob.java +++ b/src/main/java/org/elasticsearch/alerts/scheduler/AlertExecutorJob.java @@ -3,9 +3,8 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.scheduler; +package org.elasticsearch.alerts.scheduler; -import org.elasticsearch.alerting.scheduler.AlertScheduler; import org.quartz.Job; import org.quartz.JobExecutionContext; import org.quartz.JobExecutionException; diff --git a/src/main/java/org/elasticsearch/alerting/scheduler/AlertScheduler.java b/src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/scheduler/AlertScheduler.java rename to src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java index 83a9c17dc14..7beb9b78dd8 100644 --- a/src/main/java/org/elasticsearch/alerting/scheduler/AlertScheduler.java +++ b/src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java @@ -3,16 +3,16 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.scheduler; +package org.elasticsearch.alerts.scheduler; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.alerting.Alert; -import org.elasticsearch.alerting.actions.AlertActionManager; -import org.elasticsearch.alerting.AlertManager; -import org.elasticsearch.alerting.AlertResult; -import org.elasticsearch.alerting.triggers.TriggerManager; +import org.elasticsearch.alerts.Alert; +import org.elasticsearch.alerts.actions.AlertActionManager; +import org.elasticsearch.alerts.AlertManager; +import org.elasticsearch.alerts.AlertResult; +import org.elasticsearch.alerts.triggers.TriggerManager; import org.elasticsearch.client.Client; import org.elasticsearch.cluster.ClusterChangedEvent; import org.elasticsearch.cluster.ClusterService; diff --git a/src/main/java/org/elasticsearch/alerting/triggers/package-info.java b/src/main/java/org/elasticsearch/alerts/scheduler/package-info.java similarity index 85% rename from src/main/java/org/elasticsearch/alerting/triggers/package-info.java rename to src/main/java/org/elasticsearch/alerts/scheduler/package-info.java index 94dbd354d24..9936f79ca3a 100644 --- a/src/main/java/org/elasticsearch/alerting/triggers/package-info.java +++ b/src/main/java/org/elasticsearch/alerts/scheduler/package-info.java @@ -5,4 +5,4 @@ */ /** */ -package org.elasticsearch.alerting.triggers; \ No newline at end of file +package org.elasticsearch.alerts.scheduler; \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/alerting/triggers/AlertTrigger.java b/src/main/java/org/elasticsearch/alerts/triggers/AlertTrigger.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/triggers/AlertTrigger.java rename to src/main/java/org/elasticsearch/alerts/triggers/AlertTrigger.java index 0b1c173bb12..768f8c5a4ec 100644 --- a/src/main/java/org/elasticsearch/alerting/triggers/AlertTrigger.java +++ b/src/main/java/org/elasticsearch/alerts/triggers/AlertTrigger.java @@ -3,10 +3,9 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.triggers; +package org.elasticsearch.alerts.triggers; import org.elasticsearch.ElasticsearchIllegalArgumentException; -import org.elasticsearch.alerting.triggers.ScriptedAlertTrigger; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/src/main/java/org/elasticsearch/alerting/triggers/ScriptedAlertTrigger.java b/src/main/java/org/elasticsearch/alerts/triggers/ScriptedAlertTrigger.java similarity index 92% rename from src/main/java/org/elasticsearch/alerting/triggers/ScriptedAlertTrigger.java rename to src/main/java/org/elasticsearch/alerts/triggers/ScriptedAlertTrigger.java index 82577727cc1..96ed290e2d7 100644 --- a/src/main/java/org/elasticsearch/alerting/triggers/ScriptedAlertTrigger.java +++ b/src/main/java/org/elasticsearch/alerts/triggers/ScriptedAlertTrigger.java @@ -3,9 +3,8 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.triggers; +package org.elasticsearch.alerts.triggers; -import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.script.ScriptService; diff --git a/src/main/java/org/elasticsearch/alerting/triggers/TriggerManager.java b/src/main/java/org/elasticsearch/alerts/triggers/TriggerManager.java similarity index 97% rename from src/main/java/org/elasticsearch/alerting/triggers/TriggerManager.java rename to src/main/java/org/elasticsearch/alerts/triggers/TriggerManager.java index 064366f10c3..abaed0eee7f 100644 --- a/src/main/java/org/elasticsearch/alerting/triggers/TriggerManager.java +++ b/src/main/java/org/elasticsearch/alerts/triggers/TriggerManager.java @@ -3,13 +3,13 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting.triggers; +package org.elasticsearch.alerts.triggers; import org.elasticsearch.ElasticsearchIllegalArgumentException; import org.elasticsearch.ElasticsearchIllegalStateException; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.alerting.Alert; -import org.elasticsearch.alerting.AlertManager; +import org.elasticsearch.alerts.Alert; +import org.elasticsearch.alerts.AlertManager; import org.elasticsearch.common.component.AbstractComponent; import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.settings.Settings; diff --git a/src/main/java/org/elasticsearch/alerting/scheduler/package-info.java b/src/main/java/org/elasticsearch/alerts/triggers/package-info.java similarity index 84% rename from src/main/java/org/elasticsearch/alerting/scheduler/package-info.java rename to src/main/java/org/elasticsearch/alerts/triggers/package-info.java index d3ccf480f1f..0300001ea4f 100644 --- a/src/main/java/org/elasticsearch/alerting/scheduler/package-info.java +++ b/src/main/java/org/elasticsearch/alerts/triggers/package-info.java @@ -5,4 +5,4 @@ */ /** */ -package org.elasticsearch.alerting.scheduler; \ No newline at end of file +package org.elasticsearch.alerts.triggers; \ No newline at end of file diff --git a/src/main/java/org/elasticsearch/plugin/alerting/AlertingPlugin.java b/src/main/java/org/elasticsearch/plugin/alerting/AlertingPlugin.java index 751b74ab7b8..49c1ea2cfe3 100644 --- a/src/main/java/org/elasticsearch/plugin/alerting/AlertingPlugin.java +++ b/src/main/java/org/elasticsearch/plugin/alerting/AlertingPlugin.java @@ -5,9 +5,9 @@ */ package org.elasticsearch.plugin.alerting; -import org.elasticsearch.alerting.AlertManager; -import org.elasticsearch.alerting.scheduler.AlertScheduler; -import org.elasticsearch.alerting.AlertingModule; +import org.elasticsearch.alerts.AlertManager; +import org.elasticsearch.alerts.scheduler.AlertScheduler; +import org.elasticsearch.alerts.AlertingModule; import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.component.LifecycleComponent; import org.elasticsearch.common.inject.Module; diff --git a/src/test/java/org/elasticsearch/alerting/BasicAlertingTest.java b/src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java similarity index 90% rename from src/test/java/org/elasticsearch/alerting/BasicAlertingTest.java rename to src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java index 6706e0f8ac2..8f48ce87523 100644 --- a/src/test/java/org/elasticsearch/alerting/BasicAlertingTest.java +++ b/src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java @@ -3,14 +3,14 @@ * or more contributor license agreements. Licensed under the Elastic License; * you may not use this file except in compliance with the Elastic License. */ -package org.elasticsearch.alerting; +package org.elasticsearch.alerts; -import org.elasticsearch.alerting.actions.AlertAction; -import org.elasticsearch.alerting.actions.AlertActionFactory; -import org.elasticsearch.alerting.actions.AlertActionManager; -import org.elasticsearch.alerting.scheduler.AlertScheduler; -import org.elasticsearch.alerting.triggers.AlertTrigger; -import org.elasticsearch.alerting.triggers.ScriptedAlertTrigger; +import org.elasticsearch.alerts.actions.AlertAction; +import org.elasticsearch.alerts.actions.AlertActionFactory; +import org.elasticsearch.alerts.actions.AlertActionManager; +import org.elasticsearch.alerts.scheduler.AlertScheduler; +import org.elasticsearch.alerts.triggers.AlertTrigger; +import org.elasticsearch.alerts.triggers.ScriptedAlertTrigger; import org.elasticsearch.common.settings.ImmutableSettings; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -48,6 +48,7 @@ public class BasicAlertingTest extends ElasticsearchIntegrationTest { public void testAlerSchedulerStartsProperly() throws Exception { createIndex("my-index"); createIndex(ScriptService.SCRIPT_INDEX); + client().admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); client().prepareIndex(ScriptService.SCRIPT_INDEX, "mustache", "query") .setSource(jsonBuilder().startObject().startObject("template").startObject("match_all").endObject().endObject().endObject())