This is an automated email from the ASF dual-hosted git repository.
jianingwang pushed a commit to branch pushgateway
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/pushgateway by this push:
new 5716e21f1f add a if condition for push auto
5716e21f1f is described below
commit 5716e21f1fb52a5209a8d97d0f26569cb9b163d2
Author: vinci <[email protected]>
AuthorDate: Fri Feb 28 16:33:22 2025 +0800
add a if condition for push auto
---
.../hertzbeat/common/constants/CommonConstants.java | 15 +++++++++++++++
.../manager/service/impl/MonitorServiceImpl.java | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git
a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
b/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
index f4bdb3cbe6..2f0bc35bca 100644
---
a/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
+++
b/hertzbeat-common/src/main/java/org/apache/hertzbeat/common/constants/CommonConstants.java
@@ -450,4 +450,19 @@ public interface CommonConstants {
* status page incident state resolved
*/
byte STATUS_PAGE_INCIDENT_STATE_RESOLVED = 3;
+
+ /**
+ * status page incident state resolved
+ */
+ byte MONITOR_TYPE_NORMAL = 0;
+
+ /**
+ * status page incident state resolved
+ */
+ byte MONITOR_TYPE_PUSH_AUTO_CREATE = 1;
+
+ /**
+ * status page incident state resolved
+ */
+ byte MONITOR_TYPE_DISCOVERY_AUTO_CREATE = 2;
}
diff --git
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
index b4729e9000..48650593e4 100644
---
a/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
+++
b/hertzbeat-manager/src/main/java/org/apache/hertzbeat/manager/service/impl/MonitorServiceImpl.java
@@ -521,7 +521,7 @@ public class MonitorServiceImpl implements MonitorService {
MonitorDto monitorDto = new MonitorDto();
List<Param> params = paramDao.findParamsByMonitorId(id);
monitorDto.setParams(params);
- if
(DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(monitor.getApp())) {
+ if
(DispatchConstants.PROTOCOL_PROMETHEUS.equalsIgnoreCase(monitor.getApp()) ||
monitor.getType() == CommonConstants.MONITOR_TYPE_PUSH_AUTO_CREATE) {
List<CollectRep.MetricsData> metricsDataList =
warehouseService.queryMonitorMetricsData(id);
List<String> metrics =
metricsDataList.stream().map(CollectRep.MetricsData::getMetrics).collect(Collectors.toList());
monitorDto.setMetrics(metrics);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
