Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/CHANGES 2013-02-21 19:12:05 UTC (rev 11577)
@@ -16,6 +16,7 @@
Fixed double escape of backslashes, which can affect Windows checks
Fixed Nagios CGI for hostnames with funny characters
Fixed SNMP - MIB-II opspack so that a dependency is set for active polled SNMP checks to have dependency on the agent
+ Fixed sensitive arguments field which was missing from UI in error
3.20130212
FEATURES:
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -1640,6 +1640,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "Benachrichtigungszeitraum, wenn leer, wird es vom Host geerbt."
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Benachrichtigung bei jedem weiteren Fehler, nicht nur beim ersten."
@@ -1766,6 +1769,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Wiederholungsintervall"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Meldung für Service On"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/es.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -1662,6 +1662,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "Si figura en blanco, heredará del host"
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Lanzar una notificación por cada fallo, no sólo en el primero"
@@ -1790,6 +1793,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Intervalo de reintento"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Notificar para servicios en"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/fr.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -1638,6 +1638,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "Si vide, hérite de l'hôte"
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Lever une notification à chaque échec..."
@@ -1764,6 +1767,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Intervalle nouvel essai"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Notifier si Service On"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -10,10 +10,10 @@
"PO-Revision-Date: 2009-06-09 14:10+0000\n"
"Last-Translator: Ton Voon <ton.v...@opsview.com>\n"
"Language-Team: English <e...@li.org>\n"
-"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
msgid "messages.access.noAuthToChangeService"
msgstr "You are not authorised to change the state of this service"
@@ -146,8 +146,8 @@
msgid "messages.auditlog.submitServiceCheck.failed %1"
msgstr "Failed to submit service check result: %1"
+#. ($s->servicename, $s->hostname, $states_by_id->{$state}, $comment,)
#. ($c->stash->{object}->name, $c->stash->{object}->host_object_id->name, $states_by_id->{$state}, $comment,)
-#. ($s->servicename, $s->hostname, $states_by_id->{$state}, $comment,)
msgid "messages.auditlog.submittingServiceCheckResultOnAs %1 %2 %3 %4"
msgstr "Submitting service check result: %1 on %2 as %3: %4"
@@ -1368,8 +1368,8 @@
msgid "ui.admin.list.label.delete.confirm %1"
msgstr "Are you sure you want to delete `%1`?"
+#. ($c->stash->{object}->name)
#. ($o->name)
-#. ($c->stash->{object}->name)
#. (object_name)
msgid "ui.admin.list.label.edit %1"
msgstr "Edit %1"
@@ -1721,6 +1721,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "If blank, will inherit from host"
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr "Contains sensitive arguments. Will be hidden from users unless they have TESTCHANGE access"
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Raise a notification on every failure, not just the first one"
@@ -1847,6 +1850,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Retry Interval"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr "Sensitive Arguments"
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Notify for Service On"
@@ -2491,9 +2497,9 @@
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"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/it.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -1638,6 +1638,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "Se il campo è vuoto, saranno ereditati dall'host"
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Inviare una notifica ad ogni check fallito, non solo per il primo"
@@ -1764,6 +1767,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Intervallo tra i tentativi"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Notifica per i servizi su"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/pl.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -1636,6 +1636,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "Jeżeli puste to odziedziczy z hosta"
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Wyśle powiadomienia przy każdym problemie, nie tylko przy pierwszym"
@@ -1762,6 +1765,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Interwał Następnej Próby"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Powiadom dla Usługi na"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/sv.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2013-02-21 19:12:05 UTC (rev 11577)
@@ -1637,6 +1637,9 @@
msgid "ui.admin.servicecheck.edit.help.notificationPeriod"
msgstr "Om den är tom ärvs värddator"
+msgid "ui.admin.servicecheck.edit.help.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.help.volatile"
msgstr "Skicka meddelande för varje fel, inte bara det första"
@@ -1763,6 +1766,9 @@
msgid "ui.admin.servicecheck.edit.label.retryInterval"
msgstr "Intervall innan nytt försök"
+msgid "ui.admin.servicecheck.edit.label.sensitiveArguments"
+msgstr ""
+
msgid "ui.admin.servicecheck.edit.label.serviceNotificationOptions"
msgstr "Meddela för tjänst på"
Modified: trunk/opsview-web/root/admin/servicecheck/tab-advanced
===================================================================
--- trunk/opsview-web/root/admin/servicecheck/tab-advanced 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/root/admin/servicecheck/tab-advanced 2013-02-21 19:12:05 UTC (rev 11577)
@@ -20,6 +20,14 @@
help_keyword => "flap_detection",
);
+checkbox(
+ form_label => c.loc("ui.admin.servicecheck.edit.label.sensitiveArguments"),
+ name => "sensitive_arguments",
+ default => 1,
+ help => c.loc("ui.admin.servicecheck.edit.help.sensitiveArguments"),
+ help_keyword => "sensitive_arguments",
+);
+
stalking_options_values = [ 'w', 'c', 'u', 'o' ];
IF object;
Modified: trunk/opsview-web/t/750servicecheck.t
===================================================================
--- trunk/opsview-web/t/750servicecheck.t 2013-02-21 19:10:46 UTC (rev 11576)
+++ trunk/opsview-web/t/750servicecheck.t 2013-02-21 19:12:05 UTC (rev 11577)
@@ -75,6 +75,7 @@
is( $mech->value( "notification_options", 3 ), "r", "Got recovery notify on" );
is( $mech->value( "notification_options", 4 ), "u", "Got unknown notify on" );
is( $mech->value( "notification_options", 5 ), "f", "Got flapping notify on" );
+is( $mech->value("sensitive_arguments"), 1, "Got sensitive_arguments off" );
$mech->field( "oid", "superman" );
$mech->field( "label", "loislane" );
@@ -82,6 +83,7 @@
$mech->field( "keywords", "shaggy,scooby" );
$mech->field( "notification_interval", "" );
$mech->select( "attribute", "7" );
+$mech->tick( 'sensitive_arguments', 1 );
foreach my $i (qw/w c r u f/) {
$mech->untick( "notification_options", $i );
}
@@ -120,6 +122,7 @@
$mech->value( "notification_options", 5 ),
undef, "Got flapping notify off"
);
+is( $mech->value("sensitive_arguments"), 1, "Got sensitive_arguments on" );
# Editing /
$mech->get_ok( "/admin/servicecheck/edit/47" );
