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

[ospp] add push style collector #1222

Merged
merged 15 commits into from
Oct 3, 2023
Merged

[ospp] add push style collector #1222

merged 15 commits into from
Oct 3, 2023

Conversation

leo-934
Copy link
Contributor

@leo-934 leo-934 commented Sep 3, 2023 •
edited
Loading

What's changed?

add push style collector.

Checklist

  • I have read the Contributing Guide
  • I have written the necessary doc or comment.
  • I have added the necessary unit tests and all cases have passed.

@leo-934 leo-934 changed the title Merged add push style collector Sep 3, 2023
@Ceilzcx Ceilzcx self-requested a review September 3, 2023 11:33
@tomsun28 tomsun28 changed the title add push style collector [ospp] add push style collector Sep 3, 2023
@Ceilzcx Ceilzcx self-requested a review September 4, 2023 11:21
@Ceilzcx
Copy link
Contributor

Ceilzcx commented Sep 5, 2023 •
edited
Loading

image
还有字段类型可以使用数字型的input组件

@apache apache deleted a comment from hertzbeat Sep 5, 2023
@tomsun28 tomsun28 added enhancement New feature or request good first pull request Good for newcomers new feature labels Sep 6, 2023
@Ceilzcx Ceilzcx linked an issue Sep 7, 2023 that may be closed by this pull request
[Task] <add push style data collector> #727
Closed
4 tasks
@tomsun28
Copy link
Contributor

👍

@leo-934
fix
724e279
@leo-934
Merge branch 'hertzbeat' into rmt
aab10c4 
# Conflicts:
#	manager/pom.xml
#	manager/src/main/java/org/dromara/hertzbeat/manager/controller/AppController.java
#	manager/src/main/java/org/dromara/hertzbeat/manager/controller/MonitorController.java
#	pom.xml
@leo-934
fix
42b5ce2
@leo-934
fix
648ce3a
@leo-934
fix
51ba9d1
@leo-934
Merge branch 'merged' into hertzbeat
7d087e4 
# Conflicts:
#	manager/src/main/java/org/dromara/hertzbeat/manager/scheduler/SchedulerInit.java
@leo-934
fix
de74dd0
@leo-934
Copy link
Contributor Author

leo-934 commented Sep 23, 2023

已经按照上周tom哥说的要求大致修改了代码逻辑，数据库加了缓存，一些零碎的的todo也弄完了。
目前数据库还是用的jpa，没有接入warehouse，用不了时序数据库，这个如果最近不需要急着弄完的话，ospp之后可以我继续来做。

@hertzbeat
Copy link
Contributor

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

The code logic has been roughly modified according to the requirements mentioned by Tom last week, the database has been cached, and some fragmentary todos have been completed.
At present, the database still uses jpa, which is not connected to the warehouse and cannot use the time series database. If there is no need to rush to complete this recently, I can continue to do it after ospp.

@leo-934
Copy link
Contributor Author

leo-934 commented Sep 23, 2023

上周讨论的时候郑哥和tom哥说过的，由于collectRep的time字段设计和abstractCollect接口设计，导致目前是没办法同时收集多条记录，所以才用了折中方案。这个如果之后考虑修改的话，也可以我继续把它做完，毕竟这部分代码我还是挺熟悉的。

@hertzbeat
Copy link
Contributor

Bot detected the issue body's language is not English, translate it automatically. 👯👭🏻🧑‍🤝‍🧑👫🧑🏿‍🤝‍🧑🏻👩🏾‍🤝‍👨🏿👬🏿

Brother Zheng and Brother Tom said during the discussion last week that due to the time field design and abstractCollect interface design of collectRep, it is currently impossible to collect multiple records at the same time, so a compromise solution was used. If I consider modifying this later, I can continue to finish it. After all, I am quite familiar with this part of the code.

@leo-934
Copy link
Contributor Author

leo-934 commented Sep 25, 2023

done

@tomsun28 tomsun28 added this to the v1.4.2 milestone Sep 26, 2023
tomsun28
tomsun28 approved these changes Oct 2, 2023
View reviewed changes
Copy link
Contributor

@tomsun28 tomsun28 left a comment

Choose a reason for hiding this comment

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

LGTM👍👍

@tomsun28 tomsun28 merged commit 5d0ef01 into apache:master Oct 3, 2023
2 checks passed
tomsun28 pushed a commit that referenced this pull request Jan 16, 2024
@leo-934 @tomsun28
[ospp] add push style collector (#1222)
624e5d5
tomsun28 pushed a commit that referenced this pull request Mar 9, 2024
@leo-934
[ospp] add push style collector (#1222)
cfc7544
tomsun28 pushed a commit that referenced this pull request Mar 9, 2024
@leo-934
[ospp] add push style collector (#1222)
11bd7e8
tomsun28 pushed a commit that referenced this pull request Mar 10, 2024
@leo-934
[ospp] add push style collector (#1222)
53e93ca
tomsun28 pushed a commit that referenced this pull request Mar 10, 2024
@leo-934 @tomsun28
[ospp] add push style collector (#1222)
8d74d8b
tomsun28 pushed a commit that referenced this pull request Mar 11, 2024
@leo-934
[ospp] add push style collector (#1222)
d4ebf3f
tomsun28 pushed a commit that referenced this pull request Mar 11, 2024
@leo-934
[ospp] add push style collector (#1222)
865cb86
tomsun28 pushed a commit that referenced this pull request Mar 11, 2024
@leo-934
[ospp] add push style collector (#1222)
65d4317
tomsun28 pushed a commit that referenced this pull request Mar 11, 2024
@leo-934
[ospp] add push style collector (#1222)
07a5018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ceilzcx Ceilzcx Ceilzcx approved these changes

@tomsun28 tomsun28 tomsun28 approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request good first pull request Good for newcomers new feature
Projects
None yet
Milestone
v1.4.2
Development

Successfully merging this pull request may close these issues.

[Task] <add push style data collector>
4 participants
@leo-934 @Ceilzcx @tomsun28 @hertzbeat