Merge "docker: Added docker container for running collectd"

5 files changed, 27 insertions, 1 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/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)