…afana

Signed-off-by: Logic <zqr10159@dromara.org>

…afana

# Conflicts:
#	web-app/src/app/routes/monitor/monitor.module.ts

…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

…fana

# Conflicts:
#	common/src/main/java/org/apache/hertzbeat/common/entity/manager/Monitor.java
#	common/src/main/java/org/apache/hertzbeat/common/util/JsonUtil.java
#	manager/pom.xml
#	manager/src/main/resources/sureness.yml
#	pom.xml
#	web-app/src/assets/i18n/en-US.json
#	web-app/src/assets/i18n/zh-CN.json
#	web-app/src/assets/i18n/zh-TW.json

…fana

# Conflicts:
#	manager/src/main/resources/application-test.yml
#	manager/src/main/resources/application.yml

…fana

…fana

Signed-off-by: Logic <zqr10159@dromara.org>

# Conflicts:
#	web-app/src/app/routes/monitor/monitor-detail/monitor-detail.component.ts
#	web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.html
#	web-app/src/app/routes/monitor/monitor-edit/monitor-edit.component.ts
#	web-app/src/app/routes/monitor/monitor-new/monitor-new.component.html
#	web-app/src/app/routes/monitor/monitor-new/monitor-new.component.ts

Signed-off-by: tomsun28 <tomsun28@outlook.com>

Signed-off-by: Logic <zqr10159@dromara.org>

…fana

# Conflicts:
#	manager/src/main/resources/application-test.yml
#	manager/src/main/resources/sureness.yml

Replace Forest client with Spring's RestTemplate to manage Grafana dashboards and data sources.
Refactor API endpoints usage to enhance the integration and simplify the codebase for future
maintainability. Update service and controller layers to handle Grafana service accounts, tokens,
dashboards, and data sources using the Spring ecosystem.

BREAKING CHANGE: Replace all Forest client usages with RestTemplate which might affect custom
error handling and request/response interception mechanisms. Ensure to test the new integrationthoroughly, especially for edge cases and error scenarios.

Client code examples for creating dashboards and data sources have been updated. Review and
update any existing integration scripts or client libraries accordingly.

Related to issue
```

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.

…afana

…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.

…afana

…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.