This is an automated email from the ASF dual-hosted git repository. rzo1 pushed a commit to branch experimental/prometheus_cluster_details_wip in repository https://gitbox.apache.org/repos/asf/storm.git
commit 4f6545a50e032a503ee0e8f09d876acc7a2fee69 Author: Richard Zowalla <[email protected]> AuthorDate: Fri Jun 7 16:44:42 2024 +0200 WIP --- external/storm-metrics-prometheus/pom.xml | 5 ----- .../metrics/prometheus/PrometheusPreparableReporterTest.java | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/external/storm-metrics-prometheus/pom.xml b/external/storm-metrics-prometheus/pom.xml index c78c2ca80..7db062c21 100644 --- a/external/storm-metrics-prometheus/pom.xml +++ b/external/storm-metrics-prometheus/pom.xml @@ -99,11 +99,6 @@ </dependencies> <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <!--Note - the version would be inherited--> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> diff --git a/external/storm-metrics-prometheus/src/test/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporterTest.java b/external/storm-metrics-prometheus/src/test/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporterTest.java index 7bc76fbee..85e31fde3 100644 --- a/external/storm-metrics-prometheus/src/test/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporterTest.java +++ b/external/storm-metrics-prometheus/src/test/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporterTest.java @@ -131,7 +131,7 @@ public class PrometheusPreparableReporterTest { "# HELP nimbus_total_cpu total CPU on the cluster (% of a core)", "# TYPE nimbus_total_cpu gauge", "nimbus_total_cpu{instance=\"\",job=\"test_simple\"} 500" - ), daemonConf.get("scheme") + "://" + daemonConf.get("endpoint") + "/metrics", daemonConf); + ), daemonConf.get("storm.daemon.metrics.reporter.plugin.prometheus.scheme") + "://" + daemonConf.get("storm.daemon.metrics.reporter.plugin.prometheus.endpoint") + "/metrics", daemonConf); //update a metric supervisor.set(100); @@ -150,7 +150,7 @@ public class PrometheusPreparableReporterTest { "# HELP nimbus_total_cpu total CPU on the cluster (% of a core)", "# TYPE nimbus_total_cpu gauge", "nimbus_total_cpu{instance=\"\",job=\"test_simple\"} 500" - ), daemonConf.get("scheme") + "://" + daemonConf.get("endpoint") + "/metrics", daemonConf); + ), daemonConf.get("storm.daemon.metrics.reporter.plugin.prometheus.scheme") + "://" + daemonConf.get("storm.daemon.metrics.reporter.plugin.prometheus.endpoint") + "/metrics", daemonConf); } private void assertMetrics(List<String> elements, String endpoint, Map<String, Object> conf) throws IOException { @@ -165,9 +165,9 @@ public class PrometheusPreparableReporterTest { final HttpURLConnection con = (HttpURLConnection) obj.openConnection(); con.setRequestMethod("GET"); - if (conf.containsKey("basic_auth_user")) { + if (conf.containsKey("storm.daemon.metrics.reporter.plugin.prometheus.basic_auth_user")) { - String auth = conf.get("basic_auth_user") + ":" + conf.get("basic_auth_password"); + String auth = conf.get("storm.daemon.metrics.reporter.plugin.prometheus.basic_auth_user") + ":" + conf.get("storm.daemon.metrics.reporter.plugin.prometheus.basic_auth_password"); String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes()); String authHeaderValue = "Basic " + encodedAuth; con.setRequestProperty("Authorization", authHeaderValue);
