del

fluentd-deployment.yaml

@@ -1,11 +0,0 @@
-
-<<<<<<< HEAD
-=======
-      initContainers:
-      - name: install-rewrite-tag-filter
-        image: your-fluentd-image:version
-        command: ["fluent-gem", "install", "fluent-plugin-rewrite-tag-filter"]
-      containers:
-      - name: fluentd
-        image: your-fluentd-image:version
->>>>>>> Snippet

fluentd.conf

@@ -1,29 +0,0 @@
-
-<<<<<<< HEAD
-=======
-      <match tanya.**>
-        @type copy
-        <store>
-          @type elasticsearch
-          @id output_elasticsearch_tanya
-          host elasticsearch
-          port 9200
-          scheme http
-          user fluentd_user
-          password fluentd_password
-          logstash_format true
-          logstash_prefix tanya
-          logstash_dateformat %Y.%m.%d
-          flush_interval 5s
-          @log_level debug
-          id_key _id
-          remove_keys _id
-          include_tag_key true
-          tag_key @log_name
-        </store>
-        <store>
-          @type stdout
-          @id output_stdout_tanya
-        </store>
-      </match>
->>>>>>> Snippet