diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/collectd/include_config.sh | 18 | ||||
| -rw-r--r-- | src/package-list.mk | 2 | ||||
| -rw-r--r-- | src/pmu-tools/Makefile | 2 |
3 files changed, 19 insertions, 3 deletions
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/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) |