Merge pull request kubernetes#1287 from brendandburns/logs

dchen1107 · dchen1107 · commit 6bbd0407440d · 2014-09-11T16:00:14.000-07:00
Start log rolling for docker containers too. Fix logrotate for other daemons.
diff --git a/cluster/saltbase/salt/logrotate/conf b/cluster/saltbase/salt/logrotate/conf
@@ -4,7 +4,7 @@
     missingok
     notifempty
     compress
-    maxsize 100m
+    maxsize 100M
     daily
     create 0644 root root
 }
diff --git a/cluster/saltbase/salt/logrotate/docker b/cluster/saltbase/salt/logrotate/docker
@@ -0,0 +1,10 @@
+/var/lib/docker/containers/*/*-json.log {
+    rotate 5
+    copytruncate
+    missingok
+    notifempty
+    compress
+    maxsize 10M
+    daily
+    create 0644 root root
+}
diff --git a/cluster/saltbase/salt/logrotate/init.sls b/cluster/saltbase/salt/logrotate/init.sls
@@ -16,6 +16,15 @@ logrotate:
       file: {{ file }}
 {% endfor %}
 
+/etc/logrotate.d/docker:
+  file:
+    - managed
+    - source: salt://logrotate/docker
+    - template: jinja
+    - user: root
+    - group: root
+    - mode: 644
+
 /etc/cron.hourly/logrotate:
   file:
     - managed
