Revert "add nested fields param mapping findings index for doc level …

…queries (opensearch-project#1276)" This reverts commit 2146199. Signed-off-by: Surya Sashank Nistala <[email protected]>
eirsep · Nov 28, 2023 · e943fc6 · e943fc6
1 parent 76dc83e
commit e943fc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/alerting/src/main/resources/org/opensearch/alerting/alerts/finding_mapping.json b/alerting/src/main/resources/org/opensearch/alerting/alerts/finding_mapping.json
@@ -1,7 +1,7 @@
 {
   "dynamic": "strict",
   "_meta" : {
-    "schema_version": 4
+    "schema_version": 3
   },
   "properties": {
     "schema_version": {
@@ -46,9 +46,6 @@
               "type" : "keyword"
             }
           }
-        },
-        "fields": {
-          "type": "text"
         }
       }
     },

diff --git a/alerting/src/test/kotlin/org/opensearch/alerting/alerts/AlertIndicesIT.kt b/alerting/src/test/kotlin/org/opensearch/alerting/alerts/AlertIndicesIT.kt
@@ -75,7 +75,7 @@ class AlertIndicesIT : AlertingRestTestCase() {
 
         putFindingMappings(
             AlertIndices.findingMapping().trimStart('{').trimEnd('}')
-                .replace("\"schema_version\": 4", "\"schema_version\": 0")
+                .replace("\"schema_version\": 3", "\"schema_version\": 0")
         )
         assertIndexExists(AlertIndices.FINDING_HISTORY_WRITE_INDEX)
         verifyIndexSchemaVersion(AlertIndices.FINDING_HISTORY_WRITE_INDEX, 0)
@@ -89,7 +89,7 @@ class AlertIndicesIT : AlertingRestTestCase() {
         executeMonitor(trueMonitor.id)
         assertIndexExists(AlertIndices.FINDING_HISTORY_WRITE_INDEX)
         verifyIndexSchemaVersion(ScheduledJob.SCHEDULED_JOBS_INDEX, 8)
-        verifyIndexSchemaVersion(AlertIndices.FINDING_HISTORY_WRITE_INDEX, 4)
+        verifyIndexSchemaVersion(AlertIndices.FINDING_HISTORY_WRITE_INDEX, 3)
     }
 
     fun `test alert index gets recreated automatically if deleted`() {