Opendistro 1.3

* Revert "Adding new type of input for Monitors - HttpInput (#82)" This reverts commit c2004f7.
opendistro-for-elasticsearch · Nov 19, 2019 · edd6766 · edd6766
1 parent c72a267
commit edd6766
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 601 deletions.
diff --git a/README.md b/README.md
@@ -27,14 +27,6 @@ Please see our [documentation](https://opendistro.github.io/for-elasticsearch-do
 1. Check out this package from version control.
 1. Launch Intellij IDEA, choose **Import Project**, and select the `settings.gradle` file in the root of this package. 
 1. To build from the command line, set `JAVA_HOME` to point to a JDK >= 12 before running `./gradlew`.
-  - Unix System
-    1. `export JAVA_HOME=jdk-install-dir`: Replace `jdk-install-dir` by the JAVA_HOME directory of your system.
-    1. `export PATH=$JAVA_HOME/bin:$PATH`
-
-  - Windows System
-    1. Find **My Computers** from file directory, right click and select **properties**.
-    1. Select the **Advanced** tab, select **Environment variables**.
-    1. Edit **JAVA_HOME** to path of where JDK software is installed.
 
 
 ## Build

diff --git a/alerting/build.gradle b/alerting/build.gradle
@@ -49,10 +49,7 @@ configurations.all {
         force "commons-logging:commons-logging:${versions.commonslogging}"
         force "org.apache.httpcomponents:httpcore:${versions.httpcore}"
         force "commons-codec:commons-codec:${versions.commonscodec}"
-        force "commons-collections:commons-collections:3.2.2"
-        force "org.apache.httpcomponents:httpcore-nio:4.4.11"
-        force "org.apache.httpcomponents:httpclient:4.5.7"
-
+
         // This is required because kotlin coroutines core-1.1.1 still requires kotin stdlib 1.3.20 and we're using 1.3.21
         force "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
         force "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
@@ -61,7 +58,6 @@ configurations.all {
 
 dependencies {
     compileOnly "org.elasticsearch.plugin:elasticsearch-scripting-painless-spi:${versions.elasticsearch}"
-    compile "org.apache.httpcomponents:httpasyncclient:4.1.4"
 
     // Elasticsearch Nanny state
     compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"

diff --git a/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/AlertingPlugin.kt b/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/AlertingPlugin.kt
@@ -19,7 +19,6 @@ import com.amazon.opendistroforelasticsearch.alerting.core.JobSweeper
 import com.amazon.opendistroforelasticsearch.alerting.core.ScheduledJobIndices
 import com.amazon.opendistroforelasticsearch.alerting.core.action.node.ScheduledJobsStatsAction
 import com.amazon.opendistroforelasticsearch.alerting.core.action.node.ScheduledJobsStatsTransportAction
-import com.amazon.opendistroforelasticsearch.alerting.core.model.HttpInput
 import com.amazon.opendistroforelasticsearch.alerting.core.model.ScheduledJob
 import com.amazon.opendistroforelasticsearch.alerting.core.model.SearchInput
 import com.amazon.opendistroforelasticsearch.alerting.core.resthandler.RestScheduledJobStatsHandler
@@ -119,7 +118,7 @@ internal class AlertingPlugin : PainlessExtension, ActionPlugin, ScriptPlugin, P
     }
 
     override fun getNamedXContent(): List<NamedXContentRegistry.Entry> {
-        return listOf(Monitor.XCONTENT_REGISTRY, SearchInput.XCONTENT_REGISTRY, HttpInput.XCONTENT_REGISTRY)
+        return listOf(Monitor.XCONTENT_REGISTRY, SearchInput.XCONTENT_REGISTRY)
     }
 
     override fun createComponents(

diff --git a/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/MonitorRunner.kt b/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/MonitorRunner.kt
@@ -18,12 +18,7 @@ package com.amazon.opendistroforelasticsearch.alerting
 import com.amazon.opendistroforelasticsearch.alerting.alerts.AlertError
 import com.amazon.opendistroforelasticsearch.alerting.alerts.AlertIndices
 import com.amazon.opendistroforelasticsearch.alerting.alerts.moveAlerts
-import com.amazon.opendistroforelasticsearch.alerting.client.HttpInputClient
 import com.amazon.opendistroforelasticsearch.alerting.core.JobRunner
-import com.amazon.opendistroforelasticsearch.alerting.core.httpapi.suspendUntil
-import com.amazon.opendistroforelasticsearch.alerting.core.httpapi.toGetRequest
-import com.amazon.opendistroforelasticsearch.alerting.core.httpapi.toMap
-import com.amazon.opendistroforelasticsearch.alerting.core.model.HttpInput
 import com.amazon.opendistroforelasticsearch.alerting.core.model.ScheduledJob
 import com.amazon.opendistroforelasticsearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOBS_INDEX
 import com.amazon.opendistroforelasticsearch.alerting.core.model.SearchInput
@@ -56,14 +51,13 @@ import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.
 import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.MOVE_ALERTS_BACKOFF_COUNT
 import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.MOVE_ALERTS_BACKOFF_MILLIS
 import com.amazon.opendistroforelasticsearch.alerting.util.IndexUtils
+import org.apache.logging.log4j.LogManager
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import org.apache.http.HttpResponse
-import org.apache.logging.log4j.LogManager
 import org.elasticsearch.ExceptionsHelper
 import org.elasticsearch.action.DocWriteRequest
 import org.elasticsearch.action.bulk.BackoffPolicy
@@ -111,7 +105,7 @@ class MonitorRunner(
 ) : JobRunner, CoroutineScope, AbstractLifecycleComponent() {
 
     private val logger = LogManager.getLogger(MonitorRunner::class.java)
-    private var httpClient: HttpInputClient
+
     private lateinit var runnerSupervisor: Job
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Default + runnerSupervisor
@@ -128,17 +122,14 @@ class MonitorRunner(
         clusterService.clusterSettings.addSettingsUpdateConsumer(MOVE_ALERTS_BACKOFF_MILLIS, MOVE_ALERTS_BACKOFF_COUNT) {
             millis, count -> moveAlertsRetryPolicy = BackoffPolicy.exponentialBackoff(millis, count)
         }
-        httpClient = HttpInputClient()
     }
 
     override fun doStart() {
         runnerSupervisor = SupervisorJob()
-        httpClient.client.start()
     }
 
     override fun doStop() {
         runnerSupervisor.cancel()
-        httpClient.client.close()
     }
 
     override fun doClose() { }
@@ -301,29 +292,6 @@ class MonitorRunner(
                         val searchResponse: SearchResponse = client.suspendUntil { client.search(searchRequest, it) }
                         results += searchResponse.convertToMap()
                     }
-                    is HttpInput -> {
-                        val response: HttpResponse = httpClient.client.suspendUntil {
-                            httpClient.client.execute(input.toGetRequest(), it)
-                        }
-                        // Make sure response content length is not larger than 100MB
-                        val contentLengthHeader = response.getFirstHeader("Content-Length").value
-
-                        // Use content-length header to check size. If content-length header does not exist, set Alert in Error state.
-                        if (contentLengthHeader != null) {
-                            logger.debug("Content length is $contentLengthHeader")
-                            val contentLength = contentLengthHeader.toInt()
-                            if (contentLength > httpClient.MAX_CONTENT_LENGTH) {
-                                throw Exception("Response content size: $contentLength, is larger than ${httpClient.MAX_CONTENT_LENGTH}.")
-                            }
-                        } else {
-                            logger.debug("Content-length header does not exist, set alert to error state.")
-                            throw IllegalArgumentException("Response does not contain content-length header.")
-                        }
-
-                        results += withContext(Dispatchers.IO) {
-                            response.toMap()
-                        }
-                    }
                     else -> {
                         throw IllegalArgumentException("Unsupported input type: ${input.name()}.")
                     }

diff --git a/.../src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/client/HttpInputClient.kt b/.../src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/client/HttpInputClient.kt
diff --git a/...tlin/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestIndexMonitorAction.kt b/...tlin/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestIndexMonitorAction.kt
@@ -14,25 +14,23 @@
  */
 package com.amazon.opendistroforelasticsearch.alerting.resthandler
 
-import com.amazon.opendistroforelasticsearch.alerting.AlertingPlugin
 import com.amazon.opendistroforelasticsearch.alerting.core.ScheduledJobIndices
-import com.amazon.opendistroforelasticsearch.alerting.core.httpapi.toConstructedUrl
-import com.amazon.opendistroforelasticsearch.alerting.core.model.HttpInput
 import com.amazon.opendistroforelasticsearch.alerting.core.model.ScheduledJob
 import com.amazon.opendistroforelasticsearch.alerting.core.model.ScheduledJob.Companion.SCHEDULED_JOBS_INDEX
 import com.amazon.opendistroforelasticsearch.alerting.model.Monitor
 import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.ALERTING_MAX_MONITORS
 import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.INDEX_TIMEOUT
-import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.MAX_ACTION_THROTTLE_VALUE
 import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.REQUEST_TIMEOUT
+import com.amazon.opendistroforelasticsearch.alerting.util.REFRESH
+import com.amazon.opendistroforelasticsearch.alerting.util._ID
+import com.amazon.opendistroforelasticsearch.alerting.util._VERSION
+import com.amazon.opendistroforelasticsearch.alerting.AlertingPlugin
+import com.amazon.opendistroforelasticsearch.alerting.settings.AlertingSettings.Companion.MAX_ACTION_THROTTLE_VALUE
 import com.amazon.opendistroforelasticsearch.alerting.util.IF_PRIMARY_TERM
 import com.amazon.opendistroforelasticsearch.alerting.util.IF_SEQ_NO
 import com.amazon.opendistroforelasticsearch.alerting.util.IndexUtils
-import com.amazon.opendistroforelasticsearch.alerting.util.REFRESH
-import com.amazon.opendistroforelasticsearch.alerting.util._ID
 import com.amazon.opendistroforelasticsearch.alerting.util._PRIMARY_TERM
 import com.amazon.opendistroforelasticsearch.alerting.util._SEQ_NO
-import com.amazon.opendistroforelasticsearch.alerting.util._VERSION
 import org.apache.logging.log4j.LogManager
 import org.elasticsearch.action.ActionListener
 import org.elasticsearch.action.admin.indices.create.CreateIndexResponse
@@ -78,7 +76,7 @@ private val log = LogManager.getLogger(RestIndexMonitorAction::class.java)
  * Rest handlers to create and update monitors.
  */
 class RestIndexMonitorAction(
-    val settings: Settings,
+    settings: Settings,
     controller: RestController,
     jobIndices: ScheduledJobIndices,
     clusterService: ClusterService
@@ -161,7 +159,6 @@ class RestIndexMonitorAction(
          */
         private fun prepareMonitorIndexing() {
             validateActionThrottle(newMonitor, maxActionThrottle, TimeValue.timeValueMinutes(1))
-            validateLocalPort(newMonitor, settings.get("http.port").toInt())
             if (channel.request().method() == PUT) return updateMonitor()
             val query = QueryBuilders.boolQuery().filter(QueryBuilders.termQuery("${Monitor.MONITOR_TYPE}.type", Monitor.MONITOR_TYPE))
             val searchSource = SearchSourceBuilder().query(query).timeout(requestTimeout)
@@ -183,23 +180,6 @@ class RestIndexMonitorAction(
             }
         }
 
-        /**
-         * This function checks whether the [Monitor] has an [HttpInput] with localhost. If so, make sure the port is same as specified in settings.
-         */
-        private fun validateLocalPort(monitor: Monitor, settingsPort: Int) {
-            for (input in monitor.inputs) {
-                if (input is HttpInput) {
-                    val constructedUrl = input.toConstructedUrl()
-                    // Make sure that when host is "localhost", only port number specified in settings is allowed.
-                    if (constructedUrl.host == "localhost") {
-                        require(constructedUrl.port == settingsPort) {
-                            "Host: ${constructedUrl.host} is restricted to port $settingsPort."
-                        }
-                    }
-                }
-            }
-        }
-
         /**
          * After searching for all existing monitors we validate the system can support another monitor to be created.
          */