diff --git a/hippo4j-monitor/hippo4j-monitor-base/pom.xml b/hippo4j-monitor/hippo4j-monitor-base/pom.xml index 9aec021a..31dcabff 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/pom.xml +++ b/hippo4j-monitor/hippo4j-monitor-base/pom.xml @@ -17,15 +17,6 @@ - - - src/main/resources - - **/*.txt - **/*.json - - - org.apache.maven.plugins diff --git a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/com/example/monitor/base/MonitorTypeEnum.java b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/com/example/monitor/base/MonitorTypeEnum.java index 8fbd4b5f..08237364 100644 --- a/hippo4j-monitor/hippo4j-monitor-base/src/main/java/com/example/monitor/base/MonitorTypeEnum.java +++ b/hippo4j-monitor/hippo4j-monitor-base/src/main/java/com/example/monitor/base/MonitorTypeEnum.java @@ -22,5 +22,23 @@ package com.example.monitor.base; */ public enum MonitorTypeEnum { - LOG, PROMETHEUS, SERVER, ES + /** + * LOG + */ + LOG, + + /** + * PROMETHEUS + */ + PROMETHEUS, + + /** + * SERVER + */ + SERVER, + + /** + * ES + */ + ES } diff --git a/hippo4j-monitor/hippo4j-monitor-es/pom.xml b/hippo4j-monitor/hippo4j-monitor-es/pom.xml index 7db9f963..c71f7f06 100644 --- a/hippo4j-monitor/hippo4j-monitor-es/pom.xml +++ b/hippo4j-monitor/hippo4j-monitor-es/pom.xml @@ -9,6 +9,10 @@ hippo4j-monitor-es + + 6.5.0 + + cn.hippo4j @@ -27,11 +31,13 @@ elasticsearch ${elasticsearch.version} + org.elasticsearch.client transport ${elasticsearch.version} + org.elasticsearch.client elasticsearch-rest-high-level-client @@ -40,15 +46,6 @@ - - - src/main/resources - - **/*.txt - **/*.json - - - org.apache.maven.plugins diff --git a/hippo4j-monitor/hippo4j-monitor-es/src/main/java/cn/hippo4j/monitor/es/EsMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-es/src/main/java/cn/hippo4j/monitor/es/EsMonitorHandler.java index 6a668fb7..160dfbcb 100644 --- a/hippo4j-monitor/hippo4j-monitor-es/src/main/java/cn/hippo4j/monitor/es/EsMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-es/src/main/java/cn/hippo4j/monitor/es/EsMonitorHandler.java @@ -25,6 +25,7 @@ import cn.hippo4j.monitor.es.model.EsThreadPoolRunStateInfo; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.io.FileUtil; import com.example.monitor.base.AbstractDynamicThreadPoolMonitor; +import com.example.monitor.base.MonitorTypeEnum; import lombok.extern.slf4j.Slf4j; import org.elasticsearch.action.admin.indices.alias.Alias; import org.elasticsearch.action.admin.indices.create.CreateIndexRequest; @@ -144,6 +145,6 @@ public class EsMonitorHandler extends AbstractDynamicThreadPoolMonitor { @Override public String getType() { - return "es"; + return MonitorTypeEnum.ES.name().toLowerCase(); } } diff --git a/hippo4j-monitor/hippo4j-monitor-log/pom.xml b/hippo4j-monitor/hippo4j-monitor-log/pom.xml index b2d454d7..e1b346d1 100644 --- a/hippo4j-monitor/hippo4j-monitor-log/pom.xml +++ b/hippo4j-monitor/hippo4j-monitor-log/pom.xml @@ -18,15 +18,6 @@ - - - src/main/resources - - **/*.txt - **/*.json - - - org.apache.maven.plugins diff --git a/hippo4j-monitor/hippo4j-monitor-log/src/main/java/cn/hippo4j/monitor/log/LogMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-log/src/main/java/cn/hippo4j/monitor/log/LogMonitorHandler.java index 36c6a010..c60cf947 100644 --- a/hippo4j-monitor/hippo4j-monitor-log/src/main/java/cn/hippo4j/monitor/log/LogMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-log/src/main/java/cn/hippo4j/monitor/log/LogMonitorHandler.java @@ -21,10 +21,11 @@ import cn.hippo4j.common.model.ThreadPoolRunStateInfo; import cn.hippo4j.common.toolkit.JSONUtil; import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler; import com.example.monitor.base.AbstractDynamicThreadPoolMonitor; +import com.example.monitor.base.MonitorTypeEnum; import lombok.extern.slf4j.Slf4j; /** - * Log monitor handler + * Log monitor handler. */ @Slf4j public class LogMonitorHandler extends AbstractDynamicThreadPoolMonitor { @@ -40,6 +41,6 @@ public class LogMonitorHandler extends AbstractDynamicThreadPoolMonitor { @Override public String getType() { - return "log"; + return MonitorTypeEnum.LOG.name().toLowerCase(); } } diff --git a/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml b/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml index 67acbaf0..7ec3738c 100644 --- a/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml +++ b/hippo4j-monitor/hippo4j-monitor-prometheus/pom.xml @@ -24,15 +24,6 @@ - - - src/main/resources - - **/*.txt - **/*.json - - - org.apache.maven.plugins diff --git a/hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java b/hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java index 95ccc803..22e6fc6a 100644 --- a/hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java +++ b/hippo4j-monitor/hippo4j-monitor-prometheus/src/main/java/cn/hippo4j/monitor/prometheus/PrometheusMonitorHandler.java @@ -22,6 +22,7 @@ import cn.hippo4j.common.model.ThreadPoolRunStateInfo; import cn.hippo4j.core.executor.state.ThreadPoolRunStateHandler; import cn.hutool.core.bean.BeanUtil; import com.example.monitor.base.AbstractDynamicThreadPoolMonitor; +import com.example.monitor.base.MonitorTypeEnum; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import io.micrometer.core.instrument.Metrics; @@ -84,6 +85,6 @@ public class PrometheusMonitorHandler extends AbstractDynamicThreadPoolMonitor { @Override public String getType() { - return "prometheus"; + return MonitorTypeEnum.PROMETHEUS.name().toLowerCase(); } } diff --git a/hippo4j-monitor/pom.xml b/hippo4j-monitor/pom.xml index 9af67ac1..bfbf1079 100644 --- a/hippo4j-monitor/pom.xml +++ b/hippo4j-monitor/pom.xml @@ -12,21 +12,12 @@ hippo4j-monitor-base + hippo4j-monitor-es hippo4j-monitor-log hippo4j-monitor-prometheus - hippo4j-monitor-es - - - src/main/resources - - **/*.txt - **/*.json - - - org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 78f46f68..daebcdce 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,6 @@ 2.2.6.RELEASE 2.2.9.RELEASE 2.2.5.RELEASE - 6.5.0 1.8