[feature]Support grafana charts for Prometheus #1658
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tomsun28
added
enhancement
wang1027-wqh
previously approved these changes
Mar 22, 2024
Signed-off-by: Logic <zqr10159@dromara.org>
…afana # Conflicts: # web-app/src/app/routes/monitor/monitor.module.ts
|
@tomsun28 I resolved conflicts and test errors ，please help review them. |
wang1027-wqh
previously approved these changes
Apr 14, 2024
grafana/src/main/java/org/dromara/hertzbeat/grafana/config/GrafanaInit.java
Outdated
Show resolved
Hide resolved
grafana/src/main/java/org/dromara/hertzbeat/grafana/config/GrafanaInit.java
Outdated
Show resolved
Hide resolved
…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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
license-eye has checked 2404 files.
| Valid | Invalid | Ignored | Fixed |
|---|---|---|---|
| 1124 | 4 | 1276 | 0 |
Click to see the invalid file list
- grafana/src/main/java/org/apache/hertzbeat/grafana/controller/DashboardController.java
- grafana/src/main/java/org/apache/hertzbeat/grafana/controller/ServiceAccountController.java
- grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java
- grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
Use this command to fix any missing license headers
```bash
docker run -it --rm -v $(pwd):/github/workspace apache/skywalking-eyes header fix
</details>
grafana/src/main/java/org/apache/hertzbeat/grafana/controller/DashboardController.java
Show resolved
Hide resolved
grafana/src/main/java/org/apache/hertzbeat/grafana/controller/ServiceAccountController.java
Show resolved
Hide resolved
grafana/src/main/java/org/apache/hertzbeat/grafana/service/DashboardService.java
Show resolved
Hide resolved
grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
Show resolved
Hide resolved
Implement the ability to upload Grafana dashboard JSON files through the monitor form, enhancing the integration between Hertzbeat and Grafana. This feature allows users to easily configure and visualize monitoring data within Grafana. Additionally, refactor the datasource and service account management to use a moreefficient header creation method. This change simplifies the process of authenticating requests to the Grafana API. BREAKING CHANGE: The datasource and service account creation endpoints now expect Base64 encoded credentials in the Authorization header. Adjustments may be required for external systems relying on the previous implementation. ```
…lityThe code imports have been organized, and constants have been grouped together to improvethe readability in several classes within the grafana module. Excessive whitespace has also been removed to ensure a cleaner and more standardized code appearance. ```
Update the license headers for the Grafana module files to reflect the Apache License 2.0. Ensure that all contributor license agreements are in place and verify the copyright ownership before proceeding with the update. BREAKING CHANGE: All dashboard controllers and services now adhere to the updated licensing agreement. Review the NOTICE file for detailed information regarding copyright ownership and permissions.```
Due to the integration of the new backend, the forest HTTP client is no longer required and has been removed from the Grafana module dependencies. This simplifies the projectstructure and eliminates the need for managing an additional HTTP client library. ```
Remove the handling of HTTP prefixes from grafana URLs across the application, as the GrafanaConfiguration class now handles it. This change avoids redundancy and potential mistakes in removing the prefix at multiple points in the application.
LiuTianyou
reviewed
Sep 1, 2024
grafana/src/main/java/org/apache/hertzbeat/grafana/service/DatasourceService.java
Outdated
Show resolved
Hide resolved
LiuTianyou
reviewed
Sep 1, 2024
web-app/src/app/routes/monitor/monitor-form/monitor-form.component.html
Outdated
Show resolved
Hide resolved
…d list display Change the return type of the createDatasource and deleteDatasource methods in the DatasourceService to void, removing the ResponseEntity. This simplifies the method signatures and aligns them with the updated requirements. Also, modify the monitor-form component to show the upload list for improved user feedback in file selection steps of the monitor form process.
…line dashboard deletion - Incorporate a unique instance identifier into the Grafana dashboard URL to support individualized access. This enhancement involves modifying the URL construction to include the `INSTANCE` parameter followed by the `monitorId`. - Streamline the dashboard deletion process by moving the call to `dashboardDao.deleteByMonitorId` outside of the try-catch block, ensuring that dashboard deletion from the database is always attempted regardless of the API call's outcome. This change simplifies dashboard lifecycle management and helps maintain data consistency. Additionally, correct the comments in `GrafanaInit` to reflect the logical step order in the initialization sequence, improving code readability. ```
Refactor the dashboard deletion logic in the grafana module to simplify the code and remove unnecessary return statements. The method now ensures that only the relevant dashboard is deleted, even when multiple dashboards with the same UID exist.
…tion Adjust the Grafana dashboard URL formatting in DashboardService to properly handle the concatenation and spacing. Also, correct the definition of the INSTANCE constant in CommonConstants to ensure consistency and avoid potential errors in token formatting. The changes ensure the URL construction follows the intended structure and the INSTANCE constant adheres to the project's coding standards. ```
…sChange property access pattern from GrafanaConfiguration to GrafanaProperties for consistency with other modules and to align with project property management standards. This update affects several services and controllers that previously used the older configuration pattern. BREAKING CHANGE: Replaced GrafanaConfiguration with GrafanaProperties. This may affect other parts of the system depending on the previous configuration class, so ensure to check all occurrences and make necessary adjustments.
LiuTianyou
approved these changes
Sep 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's changed?
Checklist
Add or update API