From 0c7ba86e05637d715065bac60839fcaab2db760c Mon Sep 17 00:00:00 2001
From: John Garbutt <john.garbutt@stackhpc.com>
Date: Thu, 3 Jun 2021 10:49:32 +0100
Subject: [PATCH] Stop fluentd deprecation warnings of type vs @type

Currently when elasticsearch log output is enabled there are lots
of warnings going into elasticsearch about type being deprecated
and needing to move to @type. This change stops those warnings.

TrivialFix

Change-Id: Ideac1925cb764ad0d7d8416f56d5e4a993c6d8b6
---
 ansible/roles/common/templates/conf/output/00-local.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/common/templates/conf/output/00-local.conf.j2 b/ansible/roles/common/templates/conf/output/00-local.conf.j2
index 5ceed1e59e..8e99e860da 100644
--- a/ansible/roles/common/templates/conf/output/00-local.conf.j2
+++ b/ansible/roles/common/templates/conf/output/00-local.conf.j2
@@ -136,7 +136,7 @@
   </store>
 {% if log_direct_to_elasticsearch %}
   <store>
-       type elasticsearch
+       @type elasticsearch
        host {{ elasticsearch_address }}
        port {{ elasticsearch_port }}
        scheme {{ fluentd_elasticsearch_scheme }}
@@ -197,7 +197,7 @@
   </store>
 {% if log_direct_to_elasticsearch %}
   <store>
-       type elasticsearch
+       @type elasticsearch
        host {{ elasticsearch_address }}
        port {{ elasticsearch_port }}
        scheme {{ fluentd_elasticsearch_scheme }}