aboutsummaryrefslogtreecommitdiffstats
path: root/src/collectd
diff options
context:
space:
mode:
authorMaryam Tahhan <maryam.tahhan@intel.com>2017-11-29 11:48:19 +0000
committerMaryam Tahhan <maryam.tahhan@intel.com>2017-11-29 14:01:54 +0000
commitbfb1d7536e376244a48275afdbb5693c80571ed1 (patch)
tree77b8d6da9e1c3a14df6c1a636a6193f6e436ccb5 /src/collectd
parent016ec072effd1638b52179eb056fda2891bd3777 (diff)
docker: add kafka support to collectd
Adds kafka support to collectd, cleaned up configuration files and updates documentation. Change-Id: Ie66ed22e8904e08e59aa7047d6afc9d176f3fb02 Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Diffstat (limited to 'src/collectd')
-rw-r--r--src/collectd/Makefile1
-rw-r--r--src/collectd/collectd_sample_configs/csv.conf2
-rw-r--r--src/collectd/collectd_sample_configs/default_plugins.conf31
-rw-r--r--src/collectd/collectd_sample_configs/dpdkstat.conf2
-rw-r--r--src/collectd/collectd_sample_configs/exec.conf5
-rw-r--r--src/collectd/collectd_sample_configs/hugepages.conf2
-rw-r--r--src/collectd/collectd_sample_configs/kafka.conf21
-rw-r--r--src/collectd/collectd_sample_configs/ovs_events.conf3
-rw-r--r--src/collectd/collectd_sample_configs/rdt.conf2
-rwxr-xr-xsrc/collectd/collectd_sample_configs/write_notification.sh2
10 files changed, 61 insertions, 10 deletions
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index decb8e84..41fe89aa 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -48,6 +48,7 @@ CONFIG_CMD += --enable-exec
CONFIG_CMD += --enable-python
CONFIG_CMD += --enable-threshold
CONFIG_CMD += --disable-perl
+CONFIG_CMD += --with-librdkafka=/usr
.PHONY: install force_install config force_make
diff --git a/src/collectd/collectd_sample_configs/csv.conf b/src/collectd/collectd_sample_configs/csv.conf
index e2350039..99a8498d 100644
--- a/src/collectd/collectd_sample_configs/csv.conf
+++ b/src/collectd/collectd_sample_configs/csv.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 OPNFV
+# 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.
diff --git a/src/collectd/collectd_sample_configs/default_plugins.conf b/src/collectd/collectd_sample_configs/default_plugins.conf
new file mode 100644
index 00000000..c96b0076
--- /dev/null
+++ b/src/collectd/collectd_sample_configs/default_plugins.conf
@@ -0,0 +1,31 @@
+# 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.
+#Hostname ""
+
+LoadPlugin cpufreq
+LoadPlugin disk
+LoadPlugin ethstat
+LoadPlugin ipc
+LoadPlugin ipmi
+LoadPlugin load
+LoadPlugin memory
+LoadPlugin numa
+LoadPlugin processes
+LoadPlugin df
+LoadPlugin turbostat
+LoadPlugin uptime
+LoadPlugin contextswitch
+LoadPlugin irq
+LoadPlugin df
+LoadPlugin swap
diff --git a/src/collectd/collectd_sample_configs/dpdkstat.conf b/src/collectd/collectd_sample_configs/dpdkstat.conf
index 201f9d37..919e6e6e 100644
--- a/src/collectd/collectd_sample_configs/dpdkstat.conf
+++ b/src/collectd/collectd_sample_configs/dpdkstat.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 OPNFV
+# 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.
diff --git a/src/collectd/collectd_sample_configs/exec.conf b/src/collectd/collectd_sample_configs/exec.conf
index e36409e5..0a291bdb 100644
--- a/src/collectd/collectd_sample_configs/exec.conf
+++ b/src/collectd/collectd_sample_configs/exec.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 OPNFV
+# 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.
@@ -11,9 +11,8 @@
# 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 exec
+
<Plugin exec>
# For OVS PMD stats plugin
Exec "collectd_exec" "/opt/collectd/etc/collectd.conf.d/ovs_pmd_stats.sh"
diff --git a/src/collectd/collectd_sample_configs/hugepages.conf b/src/collectd/collectd_sample_configs/hugepages.conf
index 4e4d9152..558b6f50 100644
--- a/src/collectd/collectd_sample_configs/hugepages.conf
+++ b/src/collectd/collectd_sample_configs/hugepages.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 OPNFV
+# 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.
diff --git a/src/collectd/collectd_sample_configs/kafka.conf b/src/collectd/collectd_sample_configs/kafka.conf
new file mode 100644
index 00000000..f81e87fd
--- /dev/null
+++ b/src/collectd/collectd_sample_configs/kafka.conf
@@ -0,0 +1,21 @@
+# 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 write_kafka
+
+<Plugin write_kafka>
+ Property "metadata.broker.list" "localhost:9092"
+ <Topic "collectd">
+ Format JSON
+ </Topic>
+</Plugin>
diff --git a/src/collectd/collectd_sample_configs/ovs_events.conf b/src/collectd/collectd_sample_configs/ovs_events.conf
index a52842ca..250e1e43 100644
--- a/src/collectd/collectd_sample_configs/ovs_events.conf
+++ b/src/collectd/collectd_sample_configs/ovs_events.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 OPNFV
+# 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.
@@ -11,7 +11,6 @@
# 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 ovs_events>
Interval 1
</LoadPlugin>
diff --git a/src/collectd/collectd_sample_configs/rdt.conf b/src/collectd/collectd_sample_configs/rdt.conf
index 4ff0a77a..ae983dc0 100644
--- a/src/collectd/collectd_sample_configs/rdt.conf
+++ b/src/collectd/collectd_sample_configs/rdt.conf
@@ -1,4 +1,4 @@
-# Copyright 2016 OPNFV
+# 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.
diff --git a/src/collectd/collectd_sample_configs/write_notification.sh b/src/collectd/collectd_sample_configs/write_notification.sh
index 28198f9d..ed6ed9e2 100755
--- a/src/collectd/collectd_sample_configs/write_notification.sh
+++ b/src/collectd/collectd_sample_configs/write_notification.sh
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2016 OPNFV
+# 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.