You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2016/08/31 07:23:01 UTC
airavata git commit: Pushing zookeeper, kafka, logstash changes
Repository: airavata
Updated Branches:
refs/heads/lahiru/airavata-docker 54fbd4f78 -> 13303d511
Pushing zookeeper, kafka, logstash changes
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/13303d51
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/13303d51
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/13303d51
Branch: refs/heads/lahiru/airavata-docker
Commit: 13303d511810af186e2d41b15f5f74f4c0d70f3e
Parents: 54fbd4f
Author: CoreOS Admin <co...@ip-10-7-156-74.ec2.internal>
Authored: Wed Aug 31 07:21:16 2016 +0000
Committer: CoreOS Admin <co...@ip-10-7-156-74.ec2.internal>
Committed: Wed Aug 31 07:21:16 2016 +0000
----------------------------------------------------------------------
deploy/images/kafka/start-kafka.sh | 4 ++--
deploy/images/logstash/Dockerfile | 8 ++++----
.../logstash/logstash-output-dogstatsd-2.0.0.gem | Bin 9728 -> 0 bytes
deploy/systemd/kafka-manager.service | 15 +++++++++++++++
deploy/systemd/kafka.service | 13 +++++++++++++
5 files changed, 34 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/13303d51/deploy/images/kafka/start-kafka.sh
----------------------------------------------------------------------
diff --git a/deploy/images/kafka/start-kafka.sh b/deploy/images/kafka/start-kafka.sh
old mode 100644
new mode 100755
index 3b3ee86..6026010
--- a/deploy/images/kafka/start-kafka.sh
+++ b/deploy/images/kafka/start-kafka.sh
@@ -1,7 +1,7 @@
#!/bin/sh
if test -z "${BROKER_ID}"; then
- BROKER_ID=$(ifconfig eth0 | awk '/inet addr/{print substr($2,6)}' | head -n1 | tr -d '.')
+ BROKER_ID=$(ip a | grep 'eth0' | awk '/inet /{print substr($2,4)}'| sed 's/\///g' | head -n1 | tr -d .)
fi
mkdir -p /opt/kafka/etc
@@ -10,7 +10,7 @@ broker.id=${BROKER_ID}
zookeeper.connect=${ZOOKEEPER}
log.dirs=${LOG_DIRS}
num.partitions=2
-default.replication.factor=2
+default.replication.factor=1
advertised.host.name=${ADVERTISED_HOST_NAME}
EOF
http://git-wip-us.apache.org/repos/asf/airavata/blob/13303d51/deploy/images/logstash/Dockerfile
----------------------------------------------------------------------
diff --git a/deploy/images/logstash/Dockerfile b/deploy/images/logstash/Dockerfile
index c3b8963..c8d4d47 100644
--- a/deploy/images/logstash/Dockerfile
+++ b/deploy/images/logstash/Dockerfile
@@ -1,6 +1,6 @@
-FROM logstash:2
+FROM logstash:2.1.1
COPY *.gem /tmp/
-RUN logstash-plugin install /tmp/*.gem && rm -f /tmp/*.gem
-RUN logstash-plugin install logstash-codec-avro logstash-codec-cloudtrail logstash-input-journald
-ENTRYPOINT []
\ No newline at end of file
+RUN /opt/logstash/bin/plugin install logstash-output-amazon_es
+RUN /opt/logstash/bin/plugin install logstash-codec-avro logstash-codec-cloudtrail logstash-input-journald
+ENTRYPOINT []
http://git-wip-us.apache.org/repos/asf/airavata/blob/13303d51/deploy/images/logstash/logstash-output-dogstatsd-2.0.0.gem
----------------------------------------------------------------------
diff --git a/deploy/images/logstash/logstash-output-dogstatsd-2.0.0.gem b/deploy/images/logstash/logstash-output-dogstatsd-2.0.0.gem
deleted file mode 100644
index ec177a6..0000000
Binary files a/deploy/images/logstash/logstash-output-dogstatsd-2.0.0.gem and /dev/null differ
http://git-wip-us.apache.org/repos/asf/airavata/blob/13303d51/deploy/systemd/kafka-manager.service
----------------------------------------------------------------------
diff --git a/deploy/systemd/kafka-manager.service b/deploy/systemd/kafka-manager.service
new file mode 100644
index 0000000..1bed655
--- /dev/null
+++ b/deploy/systemd/kafka-manager.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=kafka-manager
+After=docker.service
+Requires=docker.service
+[Service]
+EnvironmentFile=/etc/environment
+TimeoutStartSec=60
+Restart=on-failure
+ExecStartPre=-/usr/bin/docker rm -f kafka-manager
+ExecStartPre=-/usr/bin/docker pull sheepkiller/kafka-manager
+ExecStart=/usr/bin/docker run --name kafka-manager -p 9000:9000 -e ZK_HOSTS=localhost:2181 -e APPLICATION_SECRET=face2face sheepkiller/kafka-manager
+ExecStop=/usr/bin/docker stop kafka-manager
+[Install]
+WantedBy=multi-user.target
+
http://git-wip-us.apache.org/repos/asf/airavata/blob/13303d51/deploy/systemd/kafka.service
----------------------------------------------------------------------
diff --git a/deploy/systemd/kafka.service b/deploy/systemd/kafka.service
new file mode 100644
index 0000000..b74e3e0
--- /dev/null
+++ b/deploy/systemd/kafka.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Kafka
+Requires=docker.service
+[Service]
+EnvironmentFile=/etc/environment
+TimeoutStartSec=60
+Restart=on-failure
+ExecStartPre=-/usr/bin/docker rm -f kafka
+ExecStartPre=-/usr/bin/docker pull scigap/kafka
+ExecStart=/usr/bin/docker run --net=host --name kafka -e ADVERTISED_HOST_NAME=${COREOS_PRIVATE_IPV4} -v /var/lib/kafka:/var/lib/kafka scigap/kafka
+ExecStop=/usr/bin/docker stop kafka
+[Install]
+WantedBy=multi-user.target