Skip to content

Commit d8f1464

Browse files
bastischubertbastischubert
authored
Merge branch 'main' into candlerb/1456
2 parents ba22479 + 5da4066 commit d8f1464

File tree

6 files changed

+127
-15
lines changed

6 files changed

+127
-15
lines changed

‎Makefile.common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ common-deps:
139139
update-go-deps:
140140
@echo ">> updating Go dependencies"
141141
@for m in $$($(GO) list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
142-
$(GO) get -d $$m; \
142+
$(GO) get $$m; \
143143
done
144144
$(GO) mod tidy
145145

‎generator/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ifeq ($(SELINUX_ENABLED),1)
3131
DOCKER_VOL_OPTS ?= :z
3232
endif
3333

34-
APC_URL := https://download.schneider-electric.com/files?p_Doc_Ref=APC_POWERNETMIB_EN&p_enDocType=Firmware
34+
APC_URL := https://raw.githubusercontent.com/prometheus-community/snmp/refs/heads/main/apc/PowerNet-MIB
3535
ARISTA_URL := https://www.arista.com/assets/data/docs/MIBS
3636
CISCO_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/f55dc443daff58dfc86a764047ded2248bb94e12/v2
3737
DELL_URL := https://dl.dell.com/FOLDER11196144M/1/Dell-OM-MIBS-11010_A00.zip
@@ -43,9 +43,9 @@ IANA_CHARSET_URL := https://www.iana.org/assignments/ianacharset-mib/ianacharse
4343
IANA_IFTYPE_URL := https://www.iana.org/assignments/ianaiftype-mib/ianaiftype-mib
4444
IANA_PRINTER_URL := https://www.iana.org/assignments/ianaprinter-mib/ianaprinter-mib
4545
FIELDSERVER_URL := https://media.msanet.com/NA/USA/SMC/SoftwareDownloads/FS-8704-26%20SNMP%20Standard%20MIB%20File.zip
46-
KEEPALIVED_URL := https://raw.githubusercontent.com/acassen/keepalived/v2.2.8/doc/KEEPALIVED-MIB.txt
47-
VRRP_URL := https://raw.githubusercontent.com/acassen/keepalived/v2.2.8/doc/VRRP-MIB.txt
48-
VRRPV3_URL := https://raw.githubusercontent.com/acassen/keepalived/v2.2.8/doc/VRRPv3-MIB.txt
46+
KEEPALIVED_URL := https://raw.githubusercontent.com/acassen/keepalived/v2.3.4/doc/KEEPALIVED-MIB.txt
47+
VRRP_URL := https://raw.githubusercontent.com/acassen/keepalived/v2.3.4/doc/VRRP-MIB.txt
48+
VRRPV3_URL := https://raw.githubusercontent.com/acassen/keepalived/v2.3.4/doc/VRRPv3-MIB.txt
4949
KEMP_LM_URL := https://kemptechnologies.com/files/packages/current/LM_mibs.zip
5050
MIKROTIK_URL := https://download.mikrotik.com/routeros/7.18.2/mikrotik.mib
5151
NEC_URL := https://jpn.nec.com/univerge/ix/Manual/MIB
@@ -66,7 +66,7 @@ LIEBERT_URL := https://www.vertiv.com/globalassets/documents/software/moni
6666
READYNAS_URL := https://www.downloads.netgear.com/files/ReadyNAS/READYNAS-MIB.txt
6767
READYDATAOS_URL := https://www.downloads.netgear.com/files/GDC/RD5200/READYDATA_MIB.zip
6868
SOPHOS_XG_URL := https://docs.sophos.com/nsg/sophos-firewall/MIB/SOPHOS-XG-MIB.zip
69-
POWERCOM_URL := https://www.upspowercom.com/pcm-img/Card-DA807/Upsmate_PCM.mib
69+
POWERCOM_URL := https://raw.githubusercontent.com/prometheus-community/snmp/refs/heads/main/powercom/XPPC-MIB
7070
TPLINK_DDM := https://static.tp-link.com/upload/software/2024/202402/20240229/L2-tplinkMibs.zip
7171
CISCO_CUCS_URL := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/ucs-mibs
7272
CISCO_CUCS_URL_v2 := https://raw.githubusercontent.com/cisco/cisco-mibs/refs/heads/main/v2

‎generator/generator.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -587,9 +587,9 @@ modules:
587587

588588
# keepalived
589589
#
590-
# https://github.com/acassen/keepalived/blob/v2.2.8/doc/KEEPALIVED-MIB.txt
591-
# https://github.com/acassen/keepalived/blob/v2.2.8/doc/VRRP-MIB.txt
592-
# https://github.com/acassen/keepalived/blob/v2.2.8/doc/VRRPv3-MIB.txt
590+
# https://github.com/acassen/keepalived/blob/v2.3.4/doc/KEEPALIVED-MIB.txt
591+
# https://github.com/acassen/keepalived/blob/v2.3.4/doc/VRRP-MIB.txt
592+
# https://github.com/acassen/keepalived/blob/v2.3.4/doc/VRRPv3-MIB.txt
593593
keepalived:
594594
walk:
595595
- vrrpInstanceTable # Table of VRRP instances.

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ toolchain go1.24.1
66

77
require (
88
github.com/alecthomas/kingpin/v2 v2.4.0
9-
github.com/gosnmp/gosnmp v1.40.0
9+
github.com/gosnmp/gosnmp v1.41.0
1010
github.com/itchyny/timefmt-go v0.1.6
1111
github.com/prometheus/client_golang v1.22.0
1212
github.com/prometheus/client_model v0.6.2
13-
github.com/prometheus/common v0.64.0
13+
github.com/prometheus/common v0.65.0
1414
github.com/prometheus/exporter-toolkit v0.14.0
1515
gopkg.in/yaml.v2 v2.4.0
1616
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
1414
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
1515
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1616
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
17-
github.com/gosnmp/gosnmp v1.40.0 h1:MvSqHZaNnhMKdn5IVhyYzCsVfXV1lgg6ZgLRku7FVcM=
18-
github.com/gosnmp/gosnmp v1.40.0/go.mod h1:CxVS6bXqmWZlafUj9pZUnQX5e4fAltqPcijxWpCitDo=
17+
github.com/gosnmp/gosnmp v1.41.0 h1:6RI78g2ZsbLvpvJegcV98LapszRQnbvYNKSa5WbCll4=
18+
github.com/gosnmp/gosnmp v1.41.0/go.mod h1:CxVS6bXqmWZlafUj9pZUnQX5e4fAltqPcijxWpCitDo=
1919
github.com/itchyny/timefmt-go v0.1.6 h1:ia3s54iciXDdzWzwaVKXZPbiXzxxnv1SPGFfM/myJ5Q=
2020
github.com/itchyny/timefmt-go v0.1.6/go.mod h1:RRDZYC5s9ErkjQvTvvU7keJjxUYzIISJGxm9/mAERQg=
2121
github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
@@ -42,8 +42,8 @@ github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/
4242
github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
4343
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
4444
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
45-
github.com/prometheus/common v0.64.0 h1:pdZeA+g617P7oGv1CzdTzyeShxAGrTBsolKNOLQPGO4=
46-
github.com/prometheus/common v0.64.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
45+
github.com/prometheus/common v0.65.0 h1:QDwzd+G1twt//Kwj/Ww6E9FQq1iVMmODnILtW1t2VzE=
46+
github.com/prometheus/common v0.65.0/go.mod h1:0gZns+BLRQ3V6NdaerOhMbwwRbNh9hkGINtQAsP5GS8=
4747
github.com/prometheus/exporter-toolkit v0.14.0 h1:NMlswfibpcZZ+H0sZBiTjrA3/aBFHkNZqE+iCj5EmRg=
4848
github.com/prometheus/exporter-toolkit v0.14.0/go.mod h1:Gu5LnVvt7Nr/oqTBUC23WILZepW0nffNo10XdhQcwWA=
4949
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=

‎snmp.yml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26036,6 +26036,55 @@ modules:
2603626036
indexes:
2603726037
- labelname: virtualServerIndex
2603826038
type: gauge
26039+
- name: virtualServerQuorumUpPath
26040+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.72
26041+
type: DisplayString
26042+
help: Path to command to execute when the quorum is met. - 1.3.6.1.4.1.9586.100.5.3.3.1.72
26043+
indexes:
26044+
- labelname: virtualServerIndex
26045+
type: gauge
26046+
- name: virtualServerQuorumDownPath
26047+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.73
26048+
type: DisplayString
26049+
help: Path to command to execute when the quorum is not met. - 1.3.6.1.4.1.9586.100.5.3.3.1.73
26050+
indexes:
26051+
- labelname: virtualServerIndex
26052+
type: gauge
26053+
- name: virtualServerRateCps64
26054+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.74
26055+
type: counter
26056+
help: Current connection rate for this virtual server. - 1.3.6.1.4.1.9586.100.5.3.3.1.74
26057+
indexes:
26058+
- labelname: virtualServerIndex
26059+
type: gauge
26060+
- name: virtualServerRateInPPS64
26061+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.75
26062+
type: counter
26063+
help: Current in packet rate for this virtual server. - 1.3.6.1.4.1.9586.100.5.3.3.1.75
26064+
indexes:
26065+
- labelname: virtualServerIndex
26066+
type: gauge
26067+
- name: virtualServerRateOutPPS64
26068+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.76
26069+
type: counter
26070+
help: Current out packet rate for this virtual server. - 1.3.6.1.4.1.9586.100.5.3.3.1.76
26071+
indexes:
26072+
- labelname: virtualServerIndex
26073+
type: gauge
26074+
- name: virtualServerRateInBPS64
26075+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.77
26076+
type: counter
26077+
help: Current incoming rate for this virtual server. - 1.3.6.1.4.1.9586.100.5.3.3.1.77
26078+
indexes:
26079+
- labelname: virtualServerIndex
26080+
type: gauge
26081+
- name: virtualServerRateOutBPS64
26082+
oid: 1.3.6.1.4.1.9586.100.5.3.3.1.78
26083+
type: counter
26084+
help: Current outgoing rate for this virtual server. - 1.3.6.1.4.1.9586.100.5.3.3.1.78
26085+
indexes:
26086+
- labelname: virtualServerIndex
26087+
type: gauge
2603926088
- name: realServerIndex
2604026089
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.1
2604126090
type: gauge
@@ -26569,6 +26618,69 @@ modules:
2656926618
type: gauge
2657026619
- labelname: realServerIndex
2657126620
type: gauge
26621+
- name: realServerNotifyUpPath
26622+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.56
26623+
type: DisplayString
26624+
help: Path to command to execute when this server becomes alive. - 1.3.6.1.4.1.9586.100.5.3.4.1.56
26625+
indexes:
26626+
- labelname: virtualServerIndex
26627+
type: gauge
26628+
- labelname: realServerIndex
26629+
type: gauge
26630+
- name: realServerNotifyDownPath
26631+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.57
26632+
type: DisplayString
26633+
help: Path to command to execute when this server becomes dead. - 1.3.6.1.4.1.9586.100.5.3.4.1.57
26634+
indexes:
26635+
- labelname: virtualServerIndex
26636+
type: gauge
26637+
- labelname: realServerIndex
26638+
type: gauge
26639+
- name: realServerRateCps64
26640+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.58
26641+
type: counter
26642+
help: Current connection rate for this real server. - 1.3.6.1.4.1.9586.100.5.3.4.1.58
26643+
indexes:
26644+
- labelname: virtualServerIndex
26645+
type: gauge
26646+
- labelname: realServerIndex
26647+
type: gauge
26648+
- name: realServerRateInPPS64
26649+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.59
26650+
type: counter
26651+
help: Current in packet rate for this real server. - 1.3.6.1.4.1.9586.100.5.3.4.1.59
26652+
indexes:
26653+
- labelname: virtualServerIndex
26654+
type: gauge
26655+
- labelname: realServerIndex
26656+
type: gauge
26657+
- name: realServerRateOutPPS64
26658+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.60
26659+
type: counter
26660+
help: Current out packet rate for this real server. - 1.3.6.1.4.1.9586.100.5.3.4.1.60
26661+
indexes:
26662+
- labelname: virtualServerIndex
26663+
type: gauge
26664+
- labelname: realServerIndex
26665+
type: gauge
26666+
- name: realServerRateInBPS64
26667+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.61
26668+
type: counter
26669+
help: Current incoming rate for this real server. - 1.3.6.1.4.1.9586.100.5.3.4.1.61
26670+
indexes:
26671+
- labelname: virtualServerIndex
26672+
type: gauge
26673+
- labelname: realServerIndex
26674+
type: gauge
26675+
- name: realServerRateOutBPS64
26676+
oid: 1.3.6.1.4.1.9586.100.5.3.4.1.62
26677+
type: counter
26678+
help: Current outgoing rate for this real server. - 1.3.6.1.4.1.9586.100.5.3.4.1.62
26679+
indexes:
26680+
- labelname: virtualServerIndex
26681+
type: gauge
26682+
- labelname: realServerIndex
26683+
type: gauge
2657226684
kemp_loadmaster:
2657326685
walk:
2657426686
- 1.3.6.1.4.1.12196.13.0

0 commit comments

Comments
 (0)