diff options
Diffstat (limited to 'src/collectd')
| -rw-r--r-- | src/collectd/Makefile | 2 | ||||
| -rw-r--r-- | src/collectd/collectd_sample_configs/intel_pmu.conf | 22 | ||||
| -rw-r--r-- | src/collectd/collectd_sample_configs/mcelog.conf | 5 | ||||
| -rwxr-xr-x | src/collectd/snmp_mib_config.sh | 10 |
4 files changed, 36 insertions, 3 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile index b7fc2a15..e09aca3b 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -52,7 +52,7 @@ CONFIG_CMD += --disable-perl .PHONY: install force_install config force_make # install depends on make -#force_install: force_make +force_install: force_make all: force_make @echo "Finished making $(WORK_DIR)" diff --git a/src/collectd/collectd_sample_configs/intel_pmu.conf b/src/collectd/collectd_sample_configs/intel_pmu.conf new file mode 100644 index 00000000..db83e4bb --- /dev/null +++ b/src/collectd/collectd_sample_configs/intel_pmu.conf @@ -0,0 +1,22 @@ +# 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 intel_pmu + +<Plugin intel_pmu> + ReportHardwareCacheEvents true + ReportKernelPMUEvents true + 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" +</Plugin> diff --git a/src/collectd/collectd_sample_configs/mcelog.conf b/src/collectd/collectd_sample_configs/mcelog.conf index 649573dc..3e28f3f1 100644 --- a/src/collectd/collectd_sample_configs/mcelog.conf +++ b/src/collectd/collectd_sample_configs/mcelog.conf @@ -16,5 +16,10 @@ </LoadPlugin> <Plugin mcelog> + <Memory> McelogClientSocket "/var/run/mcelog-client" + PersistentNotification false + </Memory> +## McelogLogfile "/var/log/mcelog" </Plugin> + diff --git a/src/collectd/snmp_mib_config.sh b/src/collectd/snmp_mib_config.sh index 179eb4ba..a2c44db1 100755 --- a/src/collectd/snmp_mib_config.sh +++ b/src/collectd/snmp_mib_config.sh @@ -17,8 +17,14 @@ export CURRENT_DIR=$(pwd) cp $CURRENT_DIR/../../mibs/* /usr/share/snmp/mibs/ -if [ -n "$(uname -a | grep Ubuntu)" ]; then +# Detect OS name and version from systemd based os-release file +. /etc/os-release + +# Get OS name (the First word from $NAME in /etc/os-release) +OS_NAME="$ID" + +if [ "x$OS_NAME" == "xubuntu" ]; then cp $CURRENT_DIR/../../mibs/* /var/lib/mibs/ietf/ -else +elif [ "x${OS_NAME}" == "xfedora" ]; then cp $CURRENT_DIR/../../mibs/* /usr/share/mibs/ietf/ fi |