diff options
| -rw-r--r-- | logs-streaming/logs-kube-kafka-raw.yml (renamed from logs-streaming/logs-kube-kafka.yml) | 9 | ||||
| -rw-r--r-- | logs-streaming/test/logs-raw.yml (renamed from logs-streaming/test/logs-aggregated.yml) | 10 |
2 files changed, 12 insertions, 7 deletions
diff --git a/logs-streaming/logs-kube-kafka.yml b/logs-streaming/logs-kube-kafka-raw.yml index 56fbeea..de56a8b 100644 --- a/logs-streaming/logs-kube-kafka.yml +++ b/logs-streaming/logs-kube-kafka-raw.yml @@ -1,18 +1,22 @@ apiVersion: apps/v1beta2 kind: DaemonSet metadata: - name: logs-kafka + name: logs-kafka-raw namespace: kafka spec: selector: matchLabels: k8s-app: logs-kafka + log-wrapping: none + container-delimiters: tail version: v1 kubernetes.io/cluster-service: "true" template: metadata: labels: k8s-app: logs-kafka + log-wrapping: none + container-delimiters: tail version: v1 kubernetes.io/cluster-service: "true" spec: @@ -43,7 +47,8 @@ spec: - /bin/sh - -c - find /var/log/containers/ -maxdepth 1 -name *.log | diff - /tmp/start-list - initialDelaySeconds: 15 + failureThreshold: 1 + initialDelaySeconds: 25 periodSeconds: 5 resources: limits: diff --git a/logs-streaming/test/logs-aggregated.yml b/logs-streaming/test/logs-raw.yml index 4da336c..dbe9dc1 100644 --- a/logs-streaming/test/logs-aggregated.yml +++ b/logs-streaming/test/logs-raw.yml @@ -1,7 +1,7 @@ --- kind: ConfigMap metadata: - name: test-logs-aggregated + name: logs-raw namespace: test-kafka apiVersion: v1 data: @@ -28,18 +28,18 @@ data: apiVersion: apps/v1beta2 kind: Deployment metadata: - name: test-logs-aggregated + name: logs-raw namespace: test-kafka spec: replicas: 1 selector: matchLabels: - test-target: logs-streaming + test-target: logs-streaming-raw test-type: readiness template: metadata: labels: - test-target: logs-streaming + test-target: logs-streaming-raw test-type: readiness spec: containers: @@ -72,4 +72,4 @@ spec: volumes: - name: config configMap: - name: test-logs-aggregated + name: logs-raw |