Merge "Separate collectd plugin config from configmap"

2 files changed, 45 insertions, 45 deletions

diff --git a/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf b/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf
new file mode 100644
index 00000000..f62adb6a
--- /dev/null
+++ b/vnfs/DAaaS/collection/charts/collectd/resources/config/collectd.conf
@@ -0,0 +1,44 @@
+FQDNLookup false
+LoadPlugin cpu
+LoadPlugin memory
+LoadPlugin cpufreq
+LoadPlugin disk
+LoadPlugin ethstat
+LoadPlugin ipc
+LoadPlugin ipmi
+LoadPlugin load
+LoadPlugin numa
+LoadPlugin processes
+LoadPlugin df
+LoadPlugin turbostat
+LoadPlugin uptime
+LoadPlugin contextswitch
+LoadPlugin irq
+LoadPlugin df
+LoadPlugin swap
+LoadPlugin write_prometheus
+
+LoadPlugin logfile
+<Plugin logfile>
+  LogLevel info
+  File "/var/log/collectd.log"
+  Timestamp true
+  PrintSeverity false
+</Plugin>
+<Plugin "cpu">
+  Interval 5
+  ReportByState false
+  ReportByCpu false
+</Plugin>
+
+<Plugin "memory">
+  Interval 30
+  ValuesAbsolute false
+  ValuesPercentage true
+</Plugin>
+
+<Plugin "write_prometheus">
+ Port "{{ .Values.prometheus_port }}"
+</Plugin>
+
+#Last line (collectd requires ‘\n’ at the last line)
diff --git a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml b/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml
index 90cbf176..5f5dde01 100644
--- a/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml
+++ b/vnfs/DAaaS/collection/charts/collectd/templates/configmap.yaml
@@ -24,48 +24,4 @@ metadata:
     release: {{ .Release.Name }}
 data:
   node-collectd.conf: |-
-    FQDNLookup false
-    
-    LoadPlugin cpu
-    LoadPlugin memory
-    LoadPlugin cpufreq
-    LoadPlugin disk
-    LoadPlugin ethstat
-    LoadPlugin ipc
-    LoadPlugin ipmi
-    LoadPlugin load
-    LoadPlugin numa
-    LoadPlugin processes
-    LoadPlugin df
-    LoadPlugin turbostat
-    LoadPlugin uptime
-    LoadPlugin contextswitch
-    LoadPlugin irq
-    LoadPlugin df
-    LoadPlugin swap
-    LoadPlugin write_prometheus
-
-    LoadPlugin logfile
-    <Plugin logfile>
-      LogLevel info
-      File "/var/log/collectd.log"
-      Timestamp true
-      PrintSeverity false
-    </Plugin>
-    <Plugin "cpu">
-      Interval 5
-      ReportByState false
-      ReportByCpu false
-    </Plugin>
-
-    <Plugin "memory">
-      Interval 30
-      ValuesAbsolute false
-      ValuesPercentage true
-    </Plugin>
-
-    <Plugin "write_prometheus">
-     Port "{{ .Values.prometheus_port }}"
-    </Plugin>
-
-    #Last line (collectd requires ‘\n’ at the last line)
+  {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}