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
The following commit(s) were added to
refs/heads/experimental/prometheus_cluster_details_wip by this push:
new e1603eb28 STORM-4058 - Provide ClusterMetrics via a Prometheus
Preparable Reporter
e1603eb28 is described below
commit e1603eb2851db421966215e15cc199da26dbb117
Author: Richard Zowalla <[email protected]>
AuthorDate: Fri Jun 7 21:20:05 2024 +0200
STORM-4058 - Provide ClusterMetrics via a Prometheus Preparable Reporter
---
.../prometheus/PrometheusPreparableReporter.java | 6 +++---
.../metrics/prometheus/PrometheusReporterClient.java | 2 +-
.../prometheus/PrometheusPreparableReporterTest.java | 12 +++++++++++-
.../src/test/resources/pushgateway-basicauth.yaml | 17 +++++++++++++++++
.../src/test/resources/pushgateway-ssl.yaml | 17 +++++++++++++++++
5 files changed, 49 insertions(+), 5 deletions(-)
diff --git
a/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporter.java
b/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporter.java
index 861d51e74..278ebe629 100644
---
a/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporter.java
+++
b/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusPreparableReporter.java
@@ -1,10 +1,10 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
ASF licenses this file to you under the Apache License, Version
* 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
- * <p>
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
* Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions
* and limitations under the License.
diff --git
a/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusReporterClient.java
b/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusReporterClient.java
index a403f7ec5..aba510429 100644
---
a/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusReporterClient.java
+++
b/external/storm-metrics-prometheus/src/main/java/org/apache/storm/metrics/prometheus/PrometheusReporterClient.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
ASF licenses this file to you under the Apache License, Version
* 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
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 a49a808d7..ec516048f 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
@@ -10,7 +10,17 @@
* and limitations under the License.
*/
package org.apache.storm.metrics.prometheus;
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership. The
ASF licenses this file to you under the Apache License, Version
+ * 2.0 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions
+ * and limitations under the License.
+ */
import com.codahale.metrics.MetricRegistry;
import org.apache.storm.metrics2.SimpleGauge;
import org.junit.jupiter.api.AfterEach;
diff --git
a/external/storm-metrics-prometheus/src/test/resources/pushgateway-basicauth.yaml
b/external/storm-metrics-prometheus/src/test/resources/pushgateway-basicauth.yaml
index 8b4751eb7..f36b4c3bc 100644
---
a/external/storm-metrics-prometheus/src/test/resources/pushgateway-basicauth.yaml
+++
b/external/storm-metrics-prometheus/src/test/resources/pushgateway-basicauth.yaml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
basic_auth_users:
# Note: The bcrypt hash of the password was generated with the following
command line:
# python -c 'import bcrypt; print(bcrypt.hashpw(b"secret_password",
bcrypt.gensalt(rounds=10)).decode("ascii"))'
diff --git
a/external/storm-metrics-prometheus/src/test/resources/pushgateway-ssl.yaml
b/external/storm-metrics-prometheus/src/test/resources/pushgateway-ssl.yaml
index 3e4208bbb..8a275938c 100644
--- a/external/storm-metrics-prometheus/src/test/resources/pushgateway-ssl.yaml
+++ b/external/storm-metrics-prometheus/src/test/resources/pushgateway-ssl.yaml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
tls_server_config:
# cert and key have been generated with the following command:
# openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -sha256
-days 36500 -nodes -subj "/CN=localhost"
