[ptxdist] [PATCH 1/2] net-snmp: improve help texts and defaults

[ptxdist] [PATCH 1/2] net-snmp: improve help texts and defaults

[Alexander Dahl]

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/net-snmp.in   |   12 +++++++++---
 rules/net-snmp.make |    4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index aed84a8..95b7d43 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -109,7 +109,11 @@ config NET_SNMP_MIB_MODULES
 config NET_SNMP_DEFAULT_MIBS
 	prompt "default mib id's to read"
 	string
-	default	""
+	default	"SNMPv2-MIB:IF-MIB:IP-MIB:TCP-MIB:UDP-MIB"
+	help
+	  Colon separated list of default mib IDs to read. (The default list
+	  is "SNMPv2-MIB:IF-MIB:IP-MIB:TCP-MIB:UDP-MIB" with the addition of
+	  any mibs used by the mib modules the agent is configured with)
 
 config NET_SNMP_MIB_INSTALL_DIR
 	prompt "directory to install mib files"
@@ -117,8 +121,10 @@ config NET_SNMP_MIB_INSTALL_DIR
 	default	"/usr/share/snmp/mibs"
 
 config NET_SNMP_DOM_SOCK_ONLY
-	bool "Only allow domain socket connections to the agent" if NET_SNMP_AGENT
+	bool "Disable UDP/TCP transports for agentx" if NET_SNMP_AGENT
 	default y
 	help
-	  Enable this to disable TCP and UDP connections to the agent.
+	  Enable this to disable TCP and UDP connections for subagent
+	  connections with AgentX protocol. Only unix socket connections are
+	  allowed then.
 endif
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 7a25043..894946b 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -54,8 +54,8 @@ NET_SNMP_AUTOCONF := \
 	--disable-privacy \
 	--disable-internal-md5 \
 	--$(call ptx/endis, PTXCONF_NET_SNMP_DOM_SOCK_ONLY)-agentx-dom-sock-only \
-	--disable-mib-config-checking \
-	--disable-mfd-rewrites \
+	--enable-mib-config-checking \
+	--enable-mfd-rewrites \
 	--disable-testing-code \
 	--disable-reentrant \
 	--disable-embedded-perl \
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] net-snmp: added extra menu entries for mib modules

[Alexander Dahl]

Previously the MIB modules to be compiled where specified in a space
separated list only. Other packages depending on special modules could
not easily set a dependency. Now there are some extra menu entries to
be referenced by other packages and still the old list. Both are
integrated at build time.

Signed-off-by: Alexander Dahl <post@lespocky.de>
---
 rules/net-snmp.in   |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 rules/net-snmp.make |    9 ++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 95b7d43..a36a915 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -6,6 +6,7 @@ menuconfig NET_SNMP
 	select GCCLIBS_GCC_S	if NET_SNMP_AGENT
 	select LIBC_DL		if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
 	select LIBNL		if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
+	select LM_SENSORS	if NET_SNMP_MIB_MODULES_LM_SENSORS
 
 if NET_SNMP
 
@@ -101,10 +102,57 @@ config NET_SNMP_PERSISTENT_DIR
 	string
 	default	"/var/net-snmp"
 
+menu "additional mib modules        "
+
+config NET_SNMP_MIB_MODULES_AGENTX
+	prompt "agentx"
+	bool
+	help
+	  AgentX support (includes both agentx/master and agentx/client).
+
+config NET_SNMP_MIB_MODULES_UCD_SNMP
+	prompt "ucd_snmp"
+	bool
+	help
+	  UCD-SNMP-MIB specific extensions.
+
+config NET_SNMP_MIB_MODULES_LM_SENSORS
+	prompt "ucd-snmp/lmsensorsMib"
+	bool
+	help
+	  hardware monitoring (LM-SENSORS-MIB)
+
 config NET_SNMP_MIB_MODULES
 	prompt "additional mib modules"
 	string
 	default	""
