Merge branch 'main' into web-external-url

Author: kwilt

CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.28.0 / 2025-05-07
+
+BREAKING CHANGES:
+
+In this version of the exporter the sysUpTime metric has been removed from the if_mib module and 
+is now part of the new system module, along with other useful system related metrics.
+Please update your scrape definitions to include the system module if you need sysUpTime.
+
+* [ENHANCEMENT] allow module-qualified labels in generator #1333
+* [ENHANCEMENT] add healthcheck endpoint #1358
+* [ENHANCEMENT] Override Metric Name in Generator #1341
+* [BUGFIX] cleanup docker container after running #1330
+
+snmp.yml changes:
+* moved system related oids to the new system module #1334
+* add UBNT AirOS module, DLink and Eltex MES #1344
+* add JunOS module #1348
+* enhancements on the hrStorage module, cleanup unused lookups for mikrotik module #1349
+* update JunOS module and add Juniper Optics (DOM) module #1351
+* added page counters to the printer module #1353
+
 ## 0.27.0 / 2025-01-03
 BREAKING CHANGES:
 

VERSION

@@ -1 +1 @@
-0.27.0
+0.28.0

generator/generator.yml

@@ -602,6 +602,8 @@ modules:
       - prtAlertCriticalEvents
       - prtAlertAllEvents
       - prtCoverStatus
+      - prtMarkerLifeCount
+      - prtMarkerPowerOnCount
       - prtMarkerSuppliesDescription
       - prtMarkerSuppliesLevel
       - prtMarkerSuppliesMaxCapacity

snmp.yml

@@ -35008,6 +35008,8 @@ modules:
         value. - 1.3.6.1.4.1.935.1.1.1.9.2.4
   printer_mib:
     walk:
+    - 1.3.6.1.2.1.43.10.2.1.4
+    - 1.3.6.1.2.1.43.10.2.1.5
     - 1.3.6.1.2.1.43.11.1.1.5
     - 1.3.6.1.2.1.43.11.1.1.6
     - 1.3.6.1.2.1.43.11.1.1.8
@@ -35020,6 +35022,27 @@ modules:
     - 1.3.6.1.2.1.43.5.1.1.3
     - 1.3.6.1.2.1.43.6.1.1.3
     metrics:
+    - name: prtMarkerLifeCount
+      oid: 1.3.6.1.2.1.43.10.2.1.4
+      type: counter
+      help: The count of the number of units of measure counted during the life of
+        printer using units of measure as specified by prtMarkerCounterUnit - 1.3.6.1.2.1.43.10.2.1.4
+      indexes:
+      - labelname: hrDeviceIndex
+        type: gauge
+      - labelname: prtMarkerIndex
+        type: gauge
+    - name: prtMarkerPowerOnCount
+      oid: 1.3.6.1.2.1.43.10.2.1.5
+      type: counter
+      help: The count of the number of units of measure counted since the equipment
+        was most recently powered on using units of measure as specified by prtMarkerCounterUnit.
+        - 1.3.6.1.2.1.43.10.2.1.5
+      indexes:
+      - labelname: hrDeviceIndex
+        type: gauge
+      - labelname: prtMarkerIndex
+        type: gauge
     - name: prtMarkerSuppliesType
       oid: 1.3.6.1.2.1.43.11.1.1.5
       type: gauge