Index: /branches/rel_apv_10_7/usr/src/sys/click/app/snmp/snmp_config.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/app/snmp/snmp_config.c	(revision 40200)
+++ /branches/rel_apv_10_7/usr/src/sys/click/app/snmp/snmp_config.c	(working copy)
@@ -49,6 +49,10 @@
 int kern_snmp_set_log_level(void *pcb, uint32_t level)
 {
 	kern_snmp_config.traps_log_level = level;
+	/* Warning for potential log flooding if log level is set higher than ERR */
+	if (kern_snmp_config.traps_log_level > LOG_ERR) {
+		app_printf(pcb, "Warning: Configuring SNMP trap loglevel other than err is not recommended and might impact performance\n");
+	}
 	return 0;
 }
 
Index: /branches/rel_apv_10_7/usr/src/sys/click/app/snmp/snmp_trap.c
===================================================================
--- /branches/rel_apv_10_7/usr/src/sys/click/app/snmp/snmp_trap.c	(revision 40200)
+++ /branches/rel_apv_10_7/usr/src/sys/click/app/snmp/snmp_trap.c	(working copy)
@@ -1117,6 +1117,22 @@
 	uint32_t log_oid;
 
 	log_oid = is_snmp_trap_oid_configured(logentry->log_id);
+
+	/* TWSD-1761: Check for specific module IDs to prevent logging for non-system logs */
+	if (logentry->module_id != LOG_MOD_FC			&&
+			logentry->module_id != LOG_MOD_VA	&&
+			logentry->module_id != LOG_MOD_HW	&&
+			logentry->module_id != LOG_MOD_SYSMON	&&
+			logentry->module_id != LOG_MOD_DISKFREE	&&
+			logentry->module_id != LOG_MOD_AUTH	&&
+			logentry->module_id != LOG_MOD_ULANDMON	&&
+			logentry->module_id != LOG_MOD_IPV6	&&
+			logentry->module_id != LOG_MOD_MONITOR	&&
+			logentry->module_id != LOG_MOD_MONSYS) {
+		return 0;
+	}
+
+
 	if (TRAP_SEND_DISABLE || ((logentry->level > kern_snmp_config.traps_log_level) && log_oid == 0)) {	
 		return 0;
 	}