Skip to content

Commit

Permalink
Monitor model changed to add an optional fanoutEnabled field (#758) (#…
Browse files Browse the repository at this point in the history
…763)

* Monitor model changed to add an optional fanoutEnabled field



* Monitor model changed to add an optional fanoutEnabled field



* move fanoutEnabled to docLevel input



* move fanoutEnabled to docLevel input



* move fanoutEnabled to docLevel input



---------


(cherry picked from commit cb9d38b)

Signed-off-by: Riya Saxena <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  • Loading branch information
1 parent 4d4c1af commit 2e67c02
Showing 1 changed file with 14 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,16 @@ import java.io.IOException
data class DocLevelMonitorInput(
val description: String = NO_DESCRIPTION,
val indices: List<String>,
val queries: List<DocLevelQuery>
val queries: List<DocLevelQuery>,
val fanoutEnabled: Boolean? = true
) : Input {

@Throws(IOException::class)
constructor(sin: StreamInput) : this(
sin.readString(), // description
sin.readStringList(), // indices
sin.readList(::DocLevelQuery) // docLevelQueries
sin.readList(::DocLevelQuery), // docLevelQueries
sin.readOptionalBoolean() // fanoutEnabled
)

override fun asTemplateArg(): Map<String, Any> {
Expand All @@ -41,6 +43,7 @@ data class DocLevelMonitorInput(
out.writeString(description)
out.writeStringCollection(indices)
out.writeCollection(queries)
out.writeOptionalBoolean(fanoutEnabled)
}

override fun toXContent(builder: XContentBuilder, params: ToXContent.Params): XContentBuilder {
Expand All @@ -49,6 +52,7 @@ data class DocLevelMonitorInput(
.field(DESCRIPTION_FIELD, description)
.field(INDICES_FIELD, indices.toTypedArray())
.field(QUERIES_FIELD, queries.toTypedArray())
.field(FANOUT_FIELD, fanoutEnabled)
.endObject()
.endObject()
return builder
Expand All @@ -59,7 +63,7 @@ data class DocLevelMonitorInput(
const val INDICES_FIELD = "indices"
const val DOC_LEVEL_INPUT_FIELD = "doc_level_input"
const val QUERIES_FIELD = "queries"

const val FANOUT_FIELD = "fan_out_enabled"
const val NO_DESCRIPTION = ""

val XCONTENT_REGISTRY = NamedXContentRegistry.Entry(
Expand All @@ -74,6 +78,7 @@ data class DocLevelMonitorInput(
var description: String = NO_DESCRIPTION
val indices: MutableList<String> = mutableListOf()
val docLevelQueries: MutableList<DocLevelQuery> = mutableListOf()
var fanoutEnabled: Boolean? = true

XContentParserUtils.ensureExpectedToken(XContentParser.Token.START_OBJECT, xcp.currentToken(), xcp)
while (xcp.nextToken() != XContentParser.Token.END_OBJECT) {
Expand Down Expand Up @@ -102,10 +107,15 @@ data class DocLevelMonitorInput(
docLevelQueries.add(DocLevelQuery.parse(xcp))
}
}
FANOUT_FIELD -> fanoutEnabled = if (xcp.currentToken() == XContentParser.Token.VALUE_NULL) {
fanoutEnabled
} else {
xcp.booleanValue()
}
}
}

return DocLevelMonitorInput(description = description, indices = indices, queries = docLevelQueries)
return DocLevelMonitorInput(description = description, indices = indices, queries = docLevelQueries, fanoutEnabled = fanoutEnabled)
}

@JvmStatic
Expand Down

0 comments on commit 2e67c02

Please sign in to comment.