This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 055c0fb Update Jolokia trait documentation
new 637f32a Merge pull request #404 from astefanutti/jolokia-03
055c0fb is described below
commit 055c0fb21be5d28a7fefc490c347ea1f01f68f31
Author: Antonin Stefanutti <[email protected]>
AuthorDate: Thu Jan 31 16:42:49 2019 +0100
Update Jolokia trait documentation
---
docs/traits.adoc | 33 +++++++++++++++++++++++++++------
1 file changed, 27 insertions(+), 6 deletions(-)
diff --git a/docs/traits.adoc b/docs/traits.adoc
index 60456cb..76b36ed 100644
--- a/docs/traits.adoc
+++ b/docs/traits.adoc
@@ -161,17 +161,38 @@ The following is a list of common traits that can be
configured by the end users
[cols="m,"]
!===
+! jolokia.protocol
+! The protocol to use, either `http` or `https` (default `https` for OpenShift)
+
+! jolokia.host
+! The Hostaddress to which the Jolokia agent should bind to. If `"\*"` or
`"0.0.0.0"` is given, the servers binds to every network interface (default
`"*"`).
+
! jolokia.port
! The Jolokia endpoint port (default `8778`).
-! jolokia.openshift-ssl-auth
-! Configures OpenShift proxy SSL client authentication (only applicable for
the OpenShift profile, default `true`)
+! jolokia.user
+! The user to be used for authentication
-! jolokia.options
-! A comma-separared list of Jolokia options as defined in
https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent
configuration options], e.g.: `protocol=https,extendedClientCheck=false`
+! jolokia.password
+! The password used for authentication, applicable when the `user` option is
set
+
+! jolokia.discovery-enabled
+! Listen for multicast requests (default `false`)
+
+! jolokia.use-ssl-client-authentication
+! Whether client certificates should be used for authentication (default
`true` for OpenShift)
-! jolokia.random-password
-! Generates a random password for basic authentication
+! jolokia.ca-cert
+! The PEM encoded CA certification file path, used to verify client
certificates, applicable when `protocol` is `https` and
`use-ssl-client-authentication` is `true` (default
`/var/run/secrets/kubernetes.io/serviceaccount/ca.crt` for OpenShift).
+
+! jolokia.client-principal
+! The principal which must be given in a client certificate to allow access to
the Jolokia endpoint, applicable when `protocol` is `https` and
`use-ssl-client-authentication` is `true` (default
`clientPrincipal=cn=system:master-proxy` for OpenShift).
+
+! jolokia.extended-client-check
+! Mandate the client certificate contains a client flag in the extended key
usage section, applicable when `protocol` is `https` and
`use-ssl-client-authentication` is `true` (default `true` for OpenShift).
+
+! jolokia.options
+! A comma-separared list of additional Jolokia options as defined in
https://jolokia.org/reference/html/agents.html#agent-jvm-config[JVM agent
configuration options], e.g.: `keystore=...,executor=...`
!===
