Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add logging for remote monitor execution flows #1663

Merged
merged 1 commit into from
Oct 2, 2024
Merged

add logging for remote monitor execution flows #1663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions alerting/src/main/kotlin/org/opensearch/alerting/MonitorRunnerService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,7 @@ object MonitorRunnerService : JobRunner, CoroutineScope, AbstractLifecycleCompon
} else {
if (monitorCtx.remoteMonitors.containsKey(monitor.monitorType)) {
if (monitor.monitorType.endsWith(Monitor.MonitorType.DOC_LEVEL_MONITOR.value)) {
logger.info("Executing remote document monitor of type ${monitor.monitorType} id ${monitor.id}")
return RemoteDocumentLevelMonitorRunner().runMonitor(
monitor,
monitorCtx,
Expand All @@ -490,6 +491,7 @@ object MonitorRunnerService : JobRunner, CoroutineScope, AbstractLifecycleCompon
transportService = transportService
)
} else {
logger.info("Executing remote monitor of type ${monitor.monitorType} id ${monitor.id}")
return monitorCtx.remoteMonitors[monitor.monitorType]!!.monitorRunner.runMonitor(
monitor,
periodStart,
Expand Down
6 changes: 5 additions & 1 deletion ...src/main/kotlin/org/opensearch/alerting/transport/TransportDocLevelMonitorFanOutAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,11 @@ class TransportDocLevelMonitorFanOutAction
)
)
} catch (e: Exception) {
log.error("${request.monitor.id} Failed to run fan_out on node ${clusterService.localNode().id} due to error $e")
log.error(
"${request.monitor.id} Failed to run fan_out on node ${clusterService.localNode().id}." +
" for Monitor Type ${request.monitor.monitorType} ExecutionId ${request.executionId}",
e
)
listener.onFailure(AlertingException.wrap(e))
}
}
Expand Down
4 changes: 2 additions & 2 deletions spi/src/main/kotlin/org/opensearch/alerting/spi/RemoteMonitorRunner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ open class RemoteMonitorRunner {
}

open fun getFanOutAction(): String {
return DocLevelMonitorFanOutAction.NAME
throw UnsupportedOperationException("Fan out action needs to be implemented by remote monitor.");
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this being thrown as an exception now instead of returning the name?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this class needs to be implemented and registered at
public Map<String, RemoteMonitorRunner> getMonitorTypesToMonitorRunners() in Plugin

should not have a default fan out action. needs to be specified by the new monitor created by extending this class

}

open suspend fun doFanOut(
Expand Down Expand Up @@ -185,4 +185,4 @@ open class RemoteMonitorRunner {
}
}
}
}
}
Loading