Add pfSense-pkg-node_exporter #653
Conversation
Signed-off-by: Calle Pettersson <calle@cape.nu>
|
@jim-p Sorry for direct ping, but it is not clear to me if I missed some step here to trigger someone to take a look, or if it just summertime and things are moving slow? |
|
@jim-p Ping? |
|
You didn't miss anything, as soon as we have some spare cycles to review it, we'll review it. Thanks! |
sysutils/pfSense-pkg-node_exporter/files/usr/local/etc/rc.conf.d/node_exporter
Outdated
Show resolved
Hide resolved
|
I've pushed fixes for the comments, thanks for taking a look @rbgarga! |
sysutils/pfSense-pkg-node_exporter/files/usr/local/pkg/node_exporter.inc
Outdated
Show resolved
Hide resolved
sysutils/pfSense-pkg-node_exporter/files/usr/local/pkg/node_exporter.inc
Outdated
Show resolved
Hide resolved
sysutils/pfSense-pkg-node_exporter/files/usr/local/pkg/node_exporter.inc
Outdated
Show resolved
Hide resolved
sysutils/pfSense-pkg-node_exporter/files/usr/local/pkg/node_exporter.inc
Outdated
Show resolved
Hide resolved
sysutils/pfSense-pkg-node_exporter/files/usr/local/pkg/node_exporter.inc
Outdated
Show resolved
Hide resolved
...nse-pkg-node_exporter/files/usr/local/share/pfSense-pkg-node_exporter/interface-collector.py
Show resolved
Hide resolved
|
Thanks @jim-p! Updated as per your suggestions |
|
|
||
| do-install: | ||
| ${MKDIR} ${STAGEDIR}${PREFIX}/pkg | ||
| ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d |
There was a problem hiding this comment.
No files are going to be installed here, no need to create this directory.
| ${MKDIR} ${STAGEDIR}${DATADIR} | ||
| ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/node_exporter.xml ${STAGEDIR}${PREFIX}/pkg | ||
| ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/node_exporter.inc ${STAGEDIR}${PREFIX}/pkg | ||
| ${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/rc.conf.d/node_exporter ${STAGEDIR}${PREFIX}/etc/rc.conf.d/ |
There was a problem hiding this comment.
This file doesn't exist, do not try to install it
| @@ -0,0 +1,68 @@ | |||
| #!/bin/sh | |||
There was a problem hiding this comment.
This file seems to be a copy of sysutils/node_exporter init script, we don't need to carry it here
| ${INSTALL_DATA} ${FILESDIR}${PREFIX}/pkg/node_exporter.inc ${STAGEDIR}${PREFIX}/pkg | ||
| ${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/rc.conf.d/node_exporter ${STAGEDIR}${PREFIX}/etc/rc.conf.d/ | ||
| ${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml ${STAGEDIR}${DATADIR} | ||
| ${INSTALL_SCRIPT} ${FILESDIR}${DATADIR}/node_exporter.sh ${STAGEDIR}${DATADIR} |
There was a problem hiding this comment.
If this file is really a copy of sysutils/node_exporter init script, we don't need to carry it here and it should be removed
| ${INSTALL_DATA} ${FILESDIR}${PREFIX}/etc/rc.conf.d/node_exporter ${STAGEDIR}${PREFIX}/etc/rc.conf.d/ | ||
| ${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml ${STAGEDIR}${DATADIR} | ||
| ${INSTALL_SCRIPT} ${FILESDIR}${DATADIR}/node_exporter.sh ${STAGEDIR}${DATADIR} | ||
| ${INSTALL_SCRIPT} ${FILESDIR}${DATADIR}/interface-collector.py ${STAGEDIR}${DATADIR} |
There was a problem hiding this comment.
Since this package is installing a python script, we need to have USES= python to make sure python is installed as a dependency. If it requires any extra python module available on ports, it also should be added to RUN_DEPENDS
|
Thanks @rbgarga! Pushed fixes now |
|
I've manually merged it to incorporate some ports specific changes. Also opened a redmine ticket to track it - https://redmine.pfsense.org/issues/9974. Thanks! |
This PR adds a pfSense package for node_exporter. It also bumps the existing node_exporter port version.
Tested on 2.4.4-r3.
Note to the reviewer: I've never really touched FreeBSD itself outside of pfSense before, as well as not having any previous experience with the pfSense package, so probably makes sense to check for silly mistakes or misunderstandings.