From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 3/3] Added new node_exporter 1.2.0 package. Date: Mon, 26 Jul 2021 16:26:48 +0100 Message-ID: In-Reply-To: <20210724185639.3469623-4-holger.sunke@posteo.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3873343983186629596==" List-Id: --===============3873343983186629596== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, There are some minor issues left in here... > On 24 Jul 2021, at 19:56, Holger Sunke wrote: >=20 > --- > config/node_exporter/node_exporter_options | 203 +++++++++++++++++++++ > config/rootfiles/packages/node_exporter | 4 + > lfs/node_exporter | 98 ++++++++++ > make.sh | 1 + > src/initscripts/packages/node_exporter | 39 ++++ > src/paks/node_exporter/install.sh | 31 ++++ > src/paks/node_exporter/uninstall.sh | 30 +++ > src/paks/node_exporter/update.sh | 27 +++ > src/scripts/node_exporter_starter.sh | 7 + > 9 files changed, 440 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 > create mode 100644 src/scripts/node_exporter_starter.sh >=20 > diff --git a/config/node_exporter/node_exporter_options b/config/node_expor= ter/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 be= low: > + > +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 =20 > +# Expose expensive priority stats. > +# --collector.cpu.info Enables metric cpu_info > +# --collector.cpu.info.flags-include=3DCOLLECTOR.CPU.INFO.FLAGS-INCLU= DE =20 > +# Filter the `flags` field in cpuInfo with= a > +# value that must be a regular expression > +# --collector.cpu.info.bugs-include=3DCOLLECTOR.CPU.INFO.BUGS-INCLUDE= =20 > +# 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+$" =20 > +# Regexp of devices to ignore for diskstat= s. > +# --collector.filesystem.ignored-mount-points=3D"^/(dev|proc|sys|var/= lib/docker/.+)($|/)" =20 > +# Regexp of mount points to ignore for fil= esystem > +# collector. > +# --collector.filesystem.ignored-fs-types=3D"^(autofs|binfmt_misc|bpf= |cgroup2?|configfs|debugfs|devpts|devtmpfs|fusectl|hugetlbfs|iso9660|mqueue|n= sfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs= |tracefs)$" =20 > +# 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" =20 > +# Comma separated list for IPVS backend st= ats > +# labels. > +# --collector.netclass.ignored-devices=3D"^$" =20 > +# Regexp of net devices to ignore for netc= lass > +# collector. > +# --collector.netdev.device-include=3DCOLLECTOR.NETDEV.DEVICE-INCLUDE= =20 > +# Regexp of net devices to include (mutual= ly > +# exclusive to device-exclude). > +# --collector.netdev.device-exclude=3DCOLLECTOR.NETDEV.DEVICE-EXCLUDE= =20 > +# Regexp of net devices to exclude (mutual= ly > +# exclusive to device-include). > +# --collector.netstat.fields=3D"^(.*_(InErrors|InErrs)|Ip_Forwarding|= Ip(6|Ext)_(InOctets|OutOctets)|Icmp6?_(InMsgs|OutMsgs)|TcpExt_(Listen.*|Synco= okies.*|TCPSynRetrans)|Tcp_(ActiveOpens|InSegs|OutSegs|OutRsts|PassiveOpens|R= etransSegs|CurrEstab)|Udp6?_(InDatagrams|OutDatagrams|NoPorts|RcvbufErrors|Sn= dbufErrors))$" =20 > +# Regexp of fields to return for netstat > +# collector. > +# --collector.ntp.server=3D"127.0.0.1" =20 > +# NTP server to use for ntp collector > +# --collector.ntp.protocol-version=3D4 =20 > +# NTP protocol version > +# --collector.ntp.server-is-local =20 > +# Certify that collector.ntp.server addres= s 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 =20 > +# Max accumulated distance to the root > +# --collector.ntp.local-offset-tolerance=3D1ms =20 > +# Offset between local clock and local ntp= d 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 s= hould be > +# collected > +# --collector.perf.tracepoint=3DCOLLECTOR.PERF.TRACEPOINT ... =20 > +# perf tracepoint that should be collected > +# --collector.powersupply.ignored-supplies=3D"^$" =20 > +# Regexp of power supplies to ignore for > +# powersupplyclass collector. > +# --collector.qdisc.fixtures=3D"" =20 > +# test fixtures to use for qdisc collector > +# end-to-end testing > +# --collector.runit.servicedir=3D"/etc/service" =20 > +# Path to runit service directory. > +# --collector.supervisord.url=3D"http://localhost:9001/RPC2" =20 > +# XML RPC endpoint. > +# --collector.systemd.unit-include=3D".+" =20 > +# Regexp of systemd units to include. Unit= s must > +# both match include and not match exclude= to be > +# included. > +# --collector.systemd.unit-exclude=3D".+\\.(automount|device|mount|sc= ope|slice)" =20 > +# Regexp of systemd units to exclude. Unit= s must > +# both match include and not match exclude= to be > +# included. > +# --collector.systemd.enable-task-metrics =20 > +# Enables service unit tasks metrics > +# unit_tasks_current and unit_tasks_max > +# --collector.systemd.enable-restarts-metrics =20 > +# Enables service unit metric > +# service_restart_total > +# --collector.systemd.enable-start-time-metrics =20 > +# Enables service unit metric > +# unit_start_time_seconds > +# --collector.textfile.directory=3D"" =20 > +# Directory to read text files with metric= s from. > +# --collector.vmstat.fields=3D"^(oom_kill|pgpg|pswp|pg.*fault).*" =20 > +# Regexp of fields to return for vmstat > +# collector. > +# --collector.wifi.fixtures=3D"" =20 > +# test fixtures to use for wifi collector = metrics > +# --collector.arp Enable the arp collector (default: enabl= ed). > +# --collector.bcache Enable the bcache collector (default: en= abled). > +# --collector.bonding Enable the bonding collector (default: > +# enabled). > +# --collector.btrfs Enable the btrfs collector (default: ena= bled). > +# --collector.buddyinfo Enable the buddyinfo collector (default: > +# disabled). > +# --collector.conntrack Enable the conntrack collector (default: > +# enabled). > +# --collector.cpu Enable the cpu collector (default: enabl= ed). > +# --collector.cpufreq Enable the cpufreq collector (default: > +# enabled). > +# --collector.diskstats Enable the diskstats collector (default: > +# enabled). > +# --collector.drbd Enable the drbd collector (default: disa= bled). > +# --collector.edac Enable the edac collector (default: enab= led). > +# --collector.entropy Enable the entropy collector (default: > +# enabled). > +# --collector.fibrechannel Enable the fibrechannel collector (defau= lt: > +# enabled). > +# --collector.filefd Enable the filefd collector (default: en= abled). > +# --collector.filesystem Enable the filesystem collector (default: > +# enabled). > +# --collector.hwmon Enable the hwmon collector (default: ena= bled). > +# --collector.infiniband Enable the infiniband collector (default: > +# enabled). > +# --collector.interrupts Enable the interrupts collector (default: > +# disabled). > +# --collector.ipvs Enable the ipvs collector (default: enab= led). > +# --collector.ksmd Enable the ksmd collector (default: disa= bled). > +# --collector.loadavg Enable the loadavg collector (default: > +# enabled). > +# --collector.logind Enable the logind collector (default: > +# disabled). > +# --collector.mdadm Enable the mdadm collector (default: ena= bled). > +# --collector.meminfo Enable the meminfo collector (default: > +# enabled). > +# --collector.meminfo_numa Enable the meminfo_numa collector (defau= lt: > +# disabled). > +# --collector.mountstats Enable the mountstats collector (default: > +# disabled). > +# --collector.netclass Enable the netclass collector (default: > +# enabled). > +# --collector.netdev Enable the netdev collector (default: en= abled). > +# --collector.netstat Enable the netstat collector (default: > +# enabled). > +# --collector.network_route Enable the network_route collector (defa= ult: > +# disabled). > +# --collector.nfs Enable the nfs collector (default: enabl= ed). > +# --collector.nfsd Enable the nfsd collector (default: enab= led). > +# --collector.ntp Enable the ntp collector (default: disab= led). > +# --collector.perf Enable the perf collector (default: disa= bled). > +# --collector.powersupplyclass =20 > +# Enable the powersupplyclass collector (d= efault: > +# enabled). > +# --collector.pressure Enable the pressure collector (default: > +# enabled). > +# --collector.processes Enable the processes collector (default: > +# disabled). > +# --collector.qdisc Enable the qdisc collector (default: dis= abled). > +# --collector.rapl Enable the rapl collector (default: enab= led). > +# --collector.runit Enable the runit collector (default: dis= abled). > +# --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: enab= led). > +# --collector.supervisord Enable the supervisord collector (defaul= t: > +# 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 (defau= lt: > +# enabled). > +# --collector.time Enable the time collector (default: enab= led). > +# --collector.timex Enable the timex collector (default: ena= bled). > +# --collector.udp_queues Enable the udp_queues collector (default: > +# enabled). > +# --collector.uname Enable the uname collector (default: ena= bled). > +# --collector.vmstat Enable the vmstat collector (default: en= abled). > +# --collector.wifi Enable the wifi collector (default: disa= bled). > +# --collector.xfs Enable the xfs collector (default: enabl= ed). > +# --collector.zfs Enable the zfs collector (default: enabl= ed). > +# --collector.zoneinfo Enable the zoneinfo collector (default: > +# disabled). > +# --web.listen-address=3D":9100" =20 > +# Address on which to expose metrics and w= eb > +# interface. > +# --web.telemetry-path=3D"/metrics" =20 > +# Path under which to expose metrics. > +# --web.disable-exporter-metrics =20 > +# Exclude metrics about the exporter itself > +# (promhttp_*, process_*, go_*). > +# --web.max-requests=3D40 Maximum number of parallel scrape requ= ests. Use > +# 0 to disable. > +# --collector.disable-defaults =20 > +# Set all collectors to disabled by defaul= t. > +# --web.config=3D"" [EXPERIMENTAL] Path to config yaml fil= e that > +# can enable TLS or authentication. > +# --log.level=3Dinfo Only log messages with the given sever= ity or > +# above. One of: [debug, info, warn, error] > +# --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/pac= kages/node_exporter > new file mode 100644 > index 000000000..d20fb58a4 > --- /dev/null > +++ b/config/rootfiles/packages/node_exporter > @@ -0,0 +1,4 @@ > +usr/bin/node_exporter > +usr/bin/node_exporter_starter.sh > +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..2d9ffb916 > --- /dev/null > +++ b/lfs/node_exporter > @@ -0,0 +1,98 @@ > +##########################################################################= #### > +# = # > +# 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.2.0 > + > +THISAPP =3D node_exporter-$(VER) > +DL_FILE =3D $(THISAPP).tar.gz > +DL_FROM =3D https://github.com/prometheus/node_exporter/archive/v$(VER)/ DL_FROM should point to our server (I believe that is URL_IPFIRE) > +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 54a096edcaa0a3e1100573d603864fa6 > + > +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 startup script > + install -v -m 744 $(DIR_SRC)/src/scripts/node_exporter_starter.sh \ > + /usr/bin/node_exporter_starter.sh > + > + # install initscript > + $(call INSTALL_INITSCRIPT,node_exporter) > + > + @rm -rf $(DIR_APP) > + @$(POSTBUILD) > + > diff --git a/make.sh b/make.sh > index 83bd9faeb..3dcfaf1db 100755 > --- a/make.sh > +++ b/make.sh > @@ -1624,6 +1624,7 @@ buildipfire() { > lfsmake2 socat > lfsmake2 libcdada > lfsmake2 pmacct > + lfsmake2 node_exporter > } >=20 > buildinstaller() { > diff --git a/src/initscripts/packages/node_exporter b/src/initscripts/packa= ges/node_exporter > new file mode 100644 > index 000000000..b26caaab9 > --- /dev/null > +++ b/src/initscripts/packages/node_exporter > @@ -0,0 +1,39 @@ > +#!/bin/sh > +######################################################################## > +# Begin $rc_base/init.d/ > +# > +# Description : Prometheus Node Exporter daemon > +# > +######################################################################## > + > +. /etc/sysconfig/rc > +. ${rc_functions} > + > +case "${1}" in > + start) > + boot_mesg "Starting..." There is a description missing here. It should probably read like =E2=80=9CSt= arting Node Exporter=E2=80=A6" > + loadproc /usr/bin/node_exporter_starter.sh > + ;; > + > + stop) > + boot_mesg "Stopping..." Likewise. > + 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/ins= tall.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 USA= # > +# = # > +# 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/u= ninstall.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 USA= # > +# = # > +# 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/upda= te.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 USA= # > +# = # > +# Copyright (C) 2007-2020 IPFire-Team . = # > +# = # > +##########################################################################= ## > +# > +. /opt/pakfire/lib/functions.sh > +extract_backup_includes > +./uninstall.sh > +./install.sh > diff --git a/src/scripts/node_exporter_starter.sh b/src/scripts/node_export= er_starter.sh > new file mode 100644 > index 000000000..ec6d3582b > --- /dev/null > +++ b/src/scripts/node_exporter_starter.sh > @@ -0,0 +1,7 @@ > +#/bin/bash > + > +# read configurable OPTIONS > +. /etc/node_exporter_options > + > +/usr/bin/node_exporter $OPTIONS >> /var/log/node_exporter.log 2>&1 & > + > --=20 > 2.30.2 >=20 What is this for again? -Michael --===============3873343983186629596==--