Merge "docker: Add support for experimental collectd container"

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 (file)
--- 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 (file)
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 (file)
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>