Fix quarkusio#40933: LGTM Quarkus Dashboard

mskacelik · Oct 2, 2024 · 60b2939 · 60b2939
1 parent 8bb909f
commit 60b2939
Show file tree

Hide file tree

Showing 5 changed files with 4,665 additions and 2 deletions.
diff --git a/...-devservices/common/src/main/java/io/quarkus/observability/common/ContainerConstants.java b/...-devservices/common/src/main/java/io/quarkus/observability/common/ContainerConstants.java
@@ -4,7 +4,7 @@ public final class ContainerConstants {
 
     // Images
 
-    public static final String LGTM = "docker.io/grafana/otel-lgtm:0.4.0";
+    public static final String LGTM = "docker.io/grafana/otel-lgtm:0.6.0";
 
     // Ports
 

diff --git a/...s/testcontainers/src/main/java/io/quarkus/observability/testcontainers/LgtmContainer.java b/...s/testcontainers/src/main/java/io/quarkus/observability/testcontainers/LgtmContainer.java
@@ -3,7 +3,10 @@
 import java.util.Optional;
 import java.util.Set;
 
+import org.eclipse.microprofile.config.Config;
+import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
+import org.testcontainers.utility.MountableFile;
 
 import io.quarkus.observability.common.ContainerConstants;
 import io.quarkus.observability.common.config.AbstractGrafanaConfig;
@@ -17,6 +20,21 @@ public class LgtmContainer extends GrafanaContainer<LgtmContainer, LgtmConfig> {
 
     protected static final String LGTM_NETWORK_ALIAS = "ltgm.testcontainer.docker";
 
+    protected static final String PROMETHEUS_CONFIG = """
+                global:
+                  scrape_interval: 10s
+                  evaluation_interval: 10s
+                storage:
+                  tsdb:
+                    out_of_order_time_window: 10m
+                scrape_configs:
+                  - job_name: '%s'
+                    metrics_path: '%s%s'
+                    scrape_interval: 10s
+                    static_configs:
+                      - targets: ['%s:%d']
+            """;
+
     public LgtmContainer() {
         this(new LgtmConfigImpl());
     }
@@ -25,12 +43,29 @@ public LgtmContainer(LgtmConfig config) {
         super(config);
         addExposedPorts(config.otlpPort());
         withLogConsumer(new LgtmContainerLogConsumer(log).withPrefix("LGTM"));
+        withCopyFileToContainer(
+                MountableFile.forClasspathResource("/grafana-dashboard-quarkus-metrics.json"),
+                "/otel-lgtm/grafana-dashboard-jvm-metrics.json");
+        withCopyFileToContainer(
+                MountableFile.forClasspathResource("/grafana-dashboards.yaml"),
+                "/otel-lgtm/grafana-dashboards.yaml");
+        addFileToContainer(getPrometheusConfig().getBytes(), "/otel-lgtm/prometheus.yaml");
+
     }
 
     public int getOtlpPort() {
         return getMappedPort(config.otlpPort());
     }
 
+    private String getPrometheusConfig() {
+        Config runtimeConfig = ConfigProvider.getConfig();
+        String rootPath = runtimeConfig.getOptionalValue("quarkus.management.root-path", String.class).orElse("/q");
+        String metricsPath = runtimeConfig.getOptionalValue("quarkus.management.metrics.path", String.class).orElse("/metrics");
+        int httpPort = runtimeConfig.getOptionalValue("quarkus.http.port", Integer.class).orElse(0);
+
+        return String.format(PROMETHEUS_CONFIG, config.serviceName(), rootPath, metricsPath, "host.docker.internal", httpPort);
+    }
+
     protected static class LgtmConfigImpl extends AbstractGrafanaConfig implements LgtmConfig {
         public LgtmConfigImpl() {
             this(ContainerConstants.LGTM);

diff --git a/...tainers/src/main/java/io/quarkus/observability/testcontainers/ObservabilityContainer.java b/...tainers/src/main/java/io/quarkus/observability/testcontainers/ObservabilityContainer.java
@@ -50,7 +50,7 @@ protected byte[] getResourceAsBytes(String resource) {
     @SuppressWarnings("OctalInteger")
     protected void addFileToContainer(byte[] content, String pathInContainer) {
         logger().info("Content [{}]: \n{}", pathInContainer, new String(content, StandardCharsets.UTF_8));
-        copyFileToContainer(Transferable.of(content, 0777), pathInContainer);
+        withCopyToContainer(Transferable.of(content, 0777), pathInContainer);
     }
 
     @Override