Add MCAC to images

Author: tjake

Dockerfile-3_11

@@ -12,6 +12,10 @@ ENV TINI_VERSION v0.18.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
+ENV MCAC_VERSION 0.1.2
+ADD https://github.com/datastax/metric-collector-for-apache-cassandra/releases/download/v${MCAC_VERSION}/datastax-mcac-agent-${MCAC_VERSION}.tar.gz /opt/mcac-agent.tar.gz
+RUN mkdir /opt/mcac-agent && tar zxvf /opt/mcac-agent.tar.gz -C /opt/mcac-agent --strip-components 1 && rm /opt/mcac-agent.tar.gz
+
 # backwards compat with upstream ENTRYPOINT
 COPY scripts/docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh && \

Dockerfile-4_0

@@ -12,6 +12,9 @@ ENV TINI_VERSION v0.18.0
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
 RUN chmod +x /tini
 
+ENV MCAC_VERSION 0.1.2
+ADD https://github.com/datastax/metric-collector-for-apache-cassandra/releases/download/v${MCAC_VERSION}/datastax-mcac-agent-${MCAC_VERSION}.tar.gz /opt/mcac-agent
+
 # backwards compat with upstream ENTRYPOINT
 COPY scripts/docker-entrypoint.sh /usr/local/bin/
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh && \

scripts/docker-entrypoint.sh

@@ -54,6 +54,16 @@ if [ "$1" = 'mgmtapi' ]; then
 	# 1. configbuilder will overwrite the cassandra-env-sh, so we don't want to set this after
 	# 2. We don't wan't operator or configbuilder to care so much about the version number or
 	#    the fact this jar even exists.
+	
+	if ! grep -qxF "JVM_OPTS=\"\$JVM_OPTS -javaagent:/opt/mcac-agent/lib/datastax-mcac-agent.jar\"" < /etc/cassandra/cassandra-env.sh ; then
+     	# ensure newline at end of file
+		echo "" >> /etc/cassandra/cassandra-env.sh
+     	echo "JVM_OPTS=\"\$JVM_OPTS -javaagent:/opt/mcac-agent/lib/datastax-mcac-agent.jar\"" >> /etc/cassandra/cassandra-env.sh
+	
+		echo "" >> /opt/mcac-agent/config/metric-collector.yaml
+		echo "data_dir_max_size_in_mb: 100" >> /opt/mcac-agent/config/metric-collector.yaml
+	fi
+
 	if ! grep -qxF "JVM_OPTS=\"\$JVM_OPTS -javaagent:/etc/cassandra/datastax-mgmtapi-agent-0.1.0-SNAPSHOT.jar\"" < /etc/cassandra/cassandra-env.sh ; then
 		# ensure newline at end of file
 		echo "" >> /etc/cassandra/cassandra-env.sh
@@ -63,7 +73,7 @@ if [ "$1" = 'mgmtapi' ]; then
 	CASSANDRA_RPC_ADDRESS='0.0.0.0'
 	CASSANDRA_BROADCAST_RPC_ADDRESS="$(_ip_address)"
 
-  # Not needed as the operator will set all this but leaving for testing
+    # Not needed as the operator will set all this but leaving for testing
 	for yaml in \
 	  cluster_name \
 		endpoint_snitch \