Page MenuHomeFreeBSD
Files F149847403

D51432.1791026288.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D51432.1791026288.diff
View Options

diff --git a/sysutils/snmp_exporter/Makefile b/sysutils/snmp_exporter/Makefile
--- a/sysutils/snmp_exporter/Makefile
+++ b/sysutils/snmp_exporter/Makefile
@@ -1,7 +1,7 @@
PORTNAME= snmp_exporter
DISTVERSIONPREFIX=v
DISTVERSION= 0.29.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils
MAINTAINER= ivy@FreeBSD.org
@@ -21,6 +21,7 @@
post-install:
${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/
- ${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml.sample
+ ${INSTALL_DATA} ${WRKSRC}/snmp.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/snmp.yml.sample
+ ${INSTALL_DATA} ${WRKSRC}/generator/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml.sample
.include <bsd.port.mk>
diff --git a/sysutils/snmp_exporter/files/generator.yml b/sysutils/snmp_exporter/files/generator.yml
deleted file mode 100644
--- a/sysutils/snmp_exporter/files/generator.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-modules:
- # Default IF-MIB interfaces table with ifIndex.
- if_mib:
- walk: [sysUpTime, interfaces, ifXTable]
- # Interfaces if ifAlias is unique.
- if_mib_ifalias:
- walk: [sysUpTime, interfaces, ifXTable]
- lookups:
- - old_index: ifIndex
- new_index: ifAlias
- # Interfaces if ifDescr is unique.
- if_mib_ifdescr:
- walk: [sysUpTime, interfaces, ifXTable]
- lookups:
- - old_index: ifIndex
- new_index: ifDescr
- # Interfaces if ifName is unique.
- if_mib_ifname:
- walk: [sysUpTime, interfaces, ifXTable]
- lookups:
- - old_index: ifIndex
- # Use OID to avoid conflict with Netscaler NS-ROOT-MIB.
- new_index: 1.3.6.1.2.1.31.1.1.1.1 # ifName
diff --git a/sysutils/snmp_exporter/files/pkg-message.in b/sysutils/snmp_exporter/files/pkg-message.in
--- a/sysutils/snmp_exporter/files/pkg-message.in
+++ b/sysutils/snmp_exporter/files/pkg-message.in
@@ -1,8 +1,12 @@
[
{ type: install
message: <<EOM
-To generate the snmp.yml configuration file for snmp_exporter,
-edit %%ETCDIR%%/generator.yml and add relevant MIBs, then run
+Upstream's default configuration file has been installed as
+%%ETCDIR%%/snmp.yml.
+This configuration is suitable for most situations.
+
+To generate a custom configuration, use the configuration generator:
+edit %%ETCDIR%%/generator.yml as required, then run
snmp_exporter_generator generate
diff --git a/sysutils/snmp_exporter/pkg-plist b/sysutils/snmp_exporter/pkg-plist
--- a/sysutils/snmp_exporter/pkg-plist
+++ b/sysutils/snmp_exporter/pkg-plist
@@ -1,3 +1,4 @@
bin/snmp_exporter
bin/snmp_exporter_generator
@sample %%ETCDIR%%/generator.yml.sample
+@sample %%ETCDIR%%/snmp.yml.sample

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 11:18 AM (10 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30130159
Default Alt Text
D51432.1791026288.diff (2 KB)

Event Timeline