Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for username / password credentials for Cassandra #749

Merged
merged 5 commits into from
Dec 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ If you installed chronos via package, run `/usr/bin/chronos run_jar --help`.
points for Cassandra
--cassandra_keyspace <arg> Keyspace to use for Cassandra
--cassandra_port <arg> Port for Cassandra
--cassandra_user <arg> User for Cassandra
(default = None)
--cassandra_password <arg> Password for Cassandra
(default = None)
--cassandra_stat_count_table <arg> Table to track stat counts in
Cassandra
--cassandra_table <arg> Table to use for Cassandra
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@ trait CassandraConfiguration extends ScallopConf {
descr = "Port for Cassandra",
default = Some(9042))

lazy val cassandraUser = opt[String]("cassandra_user",
descr = "User",
default = None)

lazy val cassandraPassword = opt[String]("cassandra_password",
descr = "Password",
default = None)

lazy val cassandraKeyspace = opt[String]("cassandra_keyspace",
descr = "Keyspace to use for Cassandra",
default = Some("metrics"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@ class JobStatsModule(config: CassandraConfiguration) extends AbstractModule {
def provideCassandraClusterBuilder(): Option[Cluster.Builder] = {
config.cassandraContactPoints.get match {
case Some(contactPoints) =>
Some(
Cluster.builder()
.addContactPoints(contactPoints.split(","): _*)
.withPort(config.cassandraPort())
.withCompression(Compression.LZ4)
.withRetryPolicy(DowngradingConsistencyRetryPolicy.INSTANCE)
.withLoadBalancingPolicy(LatencyAwarePolicy.builder(new RoundRobinPolicy).build)
)
var builder = Cluster.builder()
.addContactPoints(contactPoints.split(","): _*)
.withPort(config.cassandraPort())
.withCompression(Compression.LZ4)
.withRetryPolicy(DowngradingConsistencyRetryPolicy.INSTANCE)
.withLoadBalancingPolicy(LatencyAwarePolicy.builder(new RoundRobinPolicy).build)

if (config.cassandraUser.isDefined && config.cassandraPassword.isDefined) {
builder = builder.withCredentials(config.cassandraUser.get.orNull, config.cassandraPassword.get.orNull)
}
Some(builder)
case _ =>
None
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,9 @@ class JobStats @Inject()(clusterBuilder: Option[Cluster.Builder], config: Cassan
case Some(c) =>
try {
val session = c.build.connect()
session.execute(new SimpleStatement(
s"CREATE KEYSPACE IF NOT EXISTS ${config.cassandraKeyspace()} WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };"
))
session.execute(new SimpleStatement(
s"USE ${config.cassandraKeyspace()};"
))
Expand Down