Merge remote-tracking branch 'upstream/master' into fluentd-elasticsearch

2018-12-17 23:40:25 +01:00
parent 14b208db26 76963255cf
commit 9da7a189b9
890 changed files with 20103 additions and 9583 deletions
--- a/cluster/addons/fluentd-elasticsearch/OWNERS
+++ b/cluster/addons/fluentd-elasticsearch/OWNERS
@@ -1,8 +1,10 @@
 approvers:
 - coffeepac
+- monotek
 - piosz
 reviewers:
 - coffeepac
+- monotek
 - piosz
 labels:
 - sig/instrumentation
--- a/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
+++ b/cluster/addons/fluentd-elasticsearch/fluentd-es-configmap.yaml
@@ -320,7 +320,7 @@ data:
    <source>
      @id journald-container-runtime
      @type systemd
-      matches [{ "_SYSTEMD_UNIT": "{{ container_runtime }}.service" }]
+      matches [{ "_SYSTEMD_UNIT": "{{ fluentd_container_runtime_service }}.service" }]
      <storage>
        @type local
        persistent true