Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/CHANGES 2013-03-08 14:21:37 UTC (rev 11696)
@@ -4,6 +4,7 @@
ENHANCEMENTS:
REST API has a convertuoms=1 parameter to convert performance data uoms into their base values (eg, MB to bytes, ms to seconds)
SNMP throughput thresholds now have an expanded syntax to handle input and output throughput separately as well as ranges
+ Remove some more specific words from SNMP interface ifDescr to reduce instances of duplicate interface ids being used (level 4 added)
NOTICES:
FIXES:
Modified: trunk/opsview-core/lib/Opsview/Utils/SnmpInterfaces.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Utils/SnmpInterfaces.pm 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-core/lib/Opsview/Utils/SnmpInterfaces.pm 2013-03-08 14:21:37 UTC (rev 11696)
@@ -62,6 +62,9 @@
push( @remove_words,
'PCI Express', 'Quad Port', 'Gigabit', 'Server', );
}
+ if ( $level >= 4 ) {
+ push( @remove_words, 'Corrigent systems', ', , ' );
+ }
foreach my $word (@remove_words) {
$ifdescr =~ s/$word//g;
Modified: trunk/opsview-core/t/850queryhost.t
===================================================================
--- trunk/opsview-core/t/850queryhost.t 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-core/t/850queryhost.t 2013-03-08 14:21:37 UTC (rev 11696)
@@ -37,9 +37,14 @@
( 'HP NC375T PCI Express Quad Port Gigabit Server Adapter' =>
'HP NC375T Adapter', );
+my %level_4_tests =
+ ( 'Corrigent systems, , Ethernet 10 Gigabit interface-1376796672' =>
+ 'Ethernet 10 interface-1376796672', );
+
run_tests( 0, %level_0_tests );
run_tests( 1, %level_1_tests );
run_tests( 3, %level_3_tests );
+run_tests( 4, %level_4_tests );
done_testing();
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -881,6 +881,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr ""
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Schlüsselwörter"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/es.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -893,6 +893,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr ""
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Palabras clave"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/fr.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -879,6 +879,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr ""
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Mots-clés"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -943,6 +943,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr "Level 3"
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr "Level 4"
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Keywords"
@@ -4410,8 +4413,8 @@
msgid "ui.status.service.label.summary.forDowntime %1"
msgstr "Service Status for Downtime Starting At %1"
+#. (failed_services)
#. (host.services.size)
-#. (failed_services)
msgid "ui.status.service.servicesFailed %1"
msgstr "Services failed: %1"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/it.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -879,6 +879,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr "Livello 3"
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr ""
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Parole chiave"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/pl.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -877,6 +877,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr ""
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Słowa Kluczowe"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/sv.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2013-03-08 14:21:37 UTC (rev 11696)
@@ -878,6 +878,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l4"
+msgstr ""
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Nyckelord"
Modified: trunk/opsview-web/root/admin/host/interfaces
===================================================================
--- trunk/opsview-web/root/admin/host/interfaces 2013-03-08 14:17:37 UTC (rev 11695)
+++ trunk/opsview-web/root/admin/host/interfaces 2013-03-08 14:21:37 UTC (rev 11696)
@@ -39,13 +39,14 @@
popup_menu(
form_label => c.loc("ui.admin.host.edit.label.ifDescrLevel"),
name => "tidy_ifdescr_level",
- values => ["0", "1", "2", "3"],
+ values => ["0", "1", "2", "3", "4"],
default => "0",
labels => {
"0" => c.loc("ui.admin.host.edit.label.ifDescrLevel.l0"),
"1" => c.loc("ui.admin.host.edit.label.ifDescrLevel.l1"),
"2" => c.loc("ui.admin.host.edit.label.ifDescrLevel.l2"),
"3" => c.loc("ui.admin.host.edit.label.ifDescrLevel.l3"),
+ "4" => c.loc("ui.admin.host.edit.label.ifDescrLevel.l4"),
},
help_keyword => "snmp_ifdescr_level",
helpline => c.loc("ui.admin.host.edit.helpline.ifDescrLevel"),
