aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKamil Wiatrowski <kamilx.wiatrowski@intel.com>2019-04-26 13:42:42 +0200
committerKamil Wiatrowski <kamilx.wiatrowski@intel.com>2019-05-07 17:14:19 +0200
commit46832aaa20b6ca7963e7230928d329383687c56e (patch)
tree8b465c754613217b93e10d89cc1d31f78bebcb0e
parent4d11ca17d0f73f5bd783f45900118295fdfed46b (diff)
barometer: update conf files
Updated intel_pmu.conf for ansible installation to monitor cores 0-4 by default. Add sample conf files for plugins supported by master container: pcie_errors and write_prometheus. Change-Id: Ifedff2f3b099f5d7b5a88d14909c3879d38e4e64 Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
-rw-r--r--docker/ansible/roles/config_files/templates/intel_pmu.conf.j23
-rw-r--r--src/collectd/collectd_sample_configs-master/pcie_errors.conf21
-rw-r--r--src/collectd/collectd_sample_configs-master/prometheus.conf19
3 files changed, 42 insertions, 1 deletions
diff --git a/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2 b/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2
index 067a3e8..564898d 100644
--- a/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2
+++ b/docker/ansible/roles/config_files/templates/intel_pmu.conf.j2
@@ -1,4 +1,4 @@
-#Copyright 2018 OPNFV and Intel Corporation
+#Copyright 2018-2019 OPNFV and Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -20,5 +20,6 @@ LoadPlugin intel_pmu
ReportSoftwareEvents true
# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+ Cores "[0-4]"
</Plugin>
diff --git a/src/collectd/collectd_sample_configs-master/pcie_errors.conf b/src/collectd/collectd_sample_configs-master/pcie_errors.conf
new file mode 100644
index 0000000..de9b753
--- /dev/null
+++ b/src/collectd/collectd_sample_configs-master/pcie_errors.conf
@@ -0,0 +1,21 @@
+# Copyright 2019 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 pcie_errors>
+ Interval 0.01
+</LoadPlugin>
+
+<Plugin pcie_errors>
+ PersistentNotifications false
+</Plugin>
diff --git a/src/collectd/collectd_sample_configs-master/prometheus.conf b/src/collectd/collectd_sample_configs-master/prometheus.conf
new file mode 100644
index 0000000..13ef328
--- /dev/null
+++ b/src/collectd/collectd_sample_configs-master/prometheus.conf
@@ -0,0 +1,19 @@
+#Copyright 2019 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 write_prometheus
+
+<Plugin "write_prometheus">
+ Port "9103"
+</Plugin>