This is an automated email from the ASF dual-hosted git repository. zhaoqingran pushed a commit to branch script in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit 26c6d8017b5b4d90f00b7d5633971abdc56a1a08 Merge: 6c1093f60 38c0e4ab2 Author: Logic <[email protected]> AuthorDate: Mon Nov 4 23:51:08 2024 +0800 Merge remote-tracking branch 'origin/script' into script # Conflicts: # manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java .../hertzbeat/manager/component/alerter/DispatcherAlarm.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --cc manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java index 613907c63,7082ad60b..bf7281fc1 --- a/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java +++ b/manager/src/main/java/org/apache/hertzbeat/manager/component/alerter/DispatcherAlarm.java @@@ -190,8 -189,10 +189,9 @@@ public class DispatcherAlarm implement return; } Script script = Script.builder().type(type).content(scriptContent).id(ScriptUtil.generateScriptKey(scriptContent)).build(); - collectorJobScheduler.executeSyncScript(script, pluginContext.param().getString("collector", null)); + String result = collectorJobScheduler.executeSyncScript(script, pluginContext.param().getString("collector", null)); - log.info("Script has been sent to collector: {}", script.getId()); + log.info("Script has been sent to collector: {}", pluginContext.param().getString("collector", null)); + log.info("Script result: {}", result); - } private void sendNotify(Alert alert) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
