diff --git a/meta-stx-flock/stx-monitoring/collectd-extensions.bb b/meta-stx-flock/stx-monitoring/collectd-extensions.bb index 70d7236..4f0a400 100644 --- a/meta-stx-flock/stx-monitoring/collectd-extensions.bb +++ b/meta-stx-flock/stx-monitoring/collectd-extensions.bb @@ -18,7 +18,8 @@ RDEPENDS_${PN}_append += " \ local_unit_dir = "${sysconfdir}/systemd/system" -local_plugin_dir = "${sysconfdir}/collectd.d" +local_default_plugin_dir = "${sysconfdir}/collectd.d" +local_starlingx_plugin_dir = "${sysconfdir}/collectd.d/starlingx" local_python_extensions_dir = "/opt/collectd/extensions/python" local_config_extensions_dir = "/opt/collectd/extensions/config" @@ -27,7 +28,8 @@ do_install_append() { install -m 755 -d ${D}/${sysconfdir} install -m 755 -d ${D}/${local_unit_dir} - install -m 755 -d ${D}/${local_plugin_dir} + install -m 755 -d ${D}/${local_default_plugin_dir} + install -m 755 -d ${D}/${local_starlingx_plugin_dir} install -m 755 -d ${D}/${local_config_extensions_dir} install -m 755 -d ${D}/${local_python_extensions_dir} @@ -39,10 +41,12 @@ do_install_append() { install -m 700 fm_notifier.py ${D}/${local_python_extensions_dir} install -m 700 plugin_common.py ${D}/${local_python_extensions_dir} + # install README file into /etc/collectd.d + install -m 644 README ${D}/${local_default_plugin_dir} + # collectd python plugin files - resource plugins install -m 700 cpu.py ${D}/${local_python_extensions_dir} install -m 700 memory.py ${D}/${local_python_extensions_dir} - install -m 700 example.py ${D}/${local_python_extensions_dir} install -m 700 ntpq.py ${D}/${local_python_extensions_dir} install -m 700 interface.py ${D}/${local_python_extensions_dir} install -m 700 remotels.py ${D}/${local_python_extensions_dir} @@ -51,16 +55,15 @@ do_install_append() { # collectd plugin conf files into /etc/collectd.d - install -m 600 python_plugins.conf ${D}/${local_plugin_dir} - install -m 600 cpu.conf ${D}/${local_plugin_dir} - install -m 600 memory.conf ${D}/${local_plugin_dir} - install -m 600 df.conf ${D}/${local_plugin_dir} - install -m 600 example.conf ${D}/${local_plugin_dir} - install -m 600 ntpq.conf ${D}/${local_plugin_dir} - install -m 600 interface.conf ${D}/${local_plugin_dir} - install -m 600 remotels.conf ${D}/${local_plugin_dir} - install -m 600 ptp.conf ${D}/${local_plugin_dir} - install -m 600 ovs_interface.conf ${D}/${local_plugin_dir} + install -m 600 python_plugins.conf ${D}/${local_default_plugin_dir} + install -m 600 cpu.conf ${D}/${local_default_plugin_dir} + install -m 600 memory.conf ${D}/${local_default_plugin_dir} + install -m 600 df.conf ${D}/${local_default_plugin_dir} + install -m 600 ntpq.conf ${D}/${local_default_plugin_dir} + install -m 600 interface.conf ${D}/${local_default_plugin_dir} + install -m 600 remotels.conf ${D}/${local_default_plugin_dir} + install -m 600 ptp.conf ${D}/${local_default_plugin_dir} + install -m 600 ovs_interface.conf ${D}/${local_default_plugin_dir} }