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

[feature]Support grafana charts for Prometheus #1658

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

Conversation

zqr10159
Copy link
Member

@zqr10159 zqr10159 commented Mar 16, 2024

What's changed?

image

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.

@zqr10159 zqr10159 requested a review from tomsun28 March 16, 2024 02:43
@tomsun28 tomsun28 added enhancement New feature or request good first pull request Good for newcomers task new feature labels Mar 16, 2024
wang1027-wqh
wang1027-wqh previously approved these changes Mar 22, 2024
@zqr10159
Copy link
Member Author

zqr10159 commented Apr 9, 2024

@tomsun28 I resolved conflicts and test errors ,please help review them.

…afana

# Conflicts:
#	common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
#	web-app/src/app/pojo/Monitor.ts
#	web-app/src/app/routes/monitor/monitor.module.ts
…eature#grafana

# Conflicts:
#	common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

license-eye has checked 2042 files.

Valid Invalid Ignored Fixed
871 5 1166 0
Click to see the invalid file list
  • common/src/main/java/org/apache/hertzbeat/common/entity/grafana/Dashboard.java
  • common/src/main/java/org/apache/hertzbeat/common/entity/grafana/Grafana.java
  • common/src/main/java/org/apache/hertzbeat/common/entity/grafana/ServiceAccount.java
  • common/src/main/java/org/apache/hertzbeat/common/entity/grafana/ServiceToken.java
  • web-app/src/app/pojo/Grafana.ts
Use this command to fix any missing license headers
```bash

docker run -it --rm -v $(pwd):/github/workspace apache/skywalking-eyes header fix

</details>

import java.io.IOException;
import java.nio.charset.StandardCharsets;

import static org.apache.hertzbeat.common.constants.CommonConstants.FAIL_CODE;
Copy link
Contributor

Choose a reason for hiding this comment

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

Please merge the master branch code and configure checkstyle according to this; maybe the code style detection will fail.

Copy link
Member Author

Choose a reason for hiding this comment

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

We've discussed not merging it for the time being, and will merge this pr as a new feature after an official stable release.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants