rename setting option and reverted one unit test

opendistro-for-elasticsearch · Oct 6, 2020 · 24c6e2b · 24c6e2b
1 parent 956e65b
commit 24c6e2b
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 23 deletions.
diff --git a/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/AlertingPlugin.kt b/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/AlertingPlugin.kt
@@ -255,7 +255,7 @@ internal class AlertingPlugin : PainlessExtension, ActionPlugin, ScriptPlugin, R
                 AlertingSettings.ALERTING_MAX_MONITORS,
                 AlertingSettings.REQUEST_TIMEOUT,
                 AlertingSettings.MAX_ACTION_THROTTLE_VALUE,
-                AlertingSettings.FILTERBY_BACKEND_ROLES,
+                AlertingSettings.FILTER_BY_BACKEND_ROLES,
                 DestinationSettings.EMAIL_USERNAME,
                 DestinationSettings.EMAIL_PASSWORD
             )

diff --git a/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/MonitorRunner.kt b/alerting/src/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/MonitorRunner.kt
@@ -197,7 +197,7 @@ class MonitorRunner(
          */
         var roles = if (monitor.user == null) {
             // fixme: discuss and remove hardcoded to settings?
-            settings.getAsList("", listOf("all_access,AmazonES_all_access"))
+            settings.getAsList("", listOf("all_access", "AmazonES_all_access"))
         } else {
             monitor.user.roles
         }

diff --git a/.../kotlin/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestGetAlertsAction.kt b/.../kotlin/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestGetAlertsAction.kt
@@ -46,10 +46,10 @@ class RestGetAlertsAction(
 ) : BaseRestHandler() {
 
     private val log = LogManager.getLogger(RestGetAlertsAction::class.java)
-    @Volatile private var filterBy = AlertingSettings.FILTERBY_BACKEND_ROLES.get(settings)
+    @Volatile private var filterBy = AlertingSettings.FILTER_BY_BACKEND_ROLES.get(settings)
 
     init {
-        clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.FILTERBY_BACKEND_ROLES) { filterBy = it }
+        clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.FILTER_BY_BACKEND_ROLES) { filterBy = it }
     }
 
     override fun getName(): String {

diff --git a/...n/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestGetDestinationsAction.kt b/...n/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestGetDestinationsAction.kt
@@ -47,10 +47,10 @@ class RestGetDestinationsAction(
 ) : BaseRestHandler() {
 
     private val log = LogManager.getLogger(RestGetDestinationsAction::class.java)
-    @Volatile private var filterBy = AlertingSettings.FILTERBY_BACKEND_ROLES.get(settings)
+    @Volatile private var filterBy = AlertingSettings.FILTER_BY_BACKEND_ROLES.get(settings)
 
     init {
-        clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.FILTERBY_BACKEND_ROLES) { filterBy = it }
+        clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.FILTER_BY_BACKEND_ROLES) { filterBy = it }
     }
 
     override fun getName(): String {

diff --git a/...lin/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestSearchMonitorAction.kt b/...lin/com/amazon/opendistroforelasticsearch/alerting/resthandler/RestSearchMonitorAction.kt
@@ -61,10 +61,10 @@ class RestSearchMonitorAction(
     private val restClient: RestClient
 ) : BaseRestHandler() {
 
-    @Volatile private var filterBy = AlertingSettings.FILTERBY_BACKEND_ROLES.get(settings)
+    @Volatile private var filterBy = AlertingSettings.FILTER_BY_BACKEND_ROLES.get(settings)
 
     init {
-        clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.FILTERBY_BACKEND_ROLES) { filterBy = it }
+        clusterService.clusterSettings.addSettingsUpdateConsumer(AlertingSettings.FILTER_BY_BACKEND_ROLES) { filterBy = it }
     }
 
     override fun getName(): String {

diff --git a/...c/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/settings/AlertingSettings.kt b/...c/main/kotlin/com/amazon/opendistroforelasticsearch/alerting/settings/AlertingSettings.kt
@@ -120,7 +120,7 @@ class AlertingSettings {
                 TimeValue.timeValueHours(24),
                 Setting.Property.NodeScope, Setting.Property.Dynamic)
 
-        val FILTERBY_BACKEND_ROLES = Setting.boolSetting(
+        val FILTER_BY_BACKEND_ROLES = Setting.boolSetting(
                 "opendistro.alerting.filterby_backendroles",
                 false,
                 Setting.Property.NodeScope, Setting.Property.Dynamic)

diff --git a/...ng/src/test/kotlin/com/amazon/opendistroforelasticsearch/alerting/AlertingRestTestCase.kt b/...ng/src/test/kotlin/com/amazon/opendistroforelasticsearch/alerting/AlertingRestTestCase.kt
@@ -605,7 +605,7 @@ abstract class AlertingRestTestCase : ODFERestTestCase() {
             val updateResponse = client().makeRequest("PUT", "_cluster/settings",
                     emptyMap(),
                     StringEntity(XContentFactory.jsonBuilder().startObject().field("persistent")
-                            .startObject().field(AlertingSettings.FILTERBY_BACKEND_ROLES.key, true).endObject()
+                            .startObject().field(AlertingSettings.FILTER_BY_BACKEND_ROLES.key, true).endObject()
                             .endObject().string(), ContentType.APPLICATION_JSON))
             assertEquals(updateResponse.statusLine.toString(), 200, updateResponse.statusLine.statusCode)
         }

diff --git a/alerting/src/test/kotlin/com/amazon/opendistroforelasticsearch/alerting/MonitorRunnerIT.kt b/alerting/src/test/kotlin/com/amazon/opendistroforelasticsearch/alerting/MonitorRunnerIT.kt
@@ -271,19 +271,9 @@ class MonitorRunnerIT : AlertingRestTestCase() {
         assertEquals("Alert saved for test monitor", 0, alerts.size)
     }
 
-    fun `test execute monitor search with star`() {
-        val testIndex = createTestIndex()
-        val twoMinsAgo = ZonedDateTime.now().minus(2, MINUTES).truncatedTo(MILLIS)
-        val testTime = DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(twoMinsAgo)
-        val testDoc = """{ "test_strict_date_time" : "$testTime" }"""
-        indexDoc(testIndex, "1", testDoc)
-
-        val query = QueryBuilders.rangeQuery("test_strict_date_time")
-                .gt("{{period_end}}||-10d")
-                .lte("{{period_end}}")
-                .format("epoch_millis")
-
-        val input = SearchInput(indices = listOf("*"), query = SearchSourceBuilder().query(query))
+    fun `test execute monitor search with period`() {
+        val query = QueryBuilders.rangeQuery("monitor.last_update_time").gte("{{period_start}}").lte("{{period_end}}")
+        val input = SearchInput(indices = listOf(".*"), query = SearchSourceBuilder().query(query))
         val triggerScript = """
             // make sure there is at least one monitor
             return ctx.results[0].hits.hits.size() > 0