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.

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

[improve] fix some alarm relate bug, update alarm center ui #2951

Merged
merged 25 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
[improve] update alarm center
Signed-off-by: tomsun28 <[email protected]>
  • Loading branch information
tomsun28 committed Jan 5, 2025
commit 97ea2337ede0f30e4e9da5adcebb3972006a0eac
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public interface MonitorDao extends JpaRepository<Monitor, Long>, JpaSpecificati
* @param status Monitor Status
* @return Monitor List
*/
List<Monitor> findMonitorsByStatusNotInAndAndJobIdNotNull(List<Byte> status);
List<Monitor> findMonitorsByStatusNotInAndJobIdNotNull(List<Byte> status);

/**
* Query monitoring by monitoring name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void run(String... args) throws Exception {
.build();
collectorScheduling.collectorGoOnline(CommonConstants.MAIN_COLLECTOR_NODE, collectorInfo);
// init jobs
List<Monitor> monitors = monitorDao.findMonitorsByStatusNotInAndAndJobIdNotNull(List.of(CommonConstants.MONITOR_PAUSED_CODE));
List<Monitor> monitors = monitorDao.findMonitorsByStatusNotInAndJobIdNotNull(List.of(CommonConstants.MONITOR_PAUSED_CODE));
List<CollectorMonitorBind> monitorBinds = collectorMonitorBindDao.findAll();
final Set<Long> sdMonitorIds = monitorBindDao.findAllByType(CommonConstants.MONITOR_BIND_TYPE_SD_SUB_MONITOR).stream()
.map(MonitorBind::getBizId)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ void findMonitorsByAppEquals() {
}

@Test
void findMonitorsByStatusNotInAndAndJobIdNotNull() {
void findMonitorsByStatusNotInAndJobIdNotNull() {
List<Byte> bytes = Arrays.asList((byte) 2, (byte) 3);
List<Monitor> monitors = monitorDao.findMonitorsByStatusNotInAndAndJobIdNotNull(bytes);
List<Monitor> monitors = monitorDao.findMonitorsByStatusNotInAndJobIdNotNull(bytes);
assertNotNull(monitors);
assertEquals(1, monitors.size());
}
Expand Down