Update Jolokia trait documentation
@@ -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=...`
!===
