From 1de911137715cc2307381bb12bd60b947269495a Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 8 May 2020 17:24:05 +0800 Subject: [PATCH] collectd: add missing config files for plugins Add missing config files for plugins from collectd-5.8.1-4.el7.src.rpm Issue-ID: INF-95 Signed-off-by: Jackie Huang Change-Id: Ic97bca595d99e82763bdd6e4332ce35db8b9e5b7 --- meta-stx/recipes-extended/collectd/collectd_%.bbappend | 18 +++++++++++++++++- .../collectd/files/default-plugins-cpu.conf | 1 + .../collectd/files/default-plugins-interface.conf | 1 + .../collectd/files/default-plugins-load.conf | 1 + .../collectd/files/default-plugins-memory.conf | 1 + .../collectd/files/default-plugins-syslog.conf | 1 + 6 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta-stx/recipes-extended/collectd/files/default-plugins-cpu.conf create mode 100644 meta-stx/recipes-extended/collectd/files/default-plugins-interface.conf create mode 100644 meta-stx/recipes-extended/collectd/files/default-plugins-load.conf create mode 100644 meta-stx/recipes-extended/collectd/files/default-plugins-memory.conf create mode 100644 meta-stx/recipes-extended/collectd/files/default-plugins-syslog.conf diff --git a/meta-stx/recipes-extended/collectd/collectd_%.bbappend b/meta-stx/recipes-extended/collectd/collectd_%.bbappend index 7a517b2..517c19e 100644 --- a/meta-stx/recipes-extended/collectd/collectd_%.bbappend +++ b/meta-stx/recipes-extended/collectd/collectd_%.bbappend @@ -15,8 +15,24 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -SRC_URI += "file://collectd-fix-for-LIBPYTHON_LDFLAGS.patch" +SRC_URI += " \ + file://collectd-fix-for-LIBPYTHON_LDFLAGS.patch \ + file://default-plugins-cpu.conf \ + file://default-plugins-interface.conf \ + file://default-plugins-load.conf \ + file://default-plugins-memory.conf \ + file://default-plugins-syslog.conf \ + " PACKAGECONFIG += "python" PACKAGECONFIG[python] = "--enable-python --with-libpython,--disable-python --with-libpython=no,python" + +do_install_append () { + install -m 755 -d ${D}${sysconfdir}/collectd.d/ + install -m 644 ${WORKDIR}/default-plugins-cpu.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-cpu.conf + install -m 644 ${WORKDIR}/default-plugins-interface.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-interface.conf + install -m 644 ${WORKDIR}/default-plugins-load.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-load.conf + install -m 644 ${WORKDIR}/default-plugins-memory.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-memory.conf + install -m 644 ${WORKDIR}/default-plugins-syslog.conf ${D}${sysconfdir}/collectd.d/90-default-plugins-syslog.conf +} diff --git a/meta-stx/recipes-extended/collectd/files/default-plugins-cpu.conf b/meta-stx/recipes-extended/collectd/files/default-plugins-cpu.conf new file mode 100644 index 0000000..30fcc38 --- /dev/null +++ b/meta-stx/recipes-extended/collectd/files/default-plugins-cpu.conf @@ -0,0 +1 @@ +LoadPlugin cpu diff --git a/meta-stx/recipes-extended/collectd/files/default-plugins-interface.conf b/meta-stx/recipes-extended/collectd/files/default-plugins-interface.conf new file mode 100644 index 0000000..7494ca1 --- /dev/null +++ b/meta-stx/recipes-extended/collectd/files/default-plugins-interface.conf @@ -0,0 +1 @@ +LoadPlugin interface diff --git a/meta-stx/recipes-extended/collectd/files/default-plugins-load.conf b/meta-stx/recipes-extended/collectd/files/default-plugins-load.conf new file mode 100644 index 0000000..5a65eda --- /dev/null +++ b/meta-stx/recipes-extended/collectd/files/default-plugins-load.conf @@ -0,0 +1 @@ +LoadPlugin load diff --git a/meta-stx/recipes-extended/collectd/files/default-plugins-memory.conf b/meta-stx/recipes-extended/collectd/files/default-plugins-memory.conf new file mode 100644 index 0000000..249ff7f --- /dev/null +++ b/meta-stx/recipes-extended/collectd/files/default-plugins-memory.conf @@ -0,0 +1 @@ +LoadPlugin memory diff --git a/meta-stx/recipes-extended/collectd/files/default-plugins-syslog.conf b/meta-stx/recipes-extended/collectd/files/default-plugins-syslog.conf new file mode 100644 index 0000000..3ae5852 --- /dev/null +++ b/meta-stx/recipes-extended/collectd/files/default-plugins-syslog.conf @@ -0,0 +1 @@ +LoadPlugin syslog -- 2.16.6