diff --git a/opennms-config-model/src/main/castor/translator-configuration.xsd b/opennms-config-model/src/main/castor/translator-configuration.xsd index 798f298..a870533 100644 --- a/opennms-config-model/src/main/castor/translator-configuration.xsd +++ b/opennms-config-model/src/main/castor/translator-configuration.xsd @@ -102,6 +102,7 @@ + diff --git a/opennms-config/src/main/java/org/opennms/netmgt/config/EventTranslatorConfigFactory.java b/opennms-config/src/main/java/org/opennms/netmgt/config/EventTranslatorConfigFactory.java index e005ceb..d9504b5 100644 --- a/opennms-config/src/main/java/org/opennms/netmgt/config/EventTranslatorConfigFactory.java +++ b/opennms-config/src/main/java/org/opennms/netmgt/config/EventTranslatorConfigFactory.java @@ -437,6 +437,9 @@ public final class EventTranslatorConfigFactory implements EventTranslatorConfig clonedEvent.setSeverity(null); /* the reasoning for alarmData and severity also applies to description (see NMS-4038). */ clonedEvent.setDescr(null); + if (!m_mapping.isPreserveSnmpData()) { // NMS-8374 + clonedEvent.setSnmp(null); + } return clonedEvent; }