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

feature: support for batch creating task through http_sd #2018

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

feature: support for batch creating task through http_sd #2018

wants to merge 13 commits into from

Conversation

Calvin979
Copy link
Contributor

@Calvin979 Calvin979 commented May 20, 2024 •
edited

What's changed?

Steps to batch create task through http_sd

  1. Add http_sd params in template yml
  - field: http_sd
    name:
      zh-CN: http_sd
      en-US: http_sd
    type: text
    placeholder: Enter http_sd url
    required: false
    hide: true
  1. Enter http_sd url when trying to create task(optional)

001addmonitor
002httpsd
003monitorlist

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.

Add or update API

  • I have added the necessary e2e tests and all cases have passed.

@tomsun28
Copy link
Contributor

👍 relate pr #1791

@tomsun28 tomsun28 added the good first pull request Good for newcomers label May 20, 2024
@tomsun28 tomsun28 self-requested a review May 20, 2024 15:02
@Calvin979
Copy link
Contributor Author

Relate issue #1625

@tomsun28 tomsun28 added enhancement New feature or request new feature labels May 21, 2024
@tomsun28 tomsun28 added this to the 1.6.1 milestone May 21, 2024
@tomsun28
Copy link
Contributor

hi thanks for contribution. there are some conflict files need be resolved if you are time.

@Calvin979
Merge remote-tracking branch 'origin/master' into feature/http_sd
97b2047 
# Conflicts:
#	collector/src/main/java/org/apache/hertzbeat/collector/dispatch/DispatchConstants.java
#	collector/src/main/resources/META-INF/services/org.apache.hertzbeat.collector.collect.AbstractCollect
#	common/src/main/java/org/apache/hertzbeat/common/entity/job/Metrics.java
#	common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
#	manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
@Calvin979
fixed: resolve conflict
dcdb0fe
@Calvin979
fixed: resolve conflict
a97761e
@Calvin979
Merge remote-tracking branch 'origin/master' into feature/http_sd
b925cf4
@Calvin979
Copy link
Contributor Author

hi thanks for contribution. there are some conflict files need be resolved if you are time.

@tomsun28
I've resolved conflict, please wait me to check the code and feature if is all set before merging.

@Calvin979
Merge remote-tracking branch 'origin/master' into feature/http_sd
e9d715e 
# Conflicts:
#	manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
@Calvin979
Copy link
Contributor Author

@tomsun28
This branch can be merged now!

@tomsun28
Copy link
Contributor

@tomsun28 This branch can be merged now!

thanks, we want to merge this after publish v1.6.0

@Calvin979
Copy link
Contributor Author

@tomsun28 This branch can be merged now!

thanks, we want to merge this after publish v1.6.0

Got it.

@tomsun28 tomsun28 linked an issue Jun 12, 2024 that may be closed by this pull request
[Task] <Support discovery monitoring instance through http_sd> #1625
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomsun28 tomsun28 Awaiting requested review from tomsun28

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
backend collector enhancement New feature or request good first pull request Good for newcomers new feature
Projects
Apache HertzBeat (Incubating)
Status: To do
Milestone
1.6.1
Development

Successfully merging this pull request may close these issues.

[Task] <Support discovery monitoring instance through http_sd>
2 participants
@Calvin979 @tomsun28