aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-10-24 15:21:40 +0100
committerMaryam Tahhan <maryam.tahhan@intel.com>2017-10-24 15:37:37 +0100
commitecf1ba1c5000718d1f0d90270af33039b488c835 (patch)
treed27ce2622523ec0097c9d3c04a48984ed507a5ba /src
parent787c0f30f5027ac3d072f0c5e53f970d8273e3ac (diff)
src: fix src build issues
Change-Id: I8abf40a0034110dc504c227ffba1ff5e9ec6850b Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com> Signed-off-by: Taras Chornyi <tarasx.chornyi@intel.com>
Diffstat (limited to 'src')
-rw-r--r--src/Makefile3
-rw-r--r--src/collectd/Makefile2
-rw-r--r--src/collectd/collectd_sample_configs/intel_pmu.conf22
-rw-r--r--src/collectd/collectd_sample_configs/mcelog.conf5
-rwxr-xr-xsrc/collectd/snmp_mib_config.sh10
-rw-r--r--src/pmu-tools/Makefile5
6 files changed, 42 insertions, 5 deletions
diff --git a/src/Makefile b/src/Makefile
index e7a472c..4785e85 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,9 +32,12 @@ $(SUBBUILDS):
with-dpdk:
export WITH_DPDK
+
include mk/master.mk
SUBDIRS =
+ifdef WITH_DPDK
SUBDIRS += dpdk
+endif
SUBDIRS += libpqos
SUBDIRS += pmu-tools
SUBDIRS += collectd
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index b7fc2a1..e09aca3 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 0000000..db83e4b
--- /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 649573d..3e28f3f 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 179eb4b..a2c44db 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
diff --git a/src/pmu-tools/Makefile b/src/pmu-tools/Makefile
index e40521f..6d080d7 100644
--- a/src/pmu-tools/Makefile
+++ b/src/pmu-tools/Makefile
@@ -22,7 +22,7 @@
include ../mk/master.mk
include ../package-list.mk
-
+export XDG_CACHE_HOME=/usr/local/src
WORK_DIR = pmu-tools
TAG_DONE_FLAG = $(WORK_DIR)/.$(PMUTOOLS_TAG).done
BUILD_CMD =
@@ -42,7 +42,8 @@ force_make: $(WORK_DIR) $(TAG_DONE_FLAG)
$(AT)cd $(WORK_DIR) && git pull $(PMUTOOLS_URL) $(PMUTOOLS_TAG)
@echo "git pull done"
$(AT)cd $(WORK_DIR)/jevents
- $(AT)sed -i 's/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/' $(MAKEFILE)
+ $(AT)sed -i 's/lib64/lib/' $(WORK_DIR)/jevents/$(MAKEFILE)
+ $(AT)sed -i 's/CFLAGS := -g -Wall -O2 -Wno-unused-result/CFLAGS := -g -Wall -O2 -Wno-unused-result -fPIC/' $(WORK_DIR)/jevents/$(MAKEFILE)
$(AT)$(MAKE) -C $(WORK_DIR)/jevents
@echo "Make done"