From f896702587050fe34eba88686904b7cff5d8342c Mon Sep 17 00:00:00 2001 From: StrongestNumber9 <16169054+StrongestNumber9@users.noreply.github.com> Date: Wed, 2 Aug 2023 13:50:54 +0300 Subject: [PATCH 1/3] Adds k8s_01 prefix to collected app-specific metrics --- .../java/com/teragrep/k8s_01/PrometheusMetrics.java | 11 ++++++----- src/main/java/com/teragrep/k8s_01/RelpOutput.java | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java b/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java index 3ca5ac7..dd8dce6 100644 --- a/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java +++ b/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java @@ -50,14 +50,15 @@ public PrometheusMetrics(int port) { ServletHolder servletHolder = new ServletHolder(metricsServlet); context.addServlet(servletHolder, "/metrics"); + // TODO: Prefix to be configurable? // Totals - metricRegistry.register(name("total", "reconnects"), new Counter()); - metricRegistry.register(name("total", "connections"), new Counter()); + metricRegistry.register(name("k8s_01", "total", "reconnects"), new Counter()); + metricRegistry.register(name("k8s_01", "total", "connections"), new Counter()); // Throughput meters - metricRegistry.register(name("throughput", "bytes"), new Meter(new SlidingTimeWindowMovingAverages())); - metricRegistry.register(name("throughput", "records"), new Meter(new SlidingTimeWindowMovingAverages())); - metricRegistry.register(name("throughput", "errors"), new Meter(new SlidingTimeWindowMovingAverages())); + metricRegistry.register(name("k8s_01", "throughput", "bytes"), new Meter(new SlidingTimeWindowMovingAverages())); + metricRegistry.register(name("k8s_01", "throughput", "records"), new Meter(new SlidingTimeWindowMovingAverages())); + metricRegistry.register(name("k8s_01", "throughput", "errors"), new Meter(new SlidingTimeWindowMovingAverages())); // Misc metricRegistry.register(name("jvm", "vm"), new JvmAttributeGaugeSet()); diff --git a/src/main/java/com/teragrep/k8s_01/RelpOutput.java b/src/main/java/com/teragrep/k8s_01/RelpOutput.java index 943768f..e40f9b6 100644 --- a/src/main/java/com/teragrep/k8s_01/RelpOutput.java +++ b/src/main/java/com/teragrep/k8s_01/RelpOutput.java @@ -63,13 +63,13 @@ public class RelpOutput { relpConnection.setReadTimeout(relpConfig.getReadTimeout()); relpConnection.setWriteTimeout(relpConfig.getWriteTimeout()); // Throughput - throughputBytes = metricRegistry.meter(name("throughput", "bytes")); - throughputRecords = metricRegistry.meter(name("throughput", "records")); - throughputErrors = metricRegistry.meter(name("throughput", "errors")); + throughputBytes = metricRegistry.meter(name("k8s_01", "throughput", "bytes")); + throughputRecords = metricRegistry.meter(name("k8s_01", "throughput", "records")); + throughputErrors = metricRegistry.meter(name("k8s_01", "throughput", "errors")); // Totals - totalConnections = metricRegistry.counter(name("total", "connections")); - totalReconnects = metricRegistry.counter(name("total", "reconnects")); + totalConnections = metricRegistry.counter(name("k8s_01", "total", "connections")); + totalReconnects = metricRegistry.counter(name("k8s_01", "total", "reconnects")); connect(); } From 161c9cc3a315d1239fc6dd7d63c7174d4b56d7a3 Mon Sep 17 00:00:00 2001 From: StrongestNumber9 <16169054+StrongestNumber9@users.noreply.github.com> Date: Wed, 2 Aug 2023 14:05:51 +0300 Subject: [PATCH 2/3] Remove underscore from metrics prefix --- .../java/com/teragrep/k8s_01/PrometheusMetrics.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java b/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java index dd8dce6..24856d3 100644 --- a/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java +++ b/src/main/java/com/teragrep/k8s_01/PrometheusMetrics.java @@ -52,13 +52,13 @@ public PrometheusMetrics(int port) { // TODO: Prefix to be configurable? // Totals - metricRegistry.register(name("k8s_01", "total", "reconnects"), new Counter()); - metricRegistry.register(name("k8s_01", "total", "connections"), new Counter()); + metricRegistry.register(name("k8s01", "total", "reconnects"), new Counter()); + metricRegistry.register(name("k8s01", "total", "connections"), new Counter()); // Throughput meters - metricRegistry.register(name("k8s_01", "throughput", "bytes"), new Meter(new SlidingTimeWindowMovingAverages())); - metricRegistry.register(name("k8s_01", "throughput", "records"), new Meter(new SlidingTimeWindowMovingAverages())); - metricRegistry.register(name("k8s_01", "throughput", "errors"), new Meter(new SlidingTimeWindowMovingAverages())); + metricRegistry.register(name("k8s01", "throughput", "bytes"), new Meter(new SlidingTimeWindowMovingAverages())); + metricRegistry.register(name("k8s01", "throughput", "records"), new Meter(new SlidingTimeWindowMovingAverages())); + metricRegistry.register(name("k8s01", "throughput", "errors"), new Meter(new SlidingTimeWindowMovingAverages())); // Misc metricRegistry.register(name("jvm", "vm"), new JvmAttributeGaugeSet()); From d0fc70350feb6513dca43c8b92b2ca1f68e9c769 Mon Sep 17 00:00:00 2001 From: StrongestNumber9 <16169054+StrongestNumber9@users.noreply.github.com> Date: Wed, 2 Aug 2023 14:09:13 +0300 Subject: [PATCH 3/3] Remove underscore from metrics prefix#2 --- src/main/java/com/teragrep/k8s_01/RelpOutput.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/teragrep/k8s_01/RelpOutput.java b/src/main/java/com/teragrep/k8s_01/RelpOutput.java index e40f9b6..b09940b 100644 --- a/src/main/java/com/teragrep/k8s_01/RelpOutput.java +++ b/src/main/java/com/teragrep/k8s_01/RelpOutput.java @@ -63,13 +63,13 @@ public class RelpOutput { relpConnection.setReadTimeout(relpConfig.getReadTimeout()); relpConnection.setWriteTimeout(relpConfig.getWriteTimeout()); // Throughput - throughputBytes = metricRegistry.meter(name("k8s_01", "throughput", "bytes")); - throughputRecords = metricRegistry.meter(name("k8s_01", "throughput", "records")); - throughputErrors = metricRegistry.meter(name("k8s_01", "throughput", "errors")); + throughputBytes = metricRegistry.meter(name("k8s01", "throughput", "bytes")); + throughputRecords = metricRegistry.meter(name("k8s01", "throughput", "records")); + throughputErrors = metricRegistry.meter(name("k8s01", "throughput", "errors")); // Totals - totalConnections = metricRegistry.counter(name("k8s_01", "total", "connections")); - totalReconnects = metricRegistry.counter(name("k8s_01", "total", "reconnects")); + totalConnections = metricRegistry.counter(name("k8s01", "total", "connections")); + totalReconnects = metricRegistry.counter(name("k8s01", "total", "reconnects")); connect(); }