Merge branch 'opensearch-project:main' into listToMap-processor-multi…

…ple-entries

MAINTAINERS.md

@@ -14,18 +14,18 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Taylor Gray            | [graytaylor0](https://github.com/graytaylor0)             | Amazon      |
 | Dinu John              | [dinujoh](https://github.com/dinujoh)                     | Amazon      |
 | Krishna Kondaka        | [kkondaka](https://github.com/kkondaka)                   | Amazon      |
-| Asif Sohail Mohammed   | [asifsmohammed](https://github.com/asifsmohammed)         | Amazon      |
 | Karsten Schnitter      | [KarstenSchnitter](https://github.com/KarstenSchnitter)   | SAP         |
 | David Venable          | [dlvenable](https://github.com/dlvenable)                 | Amazon      |
 | Hai Yan                | [oeyh](https://github.com/oeyh)                           | Amazon      |
 
 
 ## Emeritus
 
-| Maintainer           | GitHub ID                                             | Affiliation |
-| -------------------- | ----------------------------------------------------- | ----------- |
-| Steven Bayer         | [sbayer55](https://github.com/sbayer55)               | Amazon      |
-| Christopher Manning  | [cmanning09](https://github.com/cmanning09)           | Amazon      |
-| David Powers         | [dapowers87](https://github.com/dapowers87)           | Amazon      |
-| Shivani Shukla       | [sshivanii](https://github.com/sshivanii)             | Amazon      |
-| Phill Treddenick     | [treddeni-amazon](https://github.com/treddeni-amazon) | Amazon      |
+| Maintainer             | GitHub ID                                             | Affiliation |
+| ---------------------- | ----------------------------------------------------- | ----------- |
+| Steven Bayer           | [sbayer55](https://github.com/sbayer55)               | Amazon      |
+| Christopher Manning    | [cmanning09](https://github.com/cmanning09)           | Amazon      |
+| Asif Sohail Mohammed   | [asifsmohammed](https://github.com/asifsmohammed)         | Amazon      |
+| David Powers           | [dapowers87](https://github.com/dapowers87)           | Amazon      |
+| Shivani Shukla         | [sshivanii](https://github.com/sshivanii)             | Amazon      |
+| Phill Treddenick       | [treddeni-amazon](https://github.com/treddeni-amazon) | Amazon      |

data-prepper-plugins/aggregate-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/aggregate/AggregateProcessorConfig.java

@@ -31,7 +31,7 @@ public class AggregateProcessorConfig {
 
     @JsonPropertyDescription("An unordered list by which to group events. Events with the same values as these keys are put into the same group. " +
             "If an event does not contain one of the <code>identification_keys</code>, then the value of that key is considered to be equal to <code>null</code>. " +
-            "At least one <code>identification_key</code> is required. An example configuration is [\"sourceIp\", \"destinationIp\", \"port\"].")
+            "At least one <code>identification_key</code> is required.")
     @JsonProperty("identification_keys")
     @NotEmpty
     @ExampleValues({

data-prepper-plugins/anomaly-detector-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/anomalydetector/AnomalyDetectorProcessorConfig.java

@@ -34,7 +34,7 @@ public class AnomalyDetectorProcessorConfig {
     @UsesDataPrepperPlugin(pluginType = AnomalyDetectorMode.class)
     private PluginModel detectorMode;
 
-    @JsonPropertyDescription("If provided, anomalies will be detected within each unique instance of these keys. For example, if you provide the ip field, anomalies will be detected separately for each unique IP address.")
+    @JsonPropertyDescription("If provided, anomalies will be detected within each unique instance of these keys. For example, if you provide the IP field, anomalies will be detected separately for each unique IP address.")
     @JsonProperty("identification_keys")
     @ExampleValues({
             @Example(value = "ip_address", description = "Anomalies will be detected separately for each unique IP address from the existing ip_address key of the Event.")

data-prepper-plugins/anomaly-detector-processor/src/main/java/org/opensearch/dataprepper/plugins/processor/anomalydetector/modes/RandomCutForestModeConfig.java

@@ -51,7 +51,7 @@ public class RandomCutForestModeConfig {
     @JsonProperty(value = "time_decay", defaultValue = "" + DEFAULT_TIME_DECAY)
     private double timeDecay = DEFAULT_TIME_DECAY;
 
-    @JsonPropertyDescription("Output after indicates the number of events to consume before outputting anomalies. Default is 32.")
+    @JsonPropertyDescription("The number of events to train the model before generating an anomaly event. Default is 32.")
     @JsonProperty(value = "output_after", defaultValue = "" + DEFAULT_OUTPUT_AFTER)
     private int outputAfter = DEFAULT_OUTPUT_AFTER;
 

data-prepper-plugins/aws-lambda/src/main/java/org/opensearch/dataprepper/plugins/lambda/processor/LambdaProcessorConfig.java

@@ -17,7 +17,7 @@
 import org.opensearch.dataprepper.plugins.lambda.common.config.LambdaCommonConfig;
 
 @JsonPropertyOrder
-@JsonClassDescription("The <code>aws_lambda</code> processor enables invocation of an AWS Lambda function within your Data Prepper pipeline in order to process events." +
+@JsonClassDescription("The <code>aws_lambda</code> processor enables invocation of an AWS Lambda function within your pipeline in order to process events. " +
         "It supports both synchronous and asynchronous invocations based on your use case.")
 public class LambdaProcessorConfig extends LambdaCommonConfig {
   static final String DEFAULT_INVOCATION_TYPE = "request-response";
@@ -40,7 +40,7 @@ public class LambdaProcessorConfig extends LambdaCommonConfig {
 
   @JsonPropertyDescription("Defines a condition for event to use this processor.")
   @ExampleValues({
-          @Example(value = "event['status'] == 'process'", description = "The processor will only run on this condition.")
+          @Example(value = "/some_key == null", description = "The processor will only run on events where this condition evaluates to true.")
   })
   @JsonProperty("lambda_when")
   private String whenCondition;

data-prepper-plugins/cloudwatch-logs/build.gradle

@@ -1,8 +1,28 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
 plugins {
     id 'java'
     id 'java-library'
 }
 
+sourceSets {
+    integrationTest {
+        java {
+            compileClasspath += main.output + test.output
+            runtimeClasspath += main.output + test.output
+            srcDir file('src/integrationTest/java')
+        }
+    }
+}
+
+configurations {
+    integrationTestImplementation.extendsFrom testImplementation
+    integrationTestRuntime.extendsFrom testRuntime
+}
+
 dependencies {
     implementation project(':data-prepper-plugins:aws-plugin-api')
     implementation project(path: ':data-prepper-plugins:common')
@@ -33,4 +53,20 @@ jacocoTestCoverageVerification {
 
 test {
     useJUnitPlatform()
-}
+}
+
+task integrationTest(type: Test) {
+    group = 'verification'
+    testClassesDirs = sourceSets.integrationTest.output.classesDirs
+
+    useJUnitPlatform()
+
+    classpath = sourceSets.integrationTest.runtimeClasspath
+    systemProperty 'tests.cloudwatch.log_group', System.getProperty('tests.cloudwatch.log_group')
+    systemProperty 'tests.cloudwatch.log_stream', System.getProperty('tests.cloudwatch.log_stream')
+    systemProperty 'tests.aws.region', System.getProperty('tests.aws.region')
+    systemProperty 'tests.aws.role', System.getProperty('tests.aws.role')
+    filter {
+        includeTestsMatching '*IT'
+    }
+}