Skip to content

Commit 80e0945

Browse files
authored
revert commit #740 (#741)
Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
1 parent aa0d360 commit 80e0945

File tree

1 file changed

+0
-12
lines changed
  • src/main/kotlin/org/opensearch/commons/alerting/model

1 file changed

+0
-12
lines changed

src/main/kotlin/org/opensearch/commons/alerting/model/Monitor.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ data class Monitor(
4242
val triggers: List<Trigger>,
4343
val uiMetadata: Map<String, Any>,
4444
val dataSources: DataSources = DataSources(),
45-
val deleteQueryIndexInEveryRun: Boolean? = false,
4645
val owner: String? = "alerting"
4746
) : ScheduledJob {
4847

@@ -111,7 +110,6 @@ data class Monitor(
111110
} else {
112111
DataSources()
113112
},
114-
deleteQueryIndexInEveryRun = sin.readOptionalBoolean(),
115113
owner = sin.readOptionalString()
116114
)
117115

@@ -171,7 +169,6 @@ data class Monitor(
171169
.optionalTimeField(LAST_UPDATE_TIME_FIELD, lastUpdateTime)
172170
if (uiMetadata.isNotEmpty()) builder.field(UI_METADATA_FIELD, uiMetadata)
173171
builder.field(DATA_SOURCES_FIELD, dataSources)
174-
builder.field(DELETE_QUERY_INDEX_IN_EVERY_RUN_FIELD, deleteQueryIndexInEveryRun)
175172
builder.field(OWNER_FIELD, owner)
176173
if (params.paramAsBoolean("with_type", false)) builder.endObject()
177174
return builder.endObject()
@@ -223,7 +220,6 @@ data class Monitor(
223220
out.writeMap(uiMetadata)
224221
out.writeBoolean(dataSources != null) // for backward compatibility with pre-existing monitors which don't have datasources field
225222
dataSources.writeTo(out)
226-
out.writeOptionalBoolean(deleteQueryIndexInEveryRun)
227223
out.writeOptionalString(owner)
228224
}
229225

@@ -244,7 +240,6 @@ data class Monitor(
244240
const val UI_METADATA_FIELD = "ui_metadata"
245241
const val DATA_SOURCES_FIELD = "data_sources"
246242
const val ENABLED_TIME_FIELD = "enabled_time"
247-
const val DELETE_QUERY_INDEX_IN_EVERY_RUN_FIELD = "delete_query_index_in_every_run"
248243
const val OWNER_FIELD = "owner"
249244
val MONITOR_TYPE_PATTERN = Pattern.compile("[a-zA-Z0-9_]{5,25}")
250245

@@ -273,7 +268,6 @@ data class Monitor(
273268
val triggers: MutableList<Trigger> = mutableListOf()
274269
val inputs: MutableList<Input> = mutableListOf()
275270
var dataSources = DataSources()
276-
var deleteQueryIndexInEveryRun = false
277271
var owner = "alerting"
278272

279273
XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp)
@@ -327,11 +321,6 @@ data class Monitor(
327321
} else {
328322
DataSources.parse(xcp)
329323
}
330-
DELETE_QUERY_INDEX_IN_EVERY_RUN_FIELD -> deleteQueryIndexInEveryRun = if (xcp.currentToken() == XContentParser.Token.VALUE_NULL) {
331-
deleteQueryIndexInEveryRun
332-
} else {
333-
xcp.booleanValue()
334-
}
335324
OWNER_FIELD -> owner = if (xcp.currentToken() == XContentParser.Token.VALUE_NULL) owner else xcp.text()
336325
else -> {
337326
xcp.skipChildren()
@@ -359,7 +348,6 @@ data class Monitor(
359348
triggers.toList(),
360349
uiMetadata,
361350
dataSources,
362-
deleteQueryIndexInEveryRun,
363351
owner
364352
)
365353
}

0 commit comments

Comments
 (0)