+	help
+	  space separated list of optional modules
+	    tunnel               Linux TUNNEL-MIB support (ifTable extension)
+	    mibII/interfaces     (old ifTable implementation)
+	    misc/ipfwacc         accounting rules IP firewall information
+	    ipfwchains/ipfwchains  firewall chains under ipfw
+	    sctp-mib             support for the SCTP-MIB
+	    etherlike-mib        support for the EtherLike-MIB
+
+config NET_SNMP_WITHOUT_MIB_MODULES
+	prompt "without these mib modules"
+	string
+	default ""
+	help
+	  space separated list of default mib modules compiled into the
+	  agent (which can be removed):
+	    mibII                  support for the mib-II tree.
+	    snmpv3mibs             support for the snmpv3 mib modules.
+	    agent_mibs             NET-SNMP-AGENT-MIB extensions
+	    notification           mibs supporting specification of trap destinations.
+	    target                 Support for the SNMP WGs TARGET-MIB.
+	    utilities              general agent configuration utilities.
+	    disman/event           support for the DISMAN-EVENT-MIB
+	    disman/schedule        support for the DISMAN-SCHEDULE-MIB
+	    host                   host resources mib support.
+
+endmenu
 
 config NET_SNMP_DEFAULT_MIBS
 	prompt "default mib id's to read"
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 894946b..fca6417 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -33,6 +33,12 @@ NET_SNMP_PATH	:= PATH=$(CROSS_PATH)
 NET_SNMP_ENV 	:= $(CROSS_ENV)
 NET_SNMP_BINCONFIG_GLOB := net-snmp-config
 
+NET_SNMP_MIB_MODULES-y	:= $(call remove_quotes,$(PTXCONF_NET_SNMP_MIB_MODULES))
+NET_SNMP_MIB_MODULES-	:= $(call remove_quotes,$(PTXCONF_NET_SNMP_WITHOUT_MIB_MODULES))
+NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_AGENTX) += agentx
+NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_UCD_SNMP) += ucd_snmp
+NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_LM_SENSORS) += ucd-snmp/lmsensorsMib
+
 #
 # autoconf
 #
@@ -42,7 +48,8 @@ NET_SNMP_AUTOCONF := \
 	--with-defaults \
 	--disable-manuals \
 	--without-openssl \
-	--with-mib-modules=$(PTXCONF_NET_SNMP_MIB_MODULES) \
+	--with-mib-modules="$(NET_SNMP_MIB_MODULES-y)" \
+	--with-out-mib-modules="$(NET_SNMP_MIB_MODULES-)" \
 	--with-mibs=$(PTXCONF_NET_SNMP_DEFAULT_MIBS) \
 	--with-logfile=$(call remove_quotes,$(PTXCONF_NET_SNMP_LOGFILE)) \
 	--with-persistent-directory=$(call remove_quotes,$(PTXCONF_NET_SNMP_PERSISTENT_DIR)) \
-- 
1.7.10.4


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] net-snmp: improve help texts and defaults

[Uwe Kleine-König]

Hello Alexander,

On Wed, Sep 11, 2013 at 02:59:13PM +0200, Alexander Dahl wrote:
> --- a/rules/net-snmp.make
> +++ b/rules/net-snmp.make
> @@ -54,8 +54,8 @@ NET_SNMP_AUTOCONF := \
>  	--disable-privacy \
>  	--disable-internal-md5 \
>  	--$(call ptx/endis, PTXCONF_NET_SNMP_DOM_SOCK_ONLY)-agentx-dom-sock-only \
> -	--disable-mib-config-checking \
> -	--disable-mfd-rewrites \
> +	--enable-mib-config-checking \
> +	--enable-mfd-rewrites \
>  	--disable-testing-code \
>  	--disable-reentrant \
>  	--disable-embedded-perl \
Is this change intended? This is neither a change of help texts nor of
defaults. So it's not documented in the change log, right? What are the
effects? I didn't recheck your previous mails, but wasn't one of these
the option that you called bleeding edge?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] net-snmp: improve help texts and defaults

[Alexander Dahl]

Hei hei, 

Am 2013-09-11 15:09, schrieb Uwe Kleine-König:
>> -	--disable-mib-config-checking \
>> -	--disable-mfd-rewrites \
>> +	--enable-mib-config-checking \
>> +	--enable-mfd-rewrites \

> Is this change intended? This is neither a change of help texts nor of
> defaults. So it's not documented in the change log, right? 

Yes, intended and I would call this changing defaults. Maybe I should
have made two patches, this was the first idea.

> What are the
> effects? I didn't recheck your previous mails, but wasn't one of these
> the option that you called bleeding edge?

Sort of. 

--enable-mib-config-checking is just what it claims, the option for
additional MIB modules compiled (second patch) are checked against
conflicts, doubles and the like. Without setting this option it would
just produce a warning, with this option the build fails. For example
this would be the case if someone selects the "agentx" module with the
dedicated option and also adds it to the new without-this-mib-module
option. Disabling this check would result in silently not building the
module. This is why I would prefer to set this option.

--enable-mfd-rewrites is the "bleeding edge" one I mentioned in the
other mail. Basically what I understood the upstream guys do is
rewriting some MIB modules. Disabling this options means using the old
or even ancient not rewritten module while enabling means using the new
rewritten module. This affects MIBs like the IF-MIB which are kind of
basic. Because they also claim this is a LTS branch, I would consider it
safe to set this, but this is open to discussion. However
(re)introducing this as another option to the in rule would be fine for
me as well, but the net-snmp options are already a lot so I thought it
would be enough to set a reasonable default in net-snmp.make.

Greets
Alex

-- 
»With the first link, the chain is forged. The first speech censured,
the first thought forbidden, the first freedom denied, chains us all
irrevocably.« (Jean-Luc Picard, quoting Judge Aaron Satie)
*** GnuPG-FP: 02C8 A590 7FE5 CA5F 3601  D1D5 8FBA 7744 CC87 10D0 ***

-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] net-snmp: improve help texts and defaults

[Michael Olbrich]

Hi,

On Wed, Sep 11, 2013 at 03:26:28PM +0200, Alexander Dahl wrote:
> Am 2013-09-11 15:09, schrieb Uwe Kleine-König:
> >> -	--disable-mib-config-checking \
> >> -	--disable-mfd-rewrites \
> >> +	--enable-mib-config-checking \
> >> +	--enable-mfd-rewrites \
> 
> > Is this change intended? This is neither a change of help texts nor of
> > defaults. So it's not documented in the change log, right? 
> 
> Yes, intended and I would call this changing defaults. Maybe I should
> have made two patches, this was the first idea.
> 
> > What are the
> > effects? I didn't recheck your previous mails, but wasn't one of these
> > the option that you called bleeding edge?
> 
> Sort of. 
> 
> --enable-mib-config-checking is just what it claims, the option for
> additional MIB modules compiled (second patch) are checked against
> conflicts, doubles and the like. Without setting this option it would
> just produce a warning, with this option the build fails. For example
> this would be the case if someone selects the "agentx" module with the
> dedicated option and also adds it to the new without-this-mib-module
> option. Disabling this check would result in silently not building the
> module. This is why I would prefer to set this option.

Add a short comment to the commit message.


> --enable-mfd-rewrites is the "bleeding edge" one I mentioned in the
> other mail. Basically what I understood the upstream guys do is
> rewriting some MIB modules. Disabling this options means using the old
> or even ancient not rewritten module while enabling means using the new
> rewritten module. This affects MIBs like the IF-MIB which are kind of
> basic. Because they also claim this is a LTS branch, I would consider it
> safe to set this, but this is open to discussion. However
> (re)introducing this as another option to the in rule would be fine for
> me as well, but the net-snmp options are already a lot so I thought it
> would be enough to set a reasonable default in net-snmp.make.

Make this a separate patch and add this to the commit message.
Unless someone else disagrees, changing the default is ok for me. A
separate patch will make it easier to find if there are any problems with
it.

Michael

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
ptxdist mailing list
ptxdist@pengutronix.de