[feat] Monitoring Center - Added cron expression support for scheduling type #3777

AlbertYang0801 · 2025-09-19T06:06:03Z

What's changed?

Monitoring Center - Added cron expression support for scheduling type in add/edit monitor forms, with full backward compatibility.

For details:

1. Added a scheduler type selector on the task configuration page with two options: "Second Interval" (default) and "Cron Expression". When "Cron Expression" is selected, the input field dynamically switches to a Cron expression input with syntax guidance.
2. Implemented real-time frontend validation for Cron expressions to ensure correctness.
3. The monitoring task cycle display now supports Cron expressions.
4. For tasks using Cron expressions, the system now uses Quartz to parse expressions and accurately calculate the next trigger time.
5. Enhanced internationalization support for updated UI text to ensure proper display in multilingual environments.

scheduling type

Second Interval
Cron Expression

Checklist

I have read the [Contributing Guide](https://hertzbeat.apache.org/docs/community/code_style_and_quality_guide)
I have written the necessary doc or comment.
I have added the necessary unit tests and all cases have passed.

Add or update API

[] I have added the necessary [e2e tests](https://github.com/apache/hertzbeat/tree/master/e2e) and all cases have passed.

I have configured 35 * * * * ? . According to the monitoring history chart, metrics are collected after the 35th second.

…with i18n

Cyanty · 2025-09-19T09:59:43Z

...eat-collector-common/src/main/java/org/apache/hertzbeat/collector/timer/TimerDispatcher.java

+    public Long getNextExecutionInterval(Job job) {
+        if (ScheduleTypeEnum.CRON.getType().equals(job.getScheduleType()) && job.getCronExpression() != null && !job.getCronExpression().isEmpty()) {
+            try {
+                CronExpression cronExpression = new CronExpression(job.getCronExpression());


FYI, using CronExpression from spring-context is probably preferable here. Quartz has slightly different cron semantics and would pull in an unnecessary extra dependency.

Thanks! Already done. Removed Quartz and replaced it with Spring's built-in CronExpression parser. Keeps the same cron format but cleans up the dependencies.

…arsing(apache#3517)

Copilot

Pull Request Overview

This PR adds cron expression support for scheduling types in the Monitoring Center, providing an alternative to the existing second interval scheduling while maintaining backward compatibility.

Added a new scheduling type selector with options for "Second Interval" (default) and "Cron Expression"
Implemented cron expression parsing using Quartz for accurate next trigger time calculation
Enhanced the UI to dynamically switch between interval and cron expression inputs with validation

Reviewed Changes

Copilot reviewed 17 out of 17 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
web-app/src/assets/i18n/*.json	Added internationalization keys for schedule type and cron expression UI elements
web-app/src/app/routes/monitor/monitor-form/monitor-form.component.*	Added schedule type selector and cron expression input with validation
web-app/src/app/routes/monitor/monitor-data-table/monitor-data-table.component.html	Updated display to show cron expression or interval based on schedule type
web-app/src/app/pojo/Monitor.ts	Added scheduleType and cronExpression properties to Monitor model
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java	Added scheduleType and cronExpression fields to Monitor entity
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/entity/job/Job.java	Added scheduleType and cronExpression properties to Job entity
hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/constants/ScheduleTypeEnum.java	Added enum for schedule types (INTERVAL, CRON)
hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/timer/TimerDispatcher.java	Implemented cron expression parsing and next execution time calculation
hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/timer/TimerDispatch.java	Added new cyclicJob method without parameters
hertzbeat-collector/hertzbeat-collector-collector/src/main/java/org/apache/hertzbeat/collector/dispatch/CommonDispatcher.java	Updated to use new cyclicJob method for better scheduling
hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java	Updated to pass scheduleType and cronExpression to job definition
hertzbeat-collector/hertzbeat-collector-common/src/test/java/org/apache/hertzbeat/collector/timer/TimerDispatcherTest.java	Added comprehensive test coverage for timer dispatcher functionality

Comments suppressed due to low confidence (1)

hertzbeat-collector/hertzbeat-collector-common/src/main/java/org/apache/hertzbeat/collector/timer/TimerDispatcher.java:1

This complex regex for cron validation is difficult to maintain and understand. Consider using a more readable approach with separate validation functions or leveraging the Spring CronExpression.parse() method for validation instead of regex.

/*

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

Copilot · 2025-09-25T15:00:53Z

...ollector-common/src/main/java/org/apache/hertzbeat/collector/constants/ScheduleTypeEnum.java

@@ -0,0 +1,22 @@
+package org.apache.hertzbeat.collector.constants;


Missing file header with Apache license. All Java files in this project should include the standard Apache License header.

Copilot · 2025-09-25T15:00:54Z

web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html

+          >{{ 'monitor.scheduleType' | i18n }}
+        </nz-form-label>
+        <nz-form-control nzSpan="8" [nzErrorTip]="'validation.required' | i18n">
+          <nz-select [(ngModel)]="monitor.scheduleType" name="scheduleType" nzPlaceHolder="选择调度类型">


The placeholder text '选择调度类型' is hardcoded in Chinese. It should use internationalization like {{ 'monitor.scheduleType.tip' | i18n }} to support multiple languages.

Suggested change

<nz-select [(ngModel)]="monitor.scheduleType" name="scheduleType" nzPlaceHolder="选择调度类型">

<nz-select [(ngModel)]="monitor.scheduleType" name="scheduleType" [nzPlaceHolder]="'monitor.scheduleType.tip' | i18n">

Copilot · 2025-09-25T15:00:54Z

...eat-collector-common/src/main/java/org/apache/hertzbeat/collector/timer/TimerDispatcher.java

        this.started = new AtomicBoolean(true);
    }

+


Extra blank line should be removed to maintain consistent code formatting.

Suggested change

Copilot · 2025-09-25T15:00:54Z

...eat-collector-common/src/main/java/org/apache/hertzbeat/collector/timer/TimerDispatcher.java

+        }
+    }
+
+


Extra blank line should be removed to maintain consistent code formatting.

Suggested change

AlbertYang0801 added 4 commits September 17, 2025 16:53

[feat]Support cron expression for task scheduling(apache#3517)

0e0e540

[test] add unit tests for cron expression scheduling (apache#3517)

c348cbf

[cleanup] clean up code formatting and comments for scheduler

9313b23

[feat]Support cron expression for Monitor Period in Monitoring Basic …

aead663

…with i18n

github-actions bot added the webapp label Sep 19, 2025

AlbertYang0801 and others added 3 commits September 19, 2025 14:06

Merge branch 'master' into feat#3517

690612f

Merge branch 'master' into feat#3517

ea507fa

Merge remote-tracking branch 'origin/feat#3517' into feat#3517

265810c

AlbertYang0801 changed the title ~~Feat#3517~~ Feat#3517 Monitoring Center - Added cron expression support for scheduling type Sep 19, 2025

AlbertYang0801 changed the title ~~Feat#3517 Monitoring Center - Added cron expression support for scheduling type~~ [feat] Monitoring Center - Added cron expression support for scheduling type Sep 19, 2025

Cyanty reviewed Sep 19, 2025

View reviewed changes

Calvin979 and others added 4 commits September 19, 2025 23:54

Merge branch 'master' into feat#3517

0ace2ca

feat(scheduler): replace Quartz with Spring CronExpression for cron p…

c0d7035

…arsing(apache#3517)

Merge remote-tracking branch 'origin/feat#3517' into feat#3517

7e92f33

Merge branch 'master' into feat#3517

78cd834

zqr10159 requested a review from Copilot September 25, 2025 14:59

Copilot AI reviewed Sep 25, 2025

View reviewed changes

AlbertYang0801 added 3 commits September 26, 2025 10:00

[improve] Use i18n for monitor schedule type placeholder

bf6b8f9

Merge remote-tracking branch 'origin/feat#3517' into feat#3517

4a1a206

Merge branch 'refs/heads/master' into feat#3517

44d9f98

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[feat] Monitoring Center - Added cron expression support for scheduling type #3777

[feat] Monitoring Center - Added cron expression support for scheduling type #3777

Uh oh!

AlbertYang0801 commented Sep 19, 2025

Uh oh!

Cyanty Sep 19, 2025

Uh oh!

AlbertYang0801 Sep 19, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Sep 25, 2025

Uh oh!

Copilot AI Sep 25, 2025

Uh oh!

Copilot AI Sep 25, 2025

Uh oh!

Copilot AI Sep 25, 2025

Uh oh!

Uh oh!

		@@ -0,0 +1,22 @@
		package org.apache.hertzbeat.collector.constants;

	<nz-select [(ngModel)]="monitor.scheduleType" name="scheduleType" nzPlaceHolder="选择调度类型">
	<nz-select [(ngModel)]="monitor.scheduleType" name="scheduleType" [nzPlaceHolder]="'monitor.scheduleType.tip' \| i18n">

[feat] Monitoring Center - Added cron expression support for scheduling type #3777

Are you sure you want to change the base?

[feat] Monitoring Center - Added cron expression support for scheduling type #3777

Uh oh!

Conversation

AlbertYang0801 commented Sep 19, 2025

What's changed?

Checklist

Add or update API

Uh oh!

Cyanty Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

AlbertYang0801 Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Sep 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!