Comment-out test of fluentd log driver

Logstash fluentd codec support is currently broken: ref logstash-plugins/logstash-codec-fluent#2 ref logstash-plugins/logstash-codec-fluent#5 until that work is complete testing the log driver against logstash will not be successful.
autopilotpattern · Dec 2, 2015 · 8b48ff1 · 8b48ff1
1 parent 568643d
commit 8b48ff1
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 39 deletions.
diff --git a/common-compose.yml b/common-compose.yml
@@ -32,9 +32,9 @@ logstash:
     # the typical non-container values for familiarity
     - "514"       # syslog tcp port
     - "514/udp"   # syslog udp port
-    - "24224"     # fluentd tcp port
     - "12201"     # gelf
     - "12201/udp" # gelf udp port
+    # - "24224"     # fluentd tcp port
     environment:
     - CONTAINERBUDDY=file:///etc/containerbuddy.json
     command: >

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -49,16 +49,16 @@ nginx_gelf:
     links:
     - consul:consul
 
-nginx_fluentd:
-    extends:
-      file: common-compose.yml
-      service: nginx
-    mem_limit: 128m
-    log_driver: fluentd
-    log_opt:
-      fluentd-address: "tcp://${LOGSTASH}"
-    links:
-    - consul:consul
+# nginx_fluentd:
+#     extends:
+#       file: common-compose.yml
+#       service: nginx
+#     mem_limit: 128m
+#     log_driver: fluentd
+#     log_opt:
+#       fluentd-address: "${LOGSTASH}"
+#     links:
+#     - consul:consul
 
 # ---------------------------------------------------
 # The master-only node serves as the coordinator of the cluster only

diff --git a/local-compose.yml b/local-compose.yml
@@ -21,8 +21,8 @@ logstash:
     ports:
     - "514:514"             # syslog tcp port
     - "514/udp:514/udp"     # syslog udp port
-    - "24224:24224"         # fluentd tcp port
     - "12201/udp:12201/udp" # gelf udp port
+    # - "24224:24224"        # fluentd tcp port
 
 nginx_syslog:
     extends:
@@ -46,16 +46,16 @@ nginx_gelf:
     links:
     - consul:consul
 
-nginx_fluentd:
-    extends:
-      file: common-compose.yml
-      service: nginx
-    mem_limit: 128m
-    log_driver: fluentd
-    log_opt:
-      fluentd-address: "${LOGSTASH}"
-    links:
-    - consul:consul
+# nginx_fluentd:
+#     extends:
+#       file: common-compose.yml
+#       service: nginx
+#     mem_limit: 128m
+#     log_driver: fluentd
+#     log_opt:
+#       fluentd-address: "${LOGSTASH}"
+#     links:
+#     - consul:consul
 
 elasticsearch_master:
     extends:

diff --git a/makefile b/makefile
@@ -5,28 +5,47 @@ SHELL := /bin/bash
 
 PHONY: *
 
+# -------------------------------------------
+# build and release
+
 build:
-	docker-compose -p elk -f local-compose.yml build
+	cd kibana && docker build --tag 0x74696d/triton-kibana .
+	cd logstash && docker build --tag 0x74696d/triton-logstash .
+
+ship:
+	docker push 0x74696d/triton-kibana
+	docker push 0x74696d/triton-logstash
+
+
+# -------------------------------------------
+# run on Triton
+
+run: export LOGSTASH = n/a
+run:
+	./start.sh
+
+# with 3 ES data nodes and 2 kibana app instances
+scale: export LOGSTASH = n/a
+scale:
+	docker-compose -p elk scale elasticsearch=3
+	docker-compose -p elk scale kibana=2
+
+# run test for test-syslog, test-gelf (or test-fluentd once it works)
+test-%:
+	./start.sh test $*
+
+
+# -------------------------------------------
+# run against a local Docker environment
 
-# for running against local Docker environment
 local: export LOGSTASH = n/a
 local:
 	-docker-compose -p elk stop || true
 	-docker-compose -p elk rm -f || true
-	#docker-compose -p elk -f local-compose.yml pull
+	docker-compose -p elk -f local-compose.yml pull
 	docker-compose -p elk -f local-compose.yml build
 	./start.sh -f local-compose.yml
 
-# run test for test-syslog, test-gelf, or test-fluentd
-test-%:
+# test for test-syslog, test-gelf (or test-fluentd once it works)
+test-local-%:
 	./start.sh -f local-compose.yml test $*
-
-ship:
-	cd kibana && docker build --tag 0x74696d/triton-kibana .
-	docker push 0x74696d/triton-kibana
-
-# run on Triton with 3 ES data nodes and 2 kibana app instances
-run:
-	./start.sh
-	docker-compose -p elk scale elasticsearch=3
-	docker-compose -p elk scale kibana=2
diff --git a/start.sh b/start.sh
@@ -73,8 +73,8 @@ test() {
     local port
     local protocol=tcp
     case $logtype in
-        fluentd)
-            port=24224 ;;
+        # fluentd)
+        #    port=24224 ;;
         gelf)
             port=12201
             protocol=udp