Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/US310:9851-9873
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647,9693,9699,9721,9814,9825,9857,9879,9881,9939
/branches/nagvis-iframe:9764-9786
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US306-slaves:9804-9823
/commercial/branches/US307-network-map:9685-9837
Modified: trunk/CHANGES
===================================================================
--- trunk/CHANGES 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/CHANGES 2012-09-05 15:17:34 UTC (rev 9955)
@@ -2,6 +2,7 @@
????? ???
FEATURES:
+ Added push notifications for IOS devices
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)
@@ -17,7 +18,7 @@
Support for Ubuntu 12.04
ENHANCEMENTS:
Allow to exclude handled hosts and services when calculating overall state
- in the keywords summary page
+ in the keywords summary page
Allow for generating URLs in notifications to link to object information pages
Store downtimes and acknowledgements in statehistory table. Upgrades may take a few minutes
for schema changes
Modified: trunk/opsview-core/bin/db_opsview
===================================================================
--- trunk/opsview-core/bin/db_opsview 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/bin/db_opsview 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1215,7 +1215,7 @@
INSERT INTO schema_version (major_release, version) VALUES ('3.9', '27');
INSERT INTO schema_version (major_release, version) VALUES ('3.11', '15');
INSERT INTO schema_version (major_release, version) VALUES ('3.13', '11');
- INSERT INTO schema_version (major_release, version) VALUES ('3.15', '11');
+ INSERT INTO schema_version (major_release, version) VALUES ('3.15', '12');
EOF
Modified: trunk/opsview-core/bin/nagconfgen.pl
===================================================================
--- trunk/opsview-core/bin/nagconfgen.pl 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/bin/nagconfgen.pl 2012-09-05 15:17:34 UTC (rev 9955)
@@ -334,7 +334,7 @@
# TODO: We're hardcoding the Interface Poller service check for now
next
unless
- exists $host_services_lookup->{ $host->name }->{"Interface Poller"};
+ exists $host_services_lookup->{ $host->name }->{"Interface Poller"};
next unless $host->enable_snmp;
@@ -790,7 +790,7 @@
}
elsif ( $s->freshness_type eq "set_stale" ) {
$commandalias =
- "my_check_dummy!"
+ "my_check_dummy!"
. $s->stale_state . "!"
. Opsview::Utils->make_shell_friendly(
Opsview::Utils->cleanup_args_for_nagios(
@@ -850,7 +850,7 @@
}
else {
$snmp_auth =
- "-P "
+ "-P "
. $h->snmp_version . " -C "
. (
Opsview::Utils->make_shell_friendly(
@@ -1116,8 +1116,9 @@
}
# Save list of multiple service checks for creating dependencies
- push @{ $multiple_services_lookup->{ $h->name }
- ->{ $s->name } }, $service_desc;
+ push
+ @{ $multiple_services_lookup->{ $h->name }->{ $s->name }
+ }, $service_desc;
print OUTFILE "define service {
host_name " . $h->name . "
@@ -1133,7 +1134,8 @@
$s->supports_performance(
name => $service_desc,
host => $h,
- rrddir => Opsview::Config->root_dir . "/var/rrd"
+ rrddir => Opsview::Config->root_dir
+ . "/var/rrd"
) == 1
)
{
@@ -1388,10 +1390,10 @@
# that may remove these definitions
next
unless exists $host_services_lookup->{ $row->{host}->name }
- ->{ $row->{dependency}->name };
+ ->{ $row->{dependency}->name };
next
unless exists $host_services_lookup->{ $row->{host}->name }
- ->{$servicename};
+ ->{$servicename};
print OUTFILE "define servicedependency {
host_name " . $row->{host}->name . "
@@ -3920,6 +3922,7 @@
# Some of this data is constructed from the host creation phase
sub write_notificationmethodvariables {
+
my $file = shift || "$configfilepath/notificationmethodvariables.cfg";
my $rs =
@@ -3927,8 +3930,8 @@
if ( !$monitoringserver->is_master ) {
$rs = $rs->search( { master => 0 } );
}
+
my $variables = {};
-
while ( my $it = $rs->next ) {
if ( $it->command =~ /^opsview_notification/ ) {
plog( "Ignoring this notification method" );
@@ -3937,9 +3940,13 @@
$variables->{ $it->namespace } = $it->variables_hash;
}
- # Don't set this yet - I can see the value of a baseurl, but not a server name
- #$configuration_cache_data->{preferences}->{servername} = $system_preference->opsview_server_name;
+ # Don't set this yet - I can see the value of a baseurl, but not a server
+ # name
+ # $configuration_cache_data->{preferences}->{servername} =
+ # $system_preference->opsview_server_name;
+ $configuration_cache_data->{system} = { uuid => $system_preference->uuid };
+
# Set indent level 1 for testing so we can see changes easily
my $d = Data::Dumper->new(
[ $variables, $configuration_cache_data ],
@@ -3947,10 +3954,9 @@
);
my $indent_level = $test ? 1 : 0;
- open OUTFILE, "> $file" or die "Can't open file $file: $!";
- print OUTFILE $d->Indent($indent_level)->Dump;
- print OUTFILE "1;", $/;
- close OUTFILE;
+ open my $fh, '>', $file or die "Can't open file $file: $!";
+ print $fh $d->Indent($indent_level)->Dump, '1;', $/;
+ close $fh;
plog "Written notificationmethodvariables.cfg";
}
Modified: trunk/opsview-core/import/initial_opsview.sql
===================================================================
--- trunk/opsview-core/import/initial_opsview.sql 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/import/initial_opsview.sql 2012-09-05 15:17:34 UTC (rev 9955)
@@ -70,6 +70,7 @@
INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (2,0,'SMS Notification Module','com.opsview.notificationmethods.smsgateway',0,'submit_sms_script',2,0,'PAGER');
INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (3,1,'Email','com.opsview.notificationmethods.email',0,'notify_by_email',1,0,'EMAIL');
INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (4,1,'RSS','com.opsview.notificationmethods.rss',0,'notify_by_rss',1,0,'RSS_MAXIMUM_ITEMS,RSS_MAXIMUM_AGE,RSS_COLLAPSED');
+INSERT INTO `notificationmethods` (`id`, `active`, `name`, `namespace`, `master`, `command`, `priority`, `uncommitted`, `contact_variables`) VALUES (5,1,'Push Notifications For IOS Mobile','com.opsview.notificationmethods.iospush',1,'notify_by_ios_push',1,0,NULL);
/*!40000 ALTER TABLE `notificationmethods` ENABLE KEYS */;
UNLOCK TABLES;
Modified: trunk/opsview-core/installer/upgradedb_opsview.pl
===================================================================
--- trunk/opsview-core/installer/upgradedb_opsview.pl 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/installer/upgradedb_opsview.pl 2012-09-05 15:17:34 UTC (rev 9955)
@@ -4601,6 +4601,23 @@
$db->updated;
}
+if ( $db->is_lower("3.15.12") ) {
+ $db->print( "Adding IOS push notification profile" );
+ $dbh->do(
+ q[
+ INSERT into notificationmethods
+ SET active = 1,
+ name = 'Push Notifications For IOS Mobile',
+ namespace = 'com.opsview.notificationmethods.iospush',
+ master = 1,
+ command = 'notify_by_ios_push',
+ priority = 1,
+ uncommitted = 0
+ ]
+ );
+ $db->updated;
+}
+
# PLACEHOLDER
# For future upgrade of Opsview Core where you cannot have an automatic Opsview reload
# We mark this upgrade lock file so that post installs do not generate an unactivated configuration
Copied: trunk/opsview-core/notifications/notify_by_ios_push (from rev 9873, branches/US310/opsview-core/notifications/notify_by_ios_push)
===================================================================
--- trunk/opsview-core/notifications/notify_by_ios_push (rev 0)
+++ trunk/opsview-core/notifications/notify_by_ios_push 2012-09-05 15:17:34 UTC (rev 9955)
@@ -0,0 +1,173 @@
+#!/usr/bin/env perl
+#
+# SYNTAX:
+# notify_by_ios_push
+#
+# LICENSE:
+# Copyright (C) 2003-2012 Opsview Limited. All rights reserved
+#
+# This file is part of Opsview
+#
+
+# Note: This script has a copy on the wiki (opsview4.0:notify_by_ios_push.pl).
+# If making a change, don't forget to update that copy, too.
+
+use strict;
+use warnings;
+use lib qw( /usr/local/nagios/lib /usr/local/nagios/perl/lib );
+use List::Util 'shuffle';
+use Time::HiRes 'gettimeofday';
+use URI::Escape 'uri_escape';
+
+# Change these if you don't have the notification profile set up in Opsview.
+my $ldap_username = '';
+my $ldap_password = '';
+my $proxy = '';
+
+use vars qw( $pushserverip $dest_server );
+
+exit 1
+ unless $ENV{NAGIOS_SERVICEOUTPUT}
+ and $ENV{NAGIOS_HOSTNAME}
+ and $ENV{NAGIOS_CONTACTNAME};
+
+open my $fh, '>>', '/usr/local/nagios/var/log/notify_by_ios_push.log' or die $!;
+
+# Older versions of Opsview don't have the https module.
+eval { require LWP::Protocol::https };
+my $protocol = $@ ? 'http' : 'https';
+
+require Opsview::Config::Notifications;
+
+$dest_server = 'dev-push.opsview.com';
+my $realm = '';
+my $config_vars = Opsview::Config::Notifications->config_variables;
+my $notification_vars = Opsview::Config::Notifications->notification_variables(
+ 'com.opsview.notificationmethods.iospush'
+);
+
+$ldap_username ||= $notification_vars->{IOSPUSH_USERNAME};
+$ldap_password ||= $notification_vars->{IOSPUSH_PASSWORD};
+$proxy ||= $notification_vars->{IOSPUSH_PROXY};
+
+my $alert_message =
+ uri_escape( $ENV{NAGIOS_HOSTNAME} . ':' . $ENV{NAGIOS_SERVICEOUTPUT} );
+$alert_message = substr( $alert_message, 0, 190 );
+
+# Remove any profile information from contact name.
+my $contact_name = $ENV{NAGIOS_CONTACTNAME};
+$contact_name =~ s'/.*'';
+
+# Get a list of IPs to try.
+require Net::DNS;
+my $res = Net::DNS::Resolver->new;
+my $query = $res->search($dest_server);
+unless ($query) {
+ logit( "DNS query failed: " . $res->errorstring );
+ exit 1;
+}
+my @ips;
+for my $rr ( $query->answer ) {
+ next unless $rr->type eq 'A';
+ push @ips, $rr->address;
+}
+
+require LWP::UserAgent;
+
+LWP::Protocol::implementor( 'http', 'Opsview::LWP::UserAgent::Protocol::HTTP'
+);
+LWP::Protocol::implementor( 'https', 'Opsview::LWP::UserAgent::Protocol::HTTPS'
+);
+
+# Send the request to each IP until one's successful.
+@ips = shuffle @ips;
+for my $ip (@ips) {
+
+ $pushserverip = $ip;
+ my $url = ""
+
+ my $ua = LWP::UserAgent->new;
+ $ua->credentials(
+ $dest_server . ':' . ( $protocol eq 'https' ? '443' : '80' ),
+ $realm, $ldap_username, $ldap_password );
+ $ua->proxy( $protocol, $proxy );
+ $ua->timeout(2);
+ $ua->ssl_opts( SSL_verifycn_name => $dest_server );
+
+ my $begin = gettimeofday();
+
+ my $res = $ua->post(
+ $url,
+ {
+ cmd => 'send_msg',
+ uuid => $config_vars->{system}{uuid} || '',
+ username => $contact_name,
+ msg => $alert_message,
+ }
+ );
+
+ logit(
+ "[$ip] "
+ . $res->status_line
+ . " took "
+ . ( gettimeofday() - $begin )
+ . " seconds"
+ );
+
+ exit if $res->is_success;
+
+}
+
+exit 1;
+
+sub logit {
+ my $msg = shift;
+ chomp $msg;
+ my @time = localtime(time);
+ print $fh $time[5] + 1900, '-', sprintf( '%.2d', $time[4] + 1 ), '-',
+ sprintf( '%.2d', $time[3] ), ' ', sprintf( '%.2d', $time[2] ),
+ ':', sprintf( '%.2d', $time[1] ), ':', sprintf( '%.2d', $time[0] ), ' ',
+ $msg, "\n";
+}
+
+package Opsview::LWP::UserAgent::Protocol::HTTPS;
+
+use base qw(LWP::Protocol::https);
+
+sub _extra_sock_opts {
+ my ( $self, @opts ) = @_;
+ if ( $opts[0] eq $main::dest_server ) {
+ return (
+ $self->SUPER::_extra_sock_opts(@opts),
+ PeerAddr => $main::pushserverip,
+ Host => $main::dest_server,
+ );
+ }
+ else {
+ return ( $self->SUPER::_extra_sock_opts(@opts) );
+ }
+}
+
+sub socket_class {'LWP::Protocol::https::Socket'}
+
+package Opsview::LWP::UserAgent::Protocol::HTTP;
+
+use base qw(LWP::Protocol::http);
+
+sub _extra_sock_opts {
+ my ( $self, @opts ) = @_;
+ if ( $opts[0] eq $main::dest_server ) {
+ return (
+ $self->SUPER::_extra_sock_opts(@opts),
+ PeerAddr => $main::pushserverip,
+ Host => $main::dest_server,
+ );
+ }
+ else {
+ return ( $self->SUPER::_extra_sock_opts(@opts) );
+ }
+}
+
+sub socket_class {'LWP::Protocol::http::Socket'}
+
+1;
Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/misccommands.cfg 2012-09-05 15:17:34 UTC (rev 9955)
@@ -43,6 +43,12 @@
define command{
+ command_name notify-by-push-notifications-for-ios-mobile
+ command_line /usr/local/nagios/libexec/notifications/notify_by_ios_push
+}
+
+
+define command{
command_name notify-by-aql
command_line /usr/local/nagios/libexec/notifications/submit_sms_aql -u '' -p '' -P ''
}
Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/notificationmethodvariables.cfg
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/notificationmethodvariables.cfg 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/notificationmethodvariables.cfg 2012-09-05 15:17:34 UTC (rev 9955)
@@ -5,9 +5,13 @@
'AQL_PASSWORD' => 'aqlpass',
'AQL_PROXY_SERVER' => 'http://proxy.example.com'
},
+ 'com.opsview.notificationmethods.iospush' => {},
'com.opsview.notificationmethods.rss' => {}
};
$config = {
+ 'system' => {
+ 'uuid' => 'TestDB'
+ },
'hostgroups' => {
'Monitoring Servers' => {
'matpath' => 'Opsview,UK,Monitoring Servers'
Modified: trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache
===================================================================
--- trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/t/var/configs/Master Monitoring Server/objects.cache 2012-09-05 15:17:34 UTC (rev 9955)
@@ -301,6 +301,11 @@
}
define command {
+ command_name notify-by-push-notifications-for-ios-mobile
+ command_line /usr/local/nagios/libexec/notifications/notify_by_ios_push
+ }
+
+define command {
command_name notify-by-rss
command_line /usr/local/nagios/libexec/notifications/notify_by_rss
}
Modified: trunk/opsview-core/t/var/configs/dbic_trace
===================================================================
--- trunk/opsview-core/t/var/configs/dbic_trace 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/t/var/configs/dbic_trace 2012-09-05 15:17:34 UTC (rev 9955)
@@ -474,6 +474,7 @@
SELECT me.id, me.name, me.alias, me.sunday, me.monday, me.tuesday, me.wednesday, me.thursday, me.friday, me.saturday, me.uncommitted FROM opsview.timeperiods me ORDER BY name:
SELECT me.id, me.active, me.name, me.namespace, me.master, me.command, me.priority, me.uncommitted, me.contact_variables FROM opsview.notificationmethods me WHERE ( active = ? ) ORDER BY priority: '1'
SELECT me.notificationmethodid, me.name, me.value FROM opsview.notificationmethod_variables me WHERE ( me.notificationmethodid = ? ) ORDER BY name: '3'
+SELECT me.notificationmethodid, me.name, me.value FROM opsview.notificationmethod_variables me WHERE ( me.notificationmethodid = ? ) ORDER BY name: '6'
SELECT me.notificationmethodid, me.name, me.value FROM opsview.notificationmethod_variables me WHERE ( me.notificationmethodid = ? ) ORDER BY name: '1'
SELECT me.notificationmethodid, me.name, me.value FROM opsview.notificationmethod_variables me WHERE ( me.notificationmethodid = ? ) ORDER BY name: '4'
SELECT COUNT( * ) FROM opsview.hosts me WHERE ( ( enable_snmp = ? AND use_nmis = ? ) ): '1', '1'
Modified: trunk/opsview-core/t/var/opsview.test.db
===================================================================
--- trunk/opsview-core/t/var/opsview.test.db 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-core/t/var/opsview.test.db 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1416,6 +1416,7 @@
INSERT INTO `notificationmethods` VALUES (3,1,'Email','com.opsview.notificationmethods.email',0,'notify_by_email',1,0,'EMAIL');
INSERT INTO `notificationmethods` VALUES (4,1,'RSS','com.opsview.notificationmethods.rss',1,'notify_by_rss',2000,0,'RSS_MAXIMUM_ITEMS,RSS_MAXIMUM_AGE,RSS_COLLAPSED');
INSERT INTO `notificationmethods` VALUES (5,0,'unused','unused',1,'unused',1,0,'');
+INSERT INTO `notificationmethods` VALUES (6,1,'Push Notifications For IOS Mobile','com.opsview.notificationmethods.iospush',1,'notify_by_ios_push',1,0,NULL);
/*!40000 ALTER TABLE `notificationmethods` ENABLE KEYS */;
UNLOCK TABLES;
@@ -2059,7 +2060,7 @@
INSERT INTO `schema_version` VALUES ('3.9','27');
INSERT INTO `schema_version` VALUES ('3.11','15');
INSERT INTO `schema_version` VALUES ('3.13','11');
-INSERT INTO `schema_version` VALUES ('3.15','11');
+INSERT INTO `schema_version` VALUES ('3.15','12');
/*!40000 ALTER TABLE `schema_version` ENABLE KEYS */;
UNLOCK TABLES;
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/de.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/de.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1436,6 +1436,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr "AQL Benutzername"
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr ""
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/es.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/es.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1453,6 +1453,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr "Nombre de usuario de AQL"
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr ""
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/fr.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/fr.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1434,6 +1434,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr "Nom d'utilisateur AQL"
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr ""
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/i_default.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1512,6 +1512,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr "AQL Username"
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr "Password"
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr "Proxy"
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr "Username"
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr "Want even better SMS functionality?"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/it.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/it.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1434,6 +1434,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr "Username AQL"
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr ""
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr "Vorresti funzionalità SMS migliori?"
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/pl.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/pl.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1432,6 +1432,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr "Nazwa użytkownika dla AQL"
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr ""
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr ""
Modified: trunk/opsview-web/lib/Opsview/Web/I18N/sv.po
===================================================================
--- trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-09-05 15:12:17 UTC (rev 9954)
+++ trunk/opsview-web/lib/Opsview/Web/I18N/sv.po 2012-09-05 15:17:34 UTC (rev 9955)
@@ -1433,6 +1433,15 @@
msgid "ui.admin.notificationmethods.edit.variables.aqlUsername"
msgstr ""
+msgid "ui.admin.notificationmethods.edit.variables.iospushPassword"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushProxy"
+msgstr ""
+
+msgid "ui.admin.notificationmethods.edit.variables.iospushUsername"
+msgstr ""
+
msgid "ui.admin.notificationmethods.helpNote.smsgateway"
msgstr ""
Copied: trunk/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush (from rev 9873, branches/US310/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush)
===================================================================
--- trunk/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush (rev 0)
+++ trunk/opsview-web/root/admin/notificationmethods/com.opsview.notificationmethods.iospush 2012-09-05 15:17:34 UTC (rev 9955)
@@ -0,0 +1,34 @@
+[%
+
+field_label(
+ form_label => c.loc("ui.admin.notificationmethods.edit.variables.iospushUsername"),
+ name => "variables[IOSPUSH_USERNAME]",
+ help_keyword => "iospush_username"
+);
+
+textfield(
+ name => "variables[IOSPUSH_USERNAME]",
+ size => 25,
+ maxlength => 255,
+ value => object.variable("IOSPUSH_USERNAME"),
+);
+
+password_field(
+ form_label => c.loc("ui.admin.notificationmethods.edit.variables.iospushPassword"),
+ name => "variables[IOSPUSH_PASSWORD]",
+ size => 25,
+ maxlength => 255,
+ help_keyword => "iospush_password"
+ value => object.variable("IOSPUSH_PASSWORD"),
+);
+
+textfield(
+ form_label => c.loc("ui.admin.notificationmethods.edit.variables.iospushProxy"),
+ name => "variables[IOSPUSH_PROXY]",
+ size => 30,
+ maxlength => 255,
+ help_keyword => "ios_proxy"
+ value => object.variable("IOSPUSH_PROXY"),
+);
+
+%]
