Skip to content

snmp-ups: debug when static entries are skipped; fix ups.test.date in apc-mib to be semi-static #3012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 2 commits into from
Jul 11, 2025
Merged

snmp-ups: debug when static entries are skipped; fix ups.test.date in apc-mib to be semi-static #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f8018f
drivers/apc-mib.c, NEWS.adoc: fix "ups.test.date" from SU_FLAG_STATIC…
jimklimov Jul 10, 2025
21dfb5c
drivers/snmp-ups.c, NEWS.adoc: fix debug-logging of skipping SU_FLAG_…
jimklimov Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions NEWS.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,12 @@ https://github.com/networkupstools/nut/milestone/9
* Converted to NUT standard use of `status_set()` with single-token values.
[issue #2708]

- `snmp-ups` driver updates:
* Fixed `ups.test.date` to be semi-static in `apc-mib` mapping, so it
would be queried more than once per driver up-time. [issue #3011]
* Fixed debug-logging around `SU_FLAG_STATIC` entries to clarify when
they get skipped. [issue #3011]

- `usbhid-ups` driver updates:
* The `cps-hid` subdriver's existing mechanism for fixing broken report
descriptors was extended to cover a newly reported case of nominal UPS
Expand Down
4 changes: 2 additions & 2 deletions drivers/apc-mib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "apc-mib.h"

#define APCC_MIB_VERSION "1.60"
#define APCC_MIB_VERSION "1.61"

#define APC_UPS_DEVICE_MODEL ".1.3.6.1.4.1.318.1.1.1.1.1.1.0"
/* FIXME: Find a better oid_auto_check vs. sysOID for this one? */
Expand Down Expand Up @@ -249,7 +249,7 @@ static snmp_info_t apcc_mib[] = {
snmp_info_default("battery.date", ST_FLAG_STRING | ST_FLAG_RW, 8, ".1.3.6.1.4.1.318.1.1.1.2.1.3.0", "", SU_FLAG_OK | SU_FLAG_STATIC, NULL),
snmp_info_default("ups.id", ST_FLAG_STRING | ST_FLAG_RW, 8, ".1.3.6.1.4.1.318.1.1.1.1.1.2.0", "", SU_FLAG_OK | SU_FLAG_STATIC, NULL),
snmp_info_default("ups.test.result", ST_FLAG_STRING, SU_INFOSIZE, APCC_OID_TESTDIAGRESULTS, "", SU_FLAG_OK, apcc_testdiag_results),
snmp_info_default("ups.test.date", ST_FLAG_STRING | ST_FLAG_RW, 8, ".1.3.6.1.4.1.318.1.1.1.7.2.4.0", "", SU_FLAG_OK | SU_FLAG_STATIC, NULL),
snmp_info_default("ups.test.date", ST_FLAG_STRING | ST_FLAG_RW, 8, ".1.3.6.1.4.1.318.1.1.1.7.2.4.0", "", SU_FLAG_OK | SU_FLAG_SEMI_STATIC, NULL),
snmp_info_default("output.voltage", 0, 0.1, ".1.3.6.1.4.1.318.1.1.1.4.3.1.0", "", SU_FLAG_OK | SU_FLAG_UNIQUE, NULL),
snmp_info_default("output.voltage", 0, 1, ".1.3.6.1.4.1.318.1.1.1.4.2.1.0", "", SU_FLAG_OK, NULL),
snmp_info_default("output.phases", ST_FLAG_STRING, 2, ".1.3.6.1.4.1.318.1.1.1.9.3.2.1.2.1", "", SU_FLAG_STATIC | SU_FLAG_OK, NULL),
Expand Down
12 changes: 9 additions & 3 deletions drivers/snmp-ups.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ static const char *mibname;
static const char *mibvers;

#define DRIVER_NAME "Generic SNMP UPS driver"
#define DRIVER_VERSION "1.35"
#define DRIVER_VERSION "1.36"

/* driver description structure */
upsdrv_info_t upsdrv_info = {
Expand Down Expand Up @@ -3201,13 +3201,16 @@ bool_t snmp_ups_walk(int mode)
}

/* skip static elements in update mode */
if ((mode == SU_WALKMODE_UPDATE) && (su_info_p->flags & SU_FLAG_STATIC))
if ((mode == SU_WALKMODE_UPDATE) && (su_info_p->flags & SU_FLAG_STATIC)) {
upsdebugx(1, "Skipping static entry %s", su_info_p->OID);
continue;
}

/* Set default value if we cannot fetch it */
/* and set static flag on this element.
* Not applicable to outlets (need SU_FLAG_STATIC tagging) */
if ((su_info_p->flags & SU_FLAG_ABSENT)
if (
(su_info_p->flags & SU_FLAG_ABSENT)
&& !(su_info_p->flags & SU_OUTLET)
&& !(su_info_p->flags & SU_OUTLET_GROUP)
&& !(su_info_p->flags & SU_AMBIENT_TEMPLATE))
Expand All @@ -3229,6 +3232,9 @@ bool_t snmp_ups_walk(int mode)
/* Set default value if we cannot fetch it from ups. */
su_setinfo(su_info_p, NULL);
}
upsdebugx(1, "Defaulting absent entry and setting to static: %s", su_info_p->OID);
} else {
upsdebugx(1, "Setting absent entry to static (no defautl provided): %s", su_info_p->OID);
}
su_info_p->flags |= SU_FLAG_STATIC;
}
Expand Down