Merge "Update Barometer plugin - follow-up patch"

4 files changed, 41 insertions, 9 deletions

diff --git a/plugins/barometer/roles/collectd/tasks/collectd.yml b/plugins/barometer/roles/collectd/tasks/collectd.yml
index 4167e71b..0f6a6266 100644
--- a/plugins/barometer/roles/collectd/tasks/collectd.yml
+++ b/plugins/barometer/roles/collectd/tasks/collectd.yml
@@ -143,6 +143,17 @@
     dest: /root/collectd_sample_configs/virt.conf
   when: libvirt_result|succeeded
 
+- name: configure virt conf extra stats when rdt is present
+  remote_user: root
+  shell: |
+    sed -i '/ExtraStats/s/^#//g' /root/collectd_sample_configs/virt.conf
+  when: rdt_result|failed and libvirt_result|succeeded
+
+- name: configure rrdtool conf
+  template:
+    src: rrdtool.conf.j2
+    dest: /root/collectd_sample_configs/rrdtool.conf
+
 - name: configure intel_pmu conf
   remote_user: root
   template:
diff --git a/plugins/barometer/roles/collectd/templates/default_plugins.conf.j2 b/plugins/barometer/roles/collectd/templates/default_plugins.conf.j2
index bd1850e6..a4d632a6 100644
--- a/plugins/barometer/roles/collectd/templates/default_plugins.conf.j2
+++ b/plugins/barometer/roles/collectd/templates/default_plugins.conf.j2
@@ -11,21 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-#Hostname ""
+Hostname "{{ inventory_hostname }}"
 
 LoadPlugin cpufreq
 LoadPlugin disk
-#LoadPlugin ethstat
-#LoadPlugin ipc
-#LoadPlugin ipmi
+LoadPlugin ethstat
+LoadPlugin ipc
+LoadPlugin ipmi
 LoadPlugin load
 LoadPlugin memory
 LoadPlugin numa
 LoadPlugin processes
-#LoadPlugin df
-#LoadPlugin turbostat
-#LoadPlugin uptime
-#LoadPlugin contextswitch
+LoadPlugin df
+LoadPlugin turbostat
+LoadPlugin uptime
+LoadPlugin contextswitch
 LoadPlugin irq
 LoadPlugin swap
 
diff --git a/plugins/barometer/roles/collectd/templates/rrdtool.conf.j2 b/plugins/barometer/roles/collectd/templates/rrdtool.conf.j2
new file mode 100644
index 00000000..50bd6603
--- /dev/null
+++ b/plugins/barometer/roles/collectd/templates/rrdtool.conf.j2
@@ -0,0 +1,21 @@
+# Copyright 2017-18 OPNFV
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+Loadplugin rrdtool
+
+<Plugin rrdtool>
+  DataDir "/tmp/collectd/rrd"
+  CacheFlush 120
+  WritesPerSecond 50
+</Plugin>
+
diff --git a/plugins/barometer/roles/collectd/templates/virt.conf.j2 b/plugins/barometer/roles/collectd/templates/virt.conf.j2
index 8048bc13..c6161237 100644
--- a/plugins/barometer/roles/collectd/templates/virt.conf.j2
+++ b/plugins/barometer/roles/collectd/templates/virt.conf.j2
@@ -27,6 +27,6 @@ LoadPlugin virt
 # InterfaceFormat name
 # PluginInstanceFormat name
 # Instances 1
-  ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
+# ExtraStats "cpu_util disk disk_err domain_state fs_info job_stats_background pcpu perf vcpupin"
 </Plugin>