Merge pull request elastic/elasticsearch#14 from GaelTadh/change-packages

Alerting: Split alerting into packages

Original commit: elastic/x-pack-elasticsearch@68f2b86cb0

src/main/java/org/elasticsearch/alerts/Alert.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.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;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentType;
 
 import java.io.IOException;
 import java.util.List;

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,6 +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.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;
@@ -44,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");
@@ -73,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() {
@@ -81,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) {
@@ -255,11 +262,11 @@ public class AlertManager extends AbstractLifecycleComponent {
     }
 
     private void loadAlerts() {
+        synchronized (alertMap) {
             if (!client.admin().indices().prepareExists(ALERT_INDEX).execute().actionGet().isExists()) {
                 createAlertsIndex();
             }
 
-        synchronized (alertMap) {
             SearchResponse searchResponse = client.prepareSearch().setSource(
                     "{ \"query\" : " +
                             "{ \"match_all\" :  {}}," +
@@ -386,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 {

src/main/java/org/elasticsearch/alerts/AlertResult.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.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.alerts.triggers.AlertTrigger;
 import org.elasticsearch.common.joda.time.DateTime;
-import org.elasticsearch.common.xcontent.XContentBuilder;
 
 import java.util.Arrays;
 

src/main/java/org/elasticsearch/alerts/AlertingModule.java

@@ -3,8 +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.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 {

src/main/java/org/elasticsearch/alerts/actions/AlertAction.java

@@ -3,8 +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;
+package org.elasticsearch.alerts.actions;
 
+import org.elasticsearch.alerts.AlertResult;
 import org.elasticsearch.common.xcontent.ToXContent;
 import org.elasticsearch.common.xcontent.XContentBuilder;
 

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;
+package org.elasticsearch.alerts.actions;
 
 public interface AlertActionFactory {
     AlertAction createAction(Object parameters);

src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java

@@ -3,8 +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.actions;
 
+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;

src/main/java/org/elasticsearch/alerts/actions/EmailAlertAction.java

@@ -3,20 +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;
+package org.elasticsearch.alerts.actions;
 
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.alerts.AlertResult;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentHelper;
-import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.SearchHitField;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Properties;
 import javax.mail.*;
 import javax.mail.internet.AddressException;

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;
+package org.elasticsearch.alerts.actions;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ElasticsearchIllegalArgumentException;

src/main/java/org/elasticsearch/alerts/actions/IndexAlertAction.java

@@ -3,10 +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.actions;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.index.IndexRequest;
+import org.elasticsearch.alerts.AlertResult;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.logging.ESLogger;
 import org.elasticsearch.common.logging.Loggers;

src/main/java/org/elasticsearch/alerts/actions/IndexAlertActionFactory.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;
+package org.elasticsearch.alerts.actions;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
-import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.client.Client;
 
 import java.util.Locale;

src/main/java/org/elasticsearch/alerts/actions/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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.alerts.actions;

src/main/java/org/elasticsearch/alerts/package-info.java

@@ -6,4 +6,4 @@
 /**
  * Created by brian on 8/12/14.
  */
-package org.elasticsearch.alerting;
+package org.elasticsearch.alerts;

src/main/java/org/elasticsearch/alerts/rest/AlertRestHandler.java

@@ -3,9 +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.rest;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
+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;

src/main/java/org/elasticsearch/alerts/rest/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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.alerts.rest;

src/main/java/org/elasticsearch/alerts/scheduler/AlertExecutorJob.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.scheduler;
 
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;

src/main/java/org/elasticsearch/alerts/scheduler/AlertScheduler.java

@@ -3,11 +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;
+package org.elasticsearch.alerts.scheduler;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
+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;
@@ -208,7 +213,7 @@ public class AlertScheduler extends AbstractLifecycleComponent implements Cluste
     }
 
     public void addAlert(String alertName, Alert alert) {
-        JobDetail job = JobBuilder.newJob(org.elasticsearch.alerting.AlertExecutorJob.class).withIdentity(alertName).build();
+        JobDetail job = JobBuilder.newJob(AlertExecutorJob.class).withIdentity(alertName).build();
         job.getJobDataMap().put("manager",this);
         CronTrigger cronTrigger = TriggerBuilder.newTrigger()
                 .withSchedule(CronScheduleBuilder.cronSchedule(alert.schedule()))

src/main/java/org/elasticsearch/alerts/scheduler/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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.alerts.scheduler;

src/main/java/org/elasticsearch/alerts/triggers/AlertTrigger.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.triggers;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.common.xcontent.ToXContent;

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;
+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;

src/main/java/org/elasticsearch/alerts/triggers/TriggerManager.java

@@ -3,11 +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;
+package org.elasticsearch.alerts.triggers;
 
 import org.elasticsearch.ElasticsearchIllegalArgumentException;
 import org.elasticsearch.ElasticsearchIllegalStateException;
 import org.elasticsearch.action.search.SearchResponse;
+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;

src/main/java/org/elasticsearch/alerts/triggers/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * 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.alerts.triggers;

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.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;

src/test/java/org/elasticsearch/alerts/BasicAlertingTest.java

@@ -3,8 +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.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;
@@ -42,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())