system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-21 18:27:22 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

prometheus_sysctl_exporter: ignore ENOENT for mibs specified on the CLI

Browse source 
They might belong to kernel modules not currently loaded, or to other
kernel versions.  Ignoring them allows the configuration to be shared
between multiple hosts.

MFC after:	2 weeks
Sponsored by:	Axcient
Reviewed by:	rew
Differential Revision: https://reviews.freebsd.org/D35540
This commit is contained in:
Alan Somers 2022-06-21 12:51:14 -06:00
parent 17a4a163df
commit 982f980b86
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
usr.sbin/prometheus_sysctl_exporter/prometheus_sysctl_exporter.c
View file

@ -67,13 +67,12 @@ oid_get_root(struct oid *o)
}
/* Obtains the OID for a sysctl by name. */
static void
static bool
oid_get_by_name(struct oid *o, const char *name)
{
o->len = nitems(o->id);
if (sysctlnametomib(name, o->id, &o->len) != 0)
err(1, "sysctl(%s)", name);
return (sysctlnametomib(name, o->id, &o->len) == 0);
}
/* Returns whether an OID is placed below another OID. */
@ -644,7 +643,15 @@ main(int argc, char *argv[])
for (i = 0; i < argc; ++i) {
struct oid o, root;
oid_get_by_name(&root, argv[i]);
if (!oid_get_by_name(&root, argv[i])) {
/*
* Ignore trees provided as arguments that
* can't be found. They might belong, for
* example, to kernel modules not currently
* loaded.
*/
continue;
}
o = root;
do {
oid_print(&o, &on, print_descriptions, exclude, include, fp);