summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/collectd/Makefile3
-rw-r--r--src/collectd/collectd_sample_configs/mcelog.conf20
2 files changed, 21 insertions, 2 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index 6fdd4638..9e4b484c 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -65,9 +65,8 @@ force_install:
$(AT)$(MAKE) -C $(WORK_DIR) install
$(AT)cp $(WORK_DIR)/contrib/systemd.collectd.service /etc/systemd/system/
$(AT)mv /etc/systemd/system/systemd.collectd.service /etc/systemd/system/collectd.service
- $(AT)chmod +x /etc/systemd/system/collectd.service
$(AT)sed -i -e 's/ExecStart=\/usr\/sbin\/collectd/ExecStart=\/opt\/collectd\/sbin\/collectd/g' /etc/systemd/system/collectd.service
- $(AT)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID/g' /etc/systemd/system/collectd.service
+ $(AT)sed -i -e 's/CapabilityBoundingSet=/CapabilityBoundingSet=CAP_SETUID CAP_SETGID CAP_SYS_RAWIO/g' /etc/systemd/system/collectd.service
$(AT)systemctl daemon-reload
$(AT)sudo ./include_config.sh
@echo "Make install done"
diff --git a/src/collectd/collectd_sample_configs/mcelog.conf b/src/collectd/collectd_sample_configs/mcelog.conf
new file mode 100644
index 00000000..649573dc
--- /dev/null
+++ b/src/collectd/collectd_sample_configs/mcelog.conf
@@ -0,0 +1,20 @@
+# Copyright 2017 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 mcelog>
+ Interval 1
+</LoadPlugin>
+
+<Plugin mcelog>
+ McelogClientSocket "/var/run/mcelog-client"
+</Plugin>