From e4b9920c0d81362a6791612be324d274c74fa76f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ferenc=20T=C3=B3th?= <ferenc.2.toth@nokia.com>
Date: Fri, 9 Aug 2019 21:13:56 +0200
Subject: [PATCH] Fix fluentd config generator
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ferenc Tóth <ferenc.2.toth@nokia.com>
Change-Id: I32c6e024d265d310fdba32d60211992d0b960330
---
 SPECS/infra-charts.spec                                         | 2 +-
 infra-charts/templates/custom-metrics-apiserver-deployment.yaml | 0
 infra-charts/templates/custom-metrics-apiserver-service.yaml    | 0
 infra-charts/templates/custom-metrics-apiservice.yaml           | 0
 infra-charts/templates/fluentd-configmap.yaml                   | 4 ++--
 infra-charts/templates/metrics-apiservice.yaml                  | 0
 infra-charts/templates/metrics-server-deployment.yaml           | 0
 infra-charts/templates/metrics-server-service.yaml              | 0
 8 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 infra-charts/templates/custom-metrics-apiserver-deployment.yaml
 mode change 100755 => 100644 infra-charts/templates/custom-metrics-apiserver-service.yaml
 mode change 100755 => 100644 infra-charts/templates/custom-metrics-apiservice.yaml
 mode change 100755 => 100644 infra-charts/templates/metrics-apiservice.yaml
 mode change 100755 => 100644 infra-charts/templates/metrics-server-deployment.yaml
 mode change 100755 => 100644 infra-charts/templates/metrics-server-service.yaml

diff --git a/SPECS/infra-charts.spec b/SPECS/infra-charts.spec
index 71a614e..4b9eed9 100644
--- a/SPECS/infra-charts.spec
+++ b/SPECS/infra-charts.spec
@@ -15,7 +15,7 @@
 %define COMPONENT infra-charts
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 18
+%define RPM_MINOR_VERSION 19
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
diff --git a/infra-charts/templates/custom-metrics-apiserver-deployment.yaml b/infra-charts/templates/custom-metrics-apiserver-deployment.yaml
old mode 100755
new mode 100644
diff --git a/infra-charts/templates/custom-metrics-apiserver-service.yaml b/infra-charts/templates/custom-metrics-apiserver-service.yaml
old mode 100755
new mode 100644
diff --git a/infra-charts/templates/custom-metrics-apiservice.yaml b/infra-charts/templates/custom-metrics-apiservice.yaml
old mode 100755
new mode 100644
diff --git a/infra-charts/templates/fluentd-configmap.yaml b/infra-charts/templates/fluentd-configmap.yaml
index 2baed2b..d3addd1 100644
--- a/infra-charts/templates/fluentd-configmap.yaml
+++ b/infra-charts/templates/fluentd-configmap.yaml
@@ -120,8 +120,8 @@ data:
     <worker {{ add $index 1 }}>
       <source>
         @type tail
-        path /var/log/containers/*_{{ $element.namespace }}-{{ $index }}_*.log
-        pos_file /var/lib/fluentd/fluentd-{{ $element.namespace }}-{{ $index }}.log.pos
+        path /var/log/containers/*_{{ $element.namespace }}_*.log
+        pos_file /var/lib/fluentd/fluentd-{{ $element.namespace }}-{{ $element.target_url | urlquery }}.log.pos
         time_format %Y-%m-%dT%H:%M:%S.%NZ
         refresh_interval 10
         tag kubernetes.*
diff --git a/infra-charts/templates/metrics-apiservice.yaml b/infra-charts/templates/metrics-apiservice.yaml
old mode 100755
new mode 100644
diff --git a/infra-charts/templates/metrics-server-deployment.yaml b/infra-charts/templates/metrics-server-deployment.yaml
old mode 100755
new mode 100644
diff --git a/infra-charts/templates/metrics-server-service.yaml b/infra-charts/templates/metrics-server-service.yaml
old mode 100755
new mode 100644
-- 
2.16.6