diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/collectd/Makefile | 2 | ||||
| -rw-r--r-- | src/collectd/collectd_sample_configs/exec.conf | 2 | ||||
| -rw-r--r-- | src/collectd/collectd_sample_configs/network.conf | 18 | ||||
| -rwxr-xr-x | src/collectd/include_config.sh | 18 | ||||
| -rwxr-xr-x | src/collectd/ovs_pmd_stats_config.sh | 4 | ||||
| -rw-r--r-- | src/libpqos/Makefile | 2 | ||||
| -rw-r--r-- | src/package-list.mk | 2 | ||||
| -rw-r--r-- | src/pmu-tools/Makefile | 2 |
8 files changed, 46 insertions, 4 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile index e09aca3b..decb8e84 100644 --- a/src/collectd/Makefile +++ b/src/collectd/Makefile @@ -69,12 +69,14 @@ force_make: $(WORK_DIR)/Makefile force_install: $(AT)$(MAKE) -C $(WORK_DIR) install +ifndef DOCKER $(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)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 CAP_SYS_RAWIO CAP_SYS_ADMIN/g' /etc/systemd/system/collectd.service $(AT)sed -i -e 's|Environment=\(.*\)|Environment=XDG_CACHE_HOME='$(XDG_CACHE_HOME_DIR)' \1|g' /etc/systemd/system/collectd.service $(AT)systemctl daemon-reload +endif $(AT)sudo ./ovs_pmd_stats_config.sh $(AT)sudo ./snmp_mib_config.sh $(AT)sudo ./include_config.sh diff --git a/src/collectd/collectd_sample_configs/exec.conf b/src/collectd/collectd_sample_configs/exec.conf index 1402ac72..e36409e5 100644 --- a/src/collectd/collectd_sample_configs/exec.conf +++ b/src/collectd/collectd_sample_configs/exec.conf @@ -16,6 +16,6 @@ LoadPlugin exec <Plugin exec> # For OVS PMD stats plugin - Exec "user:group" "/opt/collectd/etc/collectd.conf.d/ovs_pmd_stats.sh" + Exec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/ovs_pmd_stats.sh" NotificationExec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/write_notification.sh" </Plugin> diff --git a/src/collectd/collectd_sample_configs/network.conf b/src/collectd/collectd_sample_configs/network.conf new file mode 100644 index 00000000..4309ed86 --- /dev/null +++ b/src/collectd/collectd_sample_configs/network.conf @@ -0,0 +1,18 @@ +# 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 network +<Plugin network> + Server "127.0.0.1" "25826" +</Plugin> diff --git a/src/collectd/include_config.sh b/src/collectd/include_config.sh index 1996e96b..dd20893d 100755 --- a/src/collectd/include_config.sh +++ b/src/collectd/include_config.sh @@ -1,14 +1,30 @@ #!/bin/bash +# 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. + COLLECTD_CONF_FILE=/opt/collectd/etc/collectd.conf COLLECTD_CONF_DIR=/opt/collectd/etc/collectd.conf.d INCLUDE_CONF="<Include \"/opt/collectd/etc/collectd.conf.d\">" CURR_DIR=`pwd` +HOSTNAME=`hostname` SAMPLE_CONF_DIR=$CURR_DIR/collectd_sample_configs/* function write_include { + echo "Hostname \"$HOSTNAME\"" | sudo tee -a $COLLECTD_CONF_FILE; echo $INCLUDE_CONF | sudo tee -a $COLLECTD_CONF_FILE; echo " Filter \"*.conf\"" | sudo tee -a $COLLECTD_CONF_FILE; - echo -e "</Include>" | sudo tee -a /opt/collectd/etc/collectd.conf + echo -e "</Include>" | sudo tee -a $COLLECTD_CONF_FILE; } grep -qe '<Include "/opt/collectd/etc/collectd.conf.d">' $COLLECTD_CONF_FILE; [ $? -ne 0 ] && write_include diff --git a/src/collectd/ovs_pmd_stats_config.sh b/src/collectd/ovs_pmd_stats_config.sh index dc28f204..bdb0615d 100755 --- a/src/collectd/ovs_pmd_stats_config.sh +++ b/src/collectd/ovs_pmd_stats_config.sh @@ -27,3 +27,7 @@ if [ "${RESULT:-null}" != null ]; then else echo "Openvswitch service is not running. Please start before running ovs plugins" fi +# Always copy python ovs module when building Docker image +if [ -z ${DOCKER+x} ]; then + cp $OVS_PMD_STAT_SCRIPT $PATH_LOCAL +fi diff --git a/src/libpqos/Makefile b/src/libpqos/Makefile index 14bb7882..a32a4ab8 100644 --- a/src/libpqos/Makefile +++ b/src/libpqos/Makefile @@ -45,7 +45,9 @@ force_make: $(WORK_DIR) force_install: $(AT)sudo $(MAKE) -C $(WORK_DIR) install PREFIX=/usr +ifndef DOCKER $(AT)sudo modprobe msr +endif install: $(INSTALL_TARGET) diff --git a/src/package-list.mk b/src/package-list.mk index e857dcf8..a059bd55 100644 --- a/src/package-list.mk +++ b/src/package-list.mk @@ -16,7 +16,7 @@ PMUTOOLS_TAG ?= master # collectd section COLLECTD_URL ?= https://github.com/collectd/collectd -COLLECTD_TAG ?= master +COLLECTD_TAG ?= collectd-5.8 COLLECTD_OPENSTACK_URL ?= https://github.com/openstack/collectd-ceilometer-plugin COLLECTD_OPENSTACK_TAG ?= stable/pike diff --git a/src/pmu-tools/Makefile b/src/pmu-tools/Makefile index 6d080d70..ab0d8170 100644 --- a/src/pmu-tools/Makefile +++ b/src/pmu-tools/Makefile @@ -49,7 +49,7 @@ force_make: $(WORK_DIR) $(TAG_DONE_FLAG) force_install: $(AT)sudo $(MAKE) -C $(WORK_DIR)/jevents install - $(AT)./$(WORK_DIR)/event_download.py + $(AT)./$(WORK_DIR)/event_download.py --all install: $(INSTALL_TARGET) |