You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/07/29 20:17:54 UTC
(camel) 12/15: CAMEL-22285: platform-http-main - Dev consoles should be registered as management endpoints
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch man
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 0d01f98eaa339ec4d8c5046c3707af731de120c6
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Jul 29 20:01:45 2025 +0200
CAMEL-22285: platform-http-main - Dev consoles should be registered as management endpoints
---
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../apache/camel/dsl/jbang/core/commands/ExportCamelMain.java | 4 ++--
.../camel/dsl/jbang/core/commands/process/ListPlatformHttp.java | 2 +-
.../dsl/jbang/core/commands/kubernetes/KubernetesExport.java | 9 +++++++++
.../dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java | 7 +++++++
5 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index a98b709447c..cb5a4bd40f0 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -572,11 +572,11 @@ public abstract class ExportBaseCommand extends CamelCommand {
}
// automatic add needed dependencies when main server enabled plugins
if ("true".equalsIgnoreCase(prop.getProperty("camel.management.jolokiaEnabled"))
- || "true".equalsIgnoreCase(prop.getProperty("camel.server.jolokiaEnabled"))) {
+ || "true".equalsIgnoreCase(prop.getProperty("camel.server.jolokiaEnabled"))) {
answer.add("camel:platform-http-jolokia");
}
if ("true".equalsIgnoreCase(prop.getProperty("camel.management.metricsEnabled"))
- || "true".equalsIgnoreCase(prop.getProperty("camel.server.metricsEnabled"))) {
+ || "true".equalsIgnoreCase(prop.getProperty("camel.server.metricsEnabled"))) {
answer.add("camel:micrometer-prometheus");
}
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index 8688b871ae9..cc1e7a8ae82 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -363,8 +363,8 @@ class ExportCamelMain extends Export {
RuntimeUtil.loadProperties(prop, profile);
// if metrics is defined then include camel-micrometer-prometheus for camel-main runtime
if (prop.getProperty("camel.metrics.enabled") != null
- || prop.getProperty("camel.management.metricsEnabled") != null
- || prop.getProperty("camel.server.metricsEnabled") != null) {
+ || prop.getProperty("camel.management.metricsEnabled") != null
+ || prop.getProperty("camel.server.metricsEnabled") != null) {
answer.add("mvn:org.apache.camel:camel-micrometer-prometheus");
}
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListPlatformHttp.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListPlatformHttp.java
index 76a5826e891..b9fbaa902b5 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListPlatformHttp.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListPlatformHttp.java
@@ -46,7 +46,7 @@ public class ListPlatformHttp extends ProcessWatchCommand {
String sort;
@CommandLine.Option(names = { "--all" },
- description = "Include management endpoints")
+ description = "Include management endpoints")
boolean all;
public ListPlatformHttp(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
index 0585c6a6711..c4efc83526e 100644
--- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
+++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java
@@ -516,6 +516,15 @@ public class KubernetesExport extends Export {
newProps.addAll(Arrays.asList(applicationProperties));
applicationProperties = newProps.toArray(new String[newProps.size()]);
}
+ } else if (RuntimeType.main == runtime) {
+ List<String> newProps = new ArrayList<>();
+ newProps.add("camel.management.port=" + (port > 0 ? "" + port : "9876"));
+ if (applicationProperties == null) {
+ applicationProperties = newProps.toArray(new String[newProps.size()]);
+ } else {
+ newProps.addAll(Arrays.asList(applicationProperties));
+ applicationProperties = newProps.toArray(new String[newProps.size()]);
+ }
}
}
diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
index 134616c2eaa..c3748cf77f0 100644
--- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
+++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java
@@ -72,7 +72,14 @@ class KubernetesExportTest extends KubernetesExportBaseTest {
Assertions.assertNull(props.get("jkube.container-image.platforms"));
if (RuntimeType.quarkus == RuntimeType.fromValue(rt.runtime())) {
+ Assertions.assertEquals("9876", props.get("quarkus.management.port"));
Assertions.assertEquals("/observe/health", props.get("quarkus.smallrye-health.root-path"));
+ } else if (RuntimeType.springBoot == RuntimeType.fromValue(rt.runtime())) {
+ Assertions.assertEquals("9876", props.get("management.server.port"));
+ Assertions.assertEquals("/observe", props.get("management.endpoints.web.base-path"));
+ Assertions.assertEquals("true", props.get("management.health.probes.enabled"));
+ } else if (RuntimeType.main == RuntimeType.fromValue(rt.runtime())) {
+ Assertions.assertEquals("9876", props.get("camel.management.port"));
}
}