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 2019/12/08 21:03:10 UTC
[camel] branch camel-3.0.x updated: CAMEL-14263: Fixed compile
issue with ganglia and rebuild
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.0.x by this push:
new 3cb5528 CAMEL-14263: Fixed compile issue with ganglia and rebuild
3cb5528 is described below
commit 3cb5528292e67380323a217f2b6c0e7410ed92f5
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Dec 8 10:19:55 2019 +0100
CAMEL-14263: Fixed compile issue with ganglia and rebuild
---
components/camel-ganglia/src/main/docs/ganglia-component.adoc | 2 +-
.../java/org/apache/camel/component/ganglia/GangliaConfiguration.java | 2 +-
components/camel-nagios/src/main/docs/nagios-component.adoc | 3 +--
docs/components/modules/ROOT/pages/nagios-component.adoc | 3 +--
.../component/ganglia/springboot/GangliaComponentConfiguration.java | 2 +-
5 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/components/camel-ganglia/src/main/docs/ganglia-component.adoc b/components/camel-ganglia/src/main/docs/ganglia-component.adoc
index 9fb5270..f4c19c8 100644
--- a/components/camel-ganglia/src/main/docs/ganglia-component.adoc
+++ b/components/camel-ganglia/src/main/docs/ganglia-component.adoc
@@ -110,7 +110,7 @@ with the following path and query parameters:
| *spoofHostname* (producer) | Spoofing information IP:hostname | | String
| *tmax* (producer) | Maximum time in seconds that the value can be considered current. After this, Ganglia considers the value to have expired. | 60 | int
| *ttl* (producer) | If using multicast, set the TTL of the packets | 5 | int
-| *type* (producer) | The type of value | string | GMetricType
+| *type* (producer) | The type of value | STRING | GMetricType
| *units* (producer) | Any unit of measurement that qualifies the metric, e.g. widgets, litres, bytes. Do not include a prefix such as k (kilo) or m (milli), other tools may scale the units later. The value should be unscaled. | | String
| *wireFormat31x* (producer) | Use the wire format of Ganglia 3.1.0 and later versions. Set this to false to use Ganglia 3.0.x or earlier. | true | boolean
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
diff --git a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
index acdbf3f..7a99eb3 100644
--- a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
+++ b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
@@ -70,7 +70,7 @@ public class GangliaConfiguration implements Cloneable {
@UriParam(defaultValue = "metric")
private String metricName = DEFAULT_METRIC_NAME;
- @UriParam(defaultValue = "string", enums = "string,int8,uint8,int16,uint16,int32,uint32,float,double")
+ @UriParam(defaultValue = "STRING", enums = "STRING,INT8,UINT8,INT16,UINT16,INT32,UINT32,FLOAT,DOUBLE")
private GMetricType type = DEFAULT_TYPE;
@UriParam(defaultValue = "BOTH", enums = "ZERO,POSITIVE,NEGATIVE,BOTH")
diff --git a/components/camel-nagios/src/main/docs/nagios-component.adoc b/components/camel-nagios/src/main/docs/nagios-component.adoc
index 3b4d84f..cee2017 100644
--- a/components/camel-nagios/src/main/docs/nagios-component.adoc
+++ b/components/camel-nagios/src/main/docs/nagios-component.adoc
@@ -116,7 +116,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 12 options, which are listed below.
+The component supports 11 options, which are listed below.
@@ -134,7 +134,6 @@ The component supports 12 options, which are listed below.
| *camel.component.nagios.configuration.timeout* | Sending timeout in millis. | 5000 | Integer
| *camel.component.nagios.enabled* | Whether to enable auto configuration of the nagios component. This is enabled by default. | | Boolean
| *camel.component.nagios.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
-| *camel.component.nagios.configuration.encryption-method* | *Deprecated* To specify an encryption method. | | NagiosEncryptionMethod
|===
// spring-boot-auto-configure options: END
diff --git a/docs/components/modules/ROOT/pages/nagios-component.adoc b/docs/components/modules/ROOT/pages/nagios-component.adoc
index a0fc54d..a355b32 100644
--- a/docs/components/modules/ROOT/pages/nagios-component.adoc
+++ b/docs/components/modules/ROOT/pages/nagios-component.adoc
@@ -117,7 +117,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
----
-The component supports 12 options, which are listed below.
+The component supports 11 options, which are listed below.
@@ -135,7 +135,6 @@ The component supports 12 options, which are listed below.
| *camel.component.nagios.configuration.timeout* | Sending timeout in millis. | 5000 | Integer
| *camel.component.nagios.enabled* | Whether to enable auto configuration of the nagios component. This is enabled by default. | | Boolean
| *camel.component.nagios.lazy-start-producer* | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed the [...]
-| *camel.component.nagios.configuration.encryption-method* | *Deprecated* To specify an encryption method. | | NagiosEncryptionMethod
|===
// spring-boot-auto-configure options: END
diff --git a/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java
index ce4a199..749b076 100644
--- a/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java
@@ -145,7 +145,7 @@ public class GangliaComponentConfiguration
/**
* The type of value
*/
- private GMetricType type = GMetricType.string;
+ private GMetricType type = GMetricType.STRING;
/**
* The slope
*/