diff --git a/contrib/logging/fluentd-ek-colo/Makefile b/contrib/logging/fluentd-ek-colo/Makefile deleted file mode 100644 index c39f327281..0000000000 --- a/contrib/logging/fluentd-ek-colo/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# Makefile for scenario where the Elasticsearch and Kibana containers -# have to be co-located inside the same pod. - -KUBECTL=kubectl.sh - -up: logger-up es-kibana-up - -down: logger-down es-kibana-down - - -es-kibana-up: - -${KUBECTL} create -f es-service.yml - -${KUBECTL} create -f es-kibana-pod.yml - -${KUBECTL} create -f kibana-service.yml - -es-kibana-down: - -${KUBECTL} delete pods elasticsearch-kibana-pod - -${KUBECTL} delete service kibana-colo - -${KUBECTL} delete service elasticsearch - -update: - -${KUBECTL} delete pods elasticsearch-kibana-pod - -${KUBECTL} create -f es-kibana-pod.yml - -logger-up: - -${KUBECTL} create -f synthetic_0_25lps.yml - -logger-down: - -${KUBECTL} delete pods synthetic-logger-0.25lps-pod - -get: - ${KUBECTL} get pods - ${KUBECTL} get services - -net: - gcutil getforwardingrule elasticsearch - gcutil getforwardingrule kibana-colo - -firewall: - gcutil addfirewall --allowed=tcp:5601,tcp:9200,tcp:9300 --target_tags=kubernetes-minion kubernetes-elk-example - - -rmfirewall: - gcutil deletefirewall -f kubernetes-elk-example - diff --git a/contrib/logging/fluentd-ek-colo/es-kibana-pod.yml b/contrib/logging/fluentd-ek-colo/es-kibana-pod.yml deleted file mode 100644 index e23d775320..0000000000 --- a/contrib/logging/fluentd-ek-colo/es-kibana-pod.yml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: v1beta1 -kind: Pod -id: elasticsearch-kibana-pod -desiredState: - manifest: - version: v1beta1 - id: es - containers: - - name: elasticsearch - image: dockerfile/elasticsearch - ports: - - name: es-port - containerPort: 9200 - - name: es-transport-port - containerPort: 9300 - volumeMounts: - - name: es-persistent-storage - mountPath: /data - - name: kibana-image - image: kubernetes/kibana - ports: - - name: kibana-port - containerPort: 80 - volumes: - - name: es-persistent-storage - source: - emptyDir: {} -labels: - app: elasticsearch-kibana diff --git a/contrib/logging/fluentd-ek-colo/es-service.yml b/contrib/logging/fluentd-ek-colo/es-service.yml deleted file mode 100644 index c591457e65..0000000000 --- a/contrib/logging/fluentd-ek-colo/es-service.yml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1beta1 -kind: Service -id: elasticsearch -containerPort: es-port -port: 9200 -selector: - app: elasticsearch-kibana -createExternalLoadBalancer: true diff --git a/contrib/logging/fluentd-ek-colo/kibana-service.yml b/contrib/logging/fluentd-ek-colo/kibana-service.yml deleted file mode 100644 index d55459b0cb..0000000000 --- a/contrib/logging/fluentd-ek-colo/kibana-service.yml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1beta1 -kind: Service -id: kibana-colo -containerPort: kibana-port -port: 5601 -selector: - app: elasticsearch-kibana -createExternalLoadBalancer: true diff --git a/contrib/logging/fluentd-ek-colo/synthetic_0_25lps.yml b/contrib/logging/fluentd-ek-colo/synthetic_0_25lps.yml deleted file mode 100644 index 3caced45bc..0000000000 --- a/contrib/logging/fluentd-ek-colo/synthetic_0_25lps.yml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: v1beta1 -kind: Pod -id: synthetic-logger-0.25lps-pod -desiredState: - manifest: - version: v1beta1 - id: synth-logger-0.25lps - containers: - - name: synth-lgr - image: ubuntu:14.04 - command: ["bash", "-c", "i=\"0\"; while true; do echo -n \"`hostname`: $i: \"; date --rfc-3339 ns; sleep 4; i=$[$i+1]; done"] -labels: - name: synth-logging-source - \ No newline at end of file