From mboxrd@z Thu Jan 1 00:00:00 1970 From: Holger Sunke To: development@lists.ipfire.org Subject: Re: [PATCH 2/2] Added new node_exporter package. Date: Wed, 09 Jun 2021 06:14:07 +0000 Message-ID: <8199c175-3834-613b-e25b-bee7891a5708@posteo.de> In-Reply-To: <62F9EA04-AD28-40DD-89AF-A00ED72DEB15@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5723989956647706365==" List-Id: --===============5723989956647706365== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello Michael, the node exporter does not have a daemon mode. I could alternatively pip the output into a log file: loadproc /usr/bin/node_exporter $OPTIONS >> /var/log/node_exporter.log=20 2>&1 & Should I add a third patch to do my fixes or adjust patch 1 & 2 each? Kind regards Holger Am 08.06.21 um 18:56 schrieb Michael Tremer: > Hello, >=20 > This looks quite good, too. >=20 > Just a minor detail below... >=20 >> On 6 Jun 2021, at 18:48, Holger Sunke wrote: >> >> --- >> config/node_exporter/node_exporter_options | 203 +++++++++++++++++++++ >> config/rootfiles/packages/node_exporter | 3 + >> lfs/node_exporter | 94 ++++++++++ >> make.sh | 1 + >> src/initscripts/packages/node_exporter | 42 +++++ >> src/paks/node_exporter/install.sh | 31 ++++ >> src/paks/node_exporter/uninstall.sh | 30 +++ >> src/paks/node_exporter/update.sh | 27 +++ >> 8 files changed, 431 insertions(+) >> create mode 100644 config/node_exporter/node_exporter_options >> create mode 100644 config/rootfiles/packages/node_exporter >> create mode 100644 lfs/node_exporter >> create mode 100644 src/initscripts/packages/node_exporter >> create mode 100644 src/paks/node_exporter/install.sh >> create mode 100644 src/paks/node_exporter/uninstall.sh >> create mode 100644 src/paks/node_exporter/update.sh >> >> diff --git a/config/node_exporter/node_exporter_options b/config/node_expo= rter/node_exporter_options >> new file mode 100644 >> index 000000000..f614b1102 >> --- /dev/null >> +++ b/config/node_exporter/node_exporter_options >> @@ -0,0 +1,203 @@ >> +# Customize node_exporter startup command line flags by editing OPTIONS b= elow: >> + >> +export OPTIONS=3D"--web.listen-address=3D:9100" >> + >> +#Flags: >> +# -h, --help Show context-sensitive help (also try >> +# --help-long and --help-man). >> +# --collector.bcache.priorityStats >> +# Expose expensive priority stats. >> +# --collector.cpu.info Enables metric cpu_info >> +# --collector.cpu.info.flags-include=3DCOLLECTOR.CPU.INFO.FLAGS-INCL= UDE >> +# Filter the `flags` field in cpuInfo wit= h a >> +# value that must be a regular expression >> +# --collector.cpu.info.bugs-include=3DCOLLECTOR.CPU.INFO.BUGS-INCLUDE >> +# Filter the `bugs` field in cpuInfo with= a value >> +# that must be a regular expression >> +# --collector.diskstats.ignored-devices=3D"^(ram|loop|fd|(h|s|v|xv)d= [a-z]|nvme\\d+n\\d+p)\\d+$" >> +# Regexp of devices to ignore for disksta= ts. >> +# --collector.filesystem.ignored-mount-points=3D"^/(dev|proc|sys|var= /lib/docker/.+)($|/)" >> +# Regexp of mount points to ignore for fi= lesystem >> +# collector. >> +# --collector.filesystem.ignored-fs-types=3D"^(autofs|binfmt_misc|bp= f|cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|= nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysf= s|tracefs)$" >> +# Regexp of filesystem types to ignore for >> +# filesystem collector. >> +# --collector.ipvs.backend-labels=3D"local_address,local_port,remote= _address,remote_port,proto,local_mark" >> +# Comma separated list for IPVS backend s= tats >> +# labels. >> +# --collector.netclass.ignored-devices=3D"^$" >> +# Regexp of net devices to ignore for net= class >> +# collector. >> +# --collector.netdev.device-include=3DCOLLECTOR.NETDEV.DEVICE-INCLUDE >> +# Regexp of net devices to include (mutua= lly >> +# exclusive to device-exclude). >> +# --collector.netdev.device-exclude=3DCOLLECTOR.NETDEV.DEVICE-EXCLUDE >> +# Regexp of net devices to exclude (mutua= lly >> +# exclusive to device-include). >> +# --collector.netstat.fields=3D"^(.*_(InErrors|InErrs)|Ip_Forwarding= |Ip(6|Ext)_(InOctets|OutOctets)|Icmp6?_(InMsgs|OutMsgs)|TcpExt_(Listen.*|Sync= ookies.*|TCPSynRetrans)|Tcp_(ActiveOpens|InSegs|OutSegs|OutRsts|PassiveOpens|= RetransSegs|CurrEstab)|Udp6?_(InDatagrams|OutDatagrams|NoPorts|RcvbufErrors|S= ndbufErrors))$" >> +# Regexp of fields to return for netstat >> +# collector. >> +# --collector.ntp.server=3D"127.0.0.1" >> +# NTP server to use for ntp collector >> +# --collector.ntp.protocol-version=3D4 >> +# NTP protocol version >> +# --collector.ntp.server-is-local >> +# Certify that collector.ntp.server addre= ss is >> +# not a public ntp server >> +# --collector.ntp.ip-ttl=3D1 IP TTL to use while sending NTP query >> +# --collector.ntp.max-distance=3D3.46608s >> +# Max accumulated distance to the root >> +# --collector.ntp.local-offset-tolerance=3D1ms >> +# Offset between local clock and local nt= pd time >> +# to tolerate >> +# --path.procfs=3D"/proc" procfs mountpoint. >> +# --path.sysfs=3D"/sys" sysfs mountpoint. >> +# --path.rootfs=3D"/" rootfs mountpoint. >> +# --collector.perf.cpus=3D"" List of CPUs from which perf metrics = should be >> +# collected >> +# --collector.perf.tracepoint=3DCOLLECTOR.PERF.TRACEPOINT ... >> +# perf tracepoint that should be collected >> +# --collector.powersupply.ignored-supplies=3D"^$" >> +# Regexp of power supplies to ignore for >> +# powersupplyclass collector. >> +# --collector.qdisc.fixtures=3D"" >> +# test fixtures to use for qdisc collector >> +# end-to-end testing >> +# --collector.runit.servicedir=3D"/etc/service" >> +# Path to runit service directory. >> +# --collector.supervisord.url=3D"http://localhost:9001/RPC2" >> +# XML RPC endpoint. >> +# --collector.systemd.unit-include=3D".+" >> +# Regexp of systemd units to include. Uni= ts must >> +# both match include and not match exclud= e to be >> +# included. >> +# --collector.systemd.unit-exclude=3D".+\\.(automount|device|mount|s= cope|slice)" >> +# Regexp of systemd units to exclude. Uni= ts must >> +# both match include and not match exclud= e to be >> +# included. >> +# --collector.systemd.enable-task-metrics >> +# Enables service unit tasks metrics >> +# unit_tasks_current and unit_tasks_max >> +# --collector.systemd.enable-restarts-metrics >> +# Enables service unit metric >> +# service_restart_total >> +# --collector.systemd.enable-start-time-metrics >> +# Enables service unit metric >> +# unit_start_time_seconds >> +# --collector.textfile.directory=3D"" >> +# Directory to read text files with metri= cs from. >> +# --collector.vmstat.fields=3D"^(oom_kill|pgpg|pswp|pg.*fault).*" >> +# Regexp of fields to return for vmstat >> +# collector. >> +# --collector.wifi.fixtures=3D"" >> +# test fixtures to use for wifi collector= metrics >> +# --collector.arp Enable the arp collector (default: enab= led). >> +# --collector.bcache Enable the bcache collector (default: e= nabled). >> +# --collector.bonding Enable the bonding collector (default: >> +# enabled). >> +# --collector.btrfs Enable the btrfs collector (default: en= abled). >> +# --collector.buddyinfo Enable the buddyinfo collector (default: >> +# disabled). >> +# --collector.conntrack Enable the conntrack collector (default: >> +# enabled). >> +# --collector.cpu Enable the cpu collector (default: enab= led). >> +# --collector.cpufreq Enable the cpufreq collector (default: >> +# enabled). >> +# --collector.diskstats Enable the diskstats collector (default: >> +# enabled). >> +# --collector.drbd Enable the drbd collector (default: dis= abled). >> +# --collector.edac Enable the edac collector (default: ena= bled). >> +# --collector.entropy Enable the entropy collector (default: >> +# enabled). >> +# --collector.fibrechannel Enable the fibrechannel collector (defa= ult: >> +# enabled). >> +# --collector.filefd Enable the filefd collector (default: e= nabled). >> +# --collector.filesystem Enable the filesystem collector (defaul= t: >> +# enabled). >> +# --collector.hwmon Enable the hwmon collector (default: en= abled). >> +# --collector.infiniband Enable the infiniband collector (defaul= t: >> +# enabled). >> +# --collector.interrupts Enable the interrupts collector (defaul= t: >> +# disabled). >> +# --collector.ipvs Enable the ipvs collector (default: ena= bled). >> +# --collector.ksmd Enable the ksmd collector (default: dis= abled). >> +# --collector.loadavg Enable the loadavg collector (default: >> +# enabled). >> +# --collector.logind Enable the logind collector (default: >> +# disabled). >> +# --collector.mdadm Enable the mdadm collector (default: en= abled). >> +# --collector.meminfo Enable the meminfo collector (default: >> +# enabled). >> +# --collector.meminfo_numa Enable the meminfo_numa collector (defa= ult: >> +# disabled). >> +# --collector.mountstats Enable the mountstats collector (defaul= t: >> +# disabled). >> +# --collector.netclass Enable the netclass collector (default: >> +# enabled). >> +# --collector.netdev Enable the netdev collector (default: e= nabled). >> +# --collector.netstat Enable the netstat collector (default: >> +# enabled). >> +# --collector.network_route Enable the network_route collector (def= ault: >> +# disabled). >> +# --collector.nfs Enable the nfs collector (default: enab= led). >> +# --collector.nfsd Enable the nfsd collector (default: ena= bled). >> +# --collector.ntp Enable the ntp collector (default: disa= bled). >> +# --collector.perf Enable the perf collector (default: dis= abled). >> +# --collector.powersupplyclass >> +# Enable the powersupplyclass collector (= default: >> +# enabled). >> +# --collector.pressure Enable the pressure collector (default: >> +# enabled). >> +# --collector.processes Enable the processes collector (default: >> +# disabled). >> +# --collector.qdisc Enable the qdisc collector (default: di= sabled). >> +# --collector.rapl Enable the rapl collector (default: ena= bled). >> +# --collector.runit Enable the runit collector (default: di= sabled). >> +# --collector.schedstat Enable the schedstat collector (default: >> +# enabled). >> +# --collector.sockstat Enable the sockstat collector (default: >> +# enabled). >> +# --collector.softnet Enable the softnet collector (default: >> +# enabled). >> +# --collector.stat Enable the stat collector (default: ena= bled). >> +# --collector.supervisord Enable the supervisord collector (defau= lt: >> +# disabled). >> +# --collector.systemd Enable the systemd collector (default: >> +# disabled). >> +# --collector.tcpstat Enable the tcpstat collector (default: >> +# disabled). >> +# --collector.textfile Enable the textfile collector (default: >> +# enabled). >> +# --collector.thermal_zone Enable the thermal_zone collector (defa= ult: >> +# enabled). >> +# --collector.time Enable the time collector (default: ena= bled). >> +# --collector.timex Enable the timex collector (default: en= abled). >> +# --collector.udp_queues Enable the udp_queues collector (defaul= t: >> +# enabled). >> +# --collector.uname Enable the uname collector (default: en= abled). >> +# --collector.vmstat Enable the vmstat collector (default: e= nabled). >> +# --collector.wifi Enable the wifi collector (default: dis= abled). >> +# --collector.xfs Enable the xfs collector (default: enab= led). >> +# --collector.zfs Enable the zfs collector (default: enab= led). >> +# --collector.zoneinfo Enable the zoneinfo collector (default: >> +# disabled). >> +# --web.listen-address=3D":9100" >> +# Address on which to expose metrics and = web >> +# interface. >> +# --web.telemetry-path=3D"/metrics" >> +# Path under which to expose metrics. >> +# --web.disable-exporter-metrics >> +# Exclude metrics about the exporter itse= lf >> +# (promhttp_*, process_*, go_*). >> +# --web.max-requests=3D40 Maximum number of parallel scrape req= uests. Use >> +# 0 to disable. >> +# --collector.disable-defaults >> +# Set all collectors to disabled by defau= lt. >> +# --web.config=3D"" [EXPERIMENTAL] Path to config yaml fi= le that >> +# can enable TLS or authentication. >> +# --log.level=3Dinfo Only log messages with the given seve= rity or >> +# above. One of: [debug, info, warn, erro= r] >> +# --log.format=3Dlogfmt Output format of log messages. One of= : [logfmt, >> +# json] >> +# --version Show application version. >> + >> diff --git a/config/rootfiles/packages/node_exporter b/config/rootfiles/pa= ckages/node_exporter >> new file mode 100644 >> index 000000000..994c8365b >> --- /dev/null >> +++ b/config/rootfiles/packages/node_exporter >> @@ -0,0 +1,3 @@ >> +usr/bin/node_exporter >> +etc/node_exporter_options >> +etc/rc.d/init.d/node_exporter >> diff --git a/lfs/node_exporter b/lfs/node_exporter >> new file mode 100644 >> index 000000000..942816754 >> --- /dev/null >> +++ b/lfs/node_exporter >> @@ -0,0 +1,94 @@ >> +#########################################################################= ##### >> +# = # >> +# IPFire.org - A linux based firewall = # >> +# Copyright (C) 2007 Michael Tremer & Christian Schmidt = # >> +# = # >> +# This program is free software: you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation, either version 3 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# This program is distributed in the hope that it will be useful, = # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >> +# GNU General Public License for more details. = # >> +# = # >> +# You should have received a copy of the GNU General Public License = # >> +# along with this program. If not, see . = # >> +# = # >> +#########################################################################= ###### >> + >> +#########################################################################= ###### >> +# Definitions >> +#########################################################################= ###### >> + >> +include Config >> + >> +VER =3D 1.1.2 >> + >> +THISAPP =3D node_exporter-$(VER) >> +DL_FILE =3D $(THISAPP).tar.gz >> +DL_FROM =3D https://github.com/prometheus/node_exporter/archive/v$(VER= )/ >> +DIR_APP =3D $(DIR_SRC)/$(THISAPP) >> +TARGET =3D $(DIR_INFO)/$(THISAPP) >> +SUP_ARCH =3D x86_64 i586 aarch64 armv5tel >> +PROG =3D node_exporter >> +PAK_VER =3D 1 >> + >> +DEPS =3D "" >> + >> +#########################################################################= ###### >> +# Top-level Rules >> +#########################################################################= ###### >> + >> +objects =3D $(DL_FILE) >> + >> +$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >> + >> +$(DL_FILE)_MD5 =3D 33c2be846dbd502f9c0efab149a8cbc5 >> + >> +install : $(TARGET) >> +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) >> + >> +download : $(patsubst %,$(DIR_DL)/%,$(objects)) >> + >> +md5 : $(subst %,%_MD5,$(objects)) >> + >> +dist : >> + @$(PAK) >> + >> +#########################################################################= ###### >> +# Downloading, checking, md5sum >> +#########################################################################= ###### >> + >> +$(patsubst %,$(DIR_CHK)/%,$(objects)) : >> + @$(CHECK) >> + >> +$(patsubst %,$(DIR_DL)/%,$(objects)) : >> + @$(LOAD) >> + >> +$(subst %,%_MD5,$(objects)) : >> + @$(MD5) >> + >> +#########################################################################= ###### >> +# Installation Details >> +#########################################################################= ###### >> + >> +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) >> + @$(PREBUILD) >> + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) >> + cd $(DIR_APP) && make build $(MAKETUNING) $(EXTRA_MAKE) >> + >> + # install compiled binary >> + cd $(DIR_APP) && cp node_exporter /usr/bin >> + >> + # install configuration file >> + install -v -m 644 $(DIR_SRC)/config/node_exporter/node_exporter_options \ >> + /etc/node_exporter_options >> + >> + # Install initscript >> + $(call INSTALL_INITSCRIPT,node_exporter) >> + >> + @rm -rf $(DIR_APP) >> + @$(POSTBUILD) >> + >> diff --git a/make.sh b/make.sh >> index 4af0081e9..671f15558 100755 >> --- a/make.sh >> +++ b/make.sh >> @@ -1632,6 +1632,7 @@ buildipfire() { >> lfsmake2 socat >> lfsmake2 libcdada >> lfsmake2 pmacct >> + lfsmake2 node_exporter >> } >> >> buildinstaller() { >> diff --git a/src/initscripts/packages/node_exporter b/src/initscripts/pack= ages/node_exporter >> new file mode 100644 >> index 000000000..b9cbc6ab9 >> --- /dev/null >> +++ b/src/initscripts/packages/node_exporter >> @@ -0,0 +1,42 @@ >> +#!/bin/sh >> +######################################################################## >> +# Begin $rc_base/init.d/ >> +# >> +# Description : Prometheus Node Exporter daemon >> +# >> +######################################################################## >> + >> +. /etc/sysconfig/rc >> +. ${rc_functions} >> + >> +# read configurable OPTIONS >> +. /etc/node_exporter_options >> + >> +case "${1}" in >> + start) >> + boot_mesg "Starting..." >=20 > The =E2=80=9CStarting=E2=80=A6=E2=80=9D line normally has the name of the p= rogram. >=20 >> + loadproc /usr/bin/node_exporter $OPTIONS > /dev/null 2>&1 & >=20 > You are throwing away the output of loadproc as well as any potential error= messages. >=20 > Does this program have a way to fork itself into the background? >=20 >> + ;; >> + >> + stop) >> + boot_mesg "Stopping..." >=20 > Same here. >=20 >> + killproc /usr/bin/node_exporter >> + ;; >> + >> + restart) >> + ${0} stop >> + sleep 1 >> + ${0} start >> + ;; >> + >> + status) >> + statusproc /usr/bin/node_exporter >> + ;; >> + >> + *) >> + echo "Usage: ${0} {start|stop|restart|status}" >> + exit 1 >> + ;; >> +esac >> + >> +# End $rc_base/init.d/ >> diff --git a/src/paks/node_exporter/install.sh b/src/paks/node_exporter/in= stall.sh >> new file mode 100644 >> index 000000000..e9272d7cb >> --- /dev/null >> +++ b/src/paks/node_exporter/install.sh >> @@ -0,0 +1,31 @@ >> +#!/bin/bash >> +#########################################################################= ### >> +# = # >> +# This file is part of the IPFire Firewall. = # >> +# = # >> +# IPFire is free software; you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation; either version 2 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# IPFire is distributed in the hope that it will be useful, = # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >> +# GNU General Public License for more details. = # >> +# = # >> +# You should have received a copy of the GNU General Public License = # >> +# along with IPFire; if not, write to the Free Software = # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US= A # >> +# = # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# = # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +extract_files >> +restore_backup ${NAME} >> +start_service --background ${NAME} >> + >> +ln -svf ../init.d/node_exporter /etc/rc.d/rc0.d/K30node_exporter >> +ln -svf ../init.d/node_exporter /etc/rc.d/rc3.d/S40node_exporter >> +ln -svf ../init.d/node_exporter /etc/rc.d/rc6.d/K30node_exporter >> diff --git a/src/paks/node_exporter/uninstall.sh b/src/paks/node_exporter/= uninstall.sh >> new file mode 100644 >> index 000000000..710baf8b4 >> --- /dev/null >> +++ b/src/paks/node_exporter/uninstall.sh >> @@ -0,0 +1,30 @@ >> +#!/bin/bash >> +#########################################################################= ### >> +# = # >> +# This file is part of the IPFire Firewall. = # >> +# = # >> +# IPFire is free software; you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation; either version 2 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# IPFire is distributed in the hope that it will be useful, = # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >> +# GNU General Public License for more details. = # >> +# = # >> +# You should have received a copy of the GNU General Public License = # >> +# along with IPFire; if not, write to the Free Software = # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US= A # >> +# = # >> +# Copyright (C) 2007 IPFire-Team . = # >> +# = # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +/etc/init.d/node_exporter stop >> +make_backup ${NAME} >> +remove_files >> + >> +rm -rfv /etc/rc.d/rc*.d/*node_exporter >> + >> diff --git a/src/paks/node_exporter/update.sh b/src/paks/node_exporter/upd= ate.sh >> new file mode 100644 >> index 000000000..99776659c >> --- /dev/null >> +++ b/src/paks/node_exporter/update.sh >> @@ -0,0 +1,27 @@ >> +#!/bin/bash >> +#########################################################################= ### >> +# = # >> +# This file is part of the IPFire Firewall. = # >> +# = # >> +# IPFire is free software; you can redistribute it and/or modify = # >> +# it under the terms of the GNU General Public License as published by = # >> +# the Free Software Foundation; either version 2 of the License, or = # >> +# (at your option) any later version. = # >> +# = # >> +# IPFire is distributed in the hope that it will be useful, = # >> +# but WITHOUT ANY WARRANTY; without even the implied warranty of = # >> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the = # >> +# GNU General Public License for more details. = # >> +# = # >> +# You should have received a copy of the GNU General Public License = # >> +# along with IPFire; if not, write to the Free Software = # >> +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US= A # >> +# = # >> +# Copyright (C) 2007-2020 IPFire-Team . = # >> +# = # >> +#########################################################################= ### >> +# >> +. /opt/pakfire/lib/functions.sh >> +extract_backup_includes >> +./uninstall.sh >> +./install.sh >> --=20 >> 2.30.2 >> >=20 --===============5723989956647706365==--