Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/CHANGES 2012-09-05 14:55:19 UTC (rev 9952)
@@ -4,6 +4,7 @@
FEATURES:
ENHANCEMENTS:
REST API for listing currently running monitoring servers
+ Remove some specified words from device interface ifDescr information to reduce instances of duplicate interface ids being used (level 3 added)
NOTICES:
Removed runtime.opsview_monitoringclusters, which was not used
FIXES:
Modified: trunk/opsview-core/lib/Opsview/Utils/SnmpInterfaces.pm
===================================================================
--- trunk/opsview-core/lib/Opsview/Utils/SnmpInterfaces.pm 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-core/lib/Opsview/Utils/SnmpInterfaces.pm 2012-09-05 14:55:19 UTC (rev 9952)
@@ -57,6 +57,10 @@
'Nortel Ethernet',
'Nortel', 'Routing', 'Module' );
}
+ if ( $level >= 3 ) {
+ push( @remove_words,
+ 'PCI Express', 'Quad Port', 'Gigabit', 'Server', );
+ }
foreach my $word (@remove_words) {
$ifdescr =~ s/$word//g;
Modified: trunk/opsview-core/t/850queryhost.t
===================================================================
--- trunk/opsview-core/t/850queryhost.t 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-core/t/850queryhost.t 2012-09-05 14:55:19 UTC (rev 9952)
@@ -33,8 +33,13 @@
'nasty_' . chr(0) . '_chars' => 'nasty__chars',
);
+my %level_3_tests =
+ ( 'HP NC375T PCI Express Quad Port Gigabit Server Adapter' =>
+ 'HP NC375T Adapter', );
+
run_tests( 0, %level_0_tests );
run_tests( 1, %level_1_tests );
+run_tests( 3, %level_3_tests );
done_testing();
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -875,6 +875,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -887,6 +887,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -873,6 +873,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -936,6 +936,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr "Level 2"
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+msgstr "Level 3"
+
msgid "ui.admin.host.edit.label.keywords"
msgstr "Keywords"
@@ -2475,8 +2478,8 @@
msgid "ui.downtime.help.commentEmpty"
msgstr "Comment is empty"
+#. (join( "::", $c->stash->{object}->hostname, $c->stash->{object}->name)
#. ($c->stash->{object}->name)
-#. (join( "::", $c->stash->{object}->hostname, $c->stash->{object}->name)
#. (join( "::", $c->stash->{object}->hostname, $c->stash->{object}->name)
msgid "ui.downtime.help.downtimeDeletedFor %1"
msgstr "Downtime delete for %1"
@@ -4363,8 +4366,8 @@
msgid "ui.status.service.label.summary.forDowntime %1"
msgstr "Service Status for Downtime Starting At %1"
+#. (host.services.size)
#. (failed_services)
-#. (host.services.size)
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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -873,6 +873,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr "Livello 2"
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+msgstr "Livello 3"
+
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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -871,6 +871,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-09-05 14:55:19 UTC (rev 9952)
@@ -872,6 +872,9 @@
msgid "ui.admin.host.edit.label.ifDescrLevel.l2"
msgstr ""
+msgid "ui.admin.host.edit.label.ifDescrLevel.l3"
+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 2012-09-05 14:38:14 UTC (rev 9951)
+++ trunk/opsview-web/root/admin/host/interfaces 2012-09-05 14:55:19 UTC (rev 9952)
@@ -39,12 +39,13 @@
popup_menu(
form_label => c.loc("ui.admin.host.edit.label.ifDescrLevel"),
name => "tidy_ifdescr_level",
- values => ["0", "1", "2"],
+ values => ["0", "1", "2", "3"],
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"),
},
help_keyword => "snmp_ifdescr_level",
helpline => c.loc("ui.admin.host.edit.helpline.ifDescrLevel"),
