This is an automated email from the ASF dual-hosted git repository.

mck pushed a commit to branch cassandra-3.11
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 8ac2e4244dfd392fa1dab204ebea7f0c883d8e25
Merge: 1152417 47910df
Author: Mick Semb Wever <[email protected]>
AuthorDate: Mon Apr 1 20:46:53 2019 +1100

    Merge branch 'cassandra-3.0' into cassandra-3.11

 conf/cassandra-env.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc conf/cassandra-env.sh
index 8932985,43f4566..7f7081b
--- a/conf/cassandra-env.sh
+++ b/conf/cassandra-env.sh
@@@ -250,48 -295,26 +250,48 @@@ f
  JMX_PORT="7199"
  
  if [ "$LOCAL_JMX" = "yes" ]; then
 -  JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT 
-XX:+DisableExplicitGC"
 +  JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.local.port=$JMX_PORT"
 +  JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
  else
 -  JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT"
 +  JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.remote.port=$JMX_PORT"
 +  # if ssl is enabled the same port cannot be used for both jmx and rmi so 
either
 +  # pick another value for this property or comment out to use a random port 
(though see CASSANDRA-7087 for origins)
    JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT"
 -  JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
 +
 +  # turn on JMX authentication. See below for further options
    JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=true"
 -  JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.password.file=/etc/cassandra/jmxremote.password"
 -#  JVM_OPTS="$JVM_OPTS -Djavax.net.ssl.keyStore=/path/to/keystore"
 -#  JVM_OPTS="$JVM_OPTS -Djavax.net.ssl.keyStorePassword=<keystore-password>"
 -#  JVM_OPTS="$JVM_OPTS -Djavax.net.ssl.trustStore=/path/to/truststore"
 -#  JVM_OPTS="$JVM_OPTS 
-Djavax.net.ssl.trustStorePassword=<truststore-password>"
 -#  JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.ssl.need.client.auth=true"
 -#  JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.registry.ssl=true"
 -#  JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.ssl.enabled.protocols=<enabled-protocols>"
 -#  JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.ssl.enabled.cipher.suites=<enabled-cipher-suites>"
 +
 +  # jmx ssl options
 +  #JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=true"
 +  #JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.ssl.need.client.auth=true"
 +  #JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.ssl.enabled.protocols=<enabled-protocols>"
 +  #JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.ssl.enabled.cipher.suites=<enabled-cipher-suites>"
 +  #JVM_OPTS="$JVM_OPTS -Djavax.net.ssl.keyStore=/path/to/keystore"
 +  #JVM_OPTS="$JVM_OPTS -Djavax.net.ssl.keyStorePassword=<keystore-password>"
 +  #JVM_OPTS="$JVM_OPTS -Djavax.net.ssl.trustStore=/path/to/truststore"
 +  #JVM_OPTS="$JVM_OPTS 
-Djavax.net.ssl.trustStorePassword=<truststore-password>"
  fi
  
 +# jmx authentication and authorization options. By default, auth is only
 +# activated for remote connections but they can also be enabled for local 
only JMX
 +## Basic file based authn & authz
 +JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.password.file=/etc/cassandra/jmxremote.password"
 +#JVM_OPTS="$JVM_OPTS 
-Dcom.sun.management.jmxremote.access.file=/etc/cassandra/jmxremote.access"
 +## Custom auth settings which can be used as alternatives to JMX's out of the 
box auth utilities.
 +## JAAS login modules can be used for authentication by uncommenting these 
two properties.
 +## Cassandra ships with a LoginModule implementation - 
org.apache.cassandra.auth.CassandraLoginModule -
 +## which delegates to the IAuthenticator configured in cassandra.yaml. See 
the sample JAAS configuration
 +## file cassandra-jaas.config
 +#JVM_OPTS="$JVM_OPTS -Dcassandra.jmx.remote.login.config=CassandraLogin"
 +#JVM_OPTS="$JVM_OPTS 
-Djava.security.auth.login.config=$CASSANDRA_HOME/conf/cassandra-jaas.config"
 +
 +## Cassandra also ships with a helper for delegating JMX authz calls to the 
configured IAuthorizer,
 +## uncomment this to use it. Requires one of the two authentication options 
to be enabled
 +#JVM_OPTS="$JVM_OPTS 
-Dcassandra.jmx.authorizer=org.apache.cassandra.auth.jmx.AuthorizationProxy"
 +
  # To use mx4j, an HTML interface for JMX, add mx4j-tools.jar to the lib/
  # directory.
- # See http://wiki.apache.org/cassandra/Operations#Monitoring_with_MX4J
+ # See http://cassandra.apache.org/doc/3.11/operating/metrics.html#jmx
  # By default mx4j listens on 0.0.0.0:8081. Uncomment the following lines
  # to control its listen address and port.
  #MX4J_ADDRESS="-Dmx4jaddress=127.0.0.1"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to