From a8d645e7932beba4a63d673fb3bbcaf0749b418b Mon Sep 17 00:00:00 2001 From: Joaquin Casares Date: Thu, 6 Jul 2017 20:06:58 -0500 Subject: [PATCH] Add jmxAuth keys to default configs. --- resource/cassandra-reaper-cassandra.yaml | 4 ++++ resource/cassandra-reaper-h2.yaml | 4 ++++ resource/cassandra-reaper-memory.yaml | 4 ++++ resource/cassandra-reaper-postgres.yaml | 4 ++++ resource/cassandra-reaper.yaml | 4 ++++ src/main/docker/Dockerfile | 2 ++ src/main/docker/cassandra-reaper.yml | 4 ++++ 7 files changed, 26 insertions(+) diff --git a/resource/cassandra-reaper-cassandra.yaml b/resource/cassandra-reaper-cassandra.yaml index b2bd95ade..70c3cf52a 100644 --- a/resource/cassandra-reaper-cassandra.yaml +++ b/resource/cassandra-reaper-cassandra.yaml @@ -24,6 +24,10 @@ jmxPorts: 127.0.0.7: 7700 127.0.0.8: 7800 +#jmxAuth: +# username: myUsername +# password: myPassword + logging: level: INFO loggers: diff --git a/resource/cassandra-reaper-h2.yaml b/resource/cassandra-reaper-h2.yaml index 2bce73ac3..8b526a085 100644 --- a/resource/cassandra-reaper-h2.yaml +++ b/resource/cassandra-reaper-h2.yaml @@ -24,6 +24,10 @@ jmxPorts: 127.0.0.7: 7700 127.0.0.8: 7800 +#jmxAuth: +# username: myUsername +# password: myPassword + logging: level: INFO loggers: diff --git a/resource/cassandra-reaper-memory.yaml b/resource/cassandra-reaper-memory.yaml index f5af93ef6..ff8e1b63a 100644 --- a/resource/cassandra-reaper-memory.yaml +++ b/resource/cassandra-reaper-memory.yaml @@ -24,6 +24,10 @@ jmxPorts: 127.0.0.7: 7700 127.0.0.8: 7800 +#jmxAuth: +# username: myUsername +# password: myPassword + logging: level: INFO loggers: diff --git a/resource/cassandra-reaper-postgres.yaml b/resource/cassandra-reaper-postgres.yaml index cab780048..edaa23297 100644 --- a/resource/cassandra-reaper-postgres.yaml +++ b/resource/cassandra-reaper-postgres.yaml @@ -24,6 +24,10 @@ jmxPorts: 127.0.0.7: 7700 127.0.0.8: 7800 +#jmxAuth: +# username: myUsername +# password: myPassword + logging: level: INFO loggers: diff --git a/resource/cassandra-reaper.yaml b/resource/cassandra-reaper.yaml index d37c1b97f..8a56f2ae8 100644 --- a/resource/cassandra-reaper.yaml +++ b/resource/cassandra-reaper.yaml @@ -24,6 +24,10 @@ jmxPorts: 127.0.0.7: 7700 127.0.0.8: 7800 +#jmxAuth: +# username: myUsername +# password: myPassword + logging: level: INFO loggers: diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index cf180803b..79fd7d41b 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -20,6 +20,8 @@ ENV REAPER_SEGMENT_COUNT=200 \ REAPER_AUTO_SCHEDULE_TIME_BETWEEN_FIRST_SCHEDULE=PT6H \ REAPER_AUTO_SCHEDULE_EXCLUDED_KEYSPACES="[]" \ REAPER_JMX_PORTS="{}" \ + REAPER_JMX_USERNAME="" \ + REAPER_JMX_PASSWORD="" \ REAPER_LOGGING_ROOT_LEVEL=INFO \ REAPER_LOGGERS="{}" \ REAPER_LOGGING_FORMAT='"%-6level [%d] [%t] %logger{5} - %msg %n"' \ diff --git a/src/main/docker/cassandra-reaper.yml b/src/main/docker/cassandra-reaper.yml index 268407cc5..e0effc149 100644 --- a/src/main/docker/cassandra-reaper.yml +++ b/src/main/docker/cassandra-reaper.yml @@ -21,6 +21,10 @@ autoScheduling: jmxPorts: ${REAPER_JMX_PORTS} +jmxAuth: + username: ${REAPER_JMX_USERNAME} + password: ${REAPER_JMX_PASSWORD} + logging: level: ${REAPER_LOGGING_ROOT_LEVEL} loggers: ${REAPER_LOGGERS}