Title: [opsview] [12010] Only generate perfdata when 'include survey data' set in UI
- Revision
- 12010
- Author
- dferguson
- Date
- 2013-04-09 13:33:38 +0100 (Tue, 09 Apr 2013)
Log Message
Only generate perfdata when 'include survey data' set in UI
Modified Paths
Modified: trunk/opsview-core/nagios-plugins/check_opsview_update
===================================================================
--- trunk/opsview-core/nagios-plugins/check_opsview_update 2013-04-09 11:32:17 UTC (rev 12009)
+++ trunk/opsview-core/nagios-plugins/check_opsview_update 2013-04-09 12:33:38 UTC (rev 12010)
@@ -145,22 +145,6 @@
$dbh->selectrow_array( "SELECT COUNT(*) FROM opsview_host_services" );
$dbh->disconnect;
-$dbh = Opsview->db_Main;
-
-my $num_hosts = $schema->resultset("Hosts")->count();
-my $num_contacts = $schema->resultset("Contacts")->count();
-my $num_slaves = $schema->resultset("Monitoringservers")->count() - 1;
-my $num_slavenodes = $schema->resultset("Monitoringclusternodes")->count();
-my $num_keywords = $schema->resultset("Keywords")->count();
-my $num_logins = $dbh->selectrow_array(
- 'SELECT COUNT(*) FROM auditlogs WHERE text LIKE "Successful login:%" AND datetime > CONVERT_TZ(NOW() - INTERVAL 1 DAY, @@session.time_zone,"+00:00")'
-);
-
-my $useragents = $dbh->selectcol_arrayref(
- "SELECT id FROM useragents WHERE last_update > NOW() - INTERVAL 1 MONTH"
-);
-$dbh->disconnect;
-
open( BUILD_OS, "/usr/local/nagios/etc/opsview_build_os" );
my $os_arch = <BUILD_OS>;
close(BUILD_OS);
@@ -206,6 +190,22 @@
my $hostname = Sys::Hostname::hostname();
my $hosthash = md5_hex($hostname);
+ my $num_hosts = $schema->resultset("Hosts")->count();
+ my $num_contacts = $schema->resultset("Contacts")->count();
+ my $num_slaves = $schema->resultset("Monitoringservers")->count() - 1;
+ my $num_slavenodes = $schema->resultset("Monitoringclusternodes")->count();
+ my $num_keywords = $schema->resultset("Keywords")->count();
+
+ $dbh = Opsview->db_Main;
+ my $num_logins = $dbh->selectrow_array(
+ 'SELECT COUNT(*) FROM auditlogs WHERE text LIKE "Successful login:%" AND datetime > CONVERT_TZ(NOW() - INTERVAL 1 DAY, @@session.time_zone,"+00:00")'
+ );
+
+ my $useragents = $dbh->selectcol_arrayref(
+ "SELECT id FROM useragents WHERE last_update > NOW() - INTERVAL 1 MONTH"
+ );
+ $dbh->disconnect;
+
my %advanced_stats = (
uuid => Opsview::Systempreference->uuid,
hosthash => uc($hosthash),
@@ -247,6 +247,46 @@
}
@stats{ keys %advanced_stats } = values %advanced_stats;
+
+ $np->add_perfdata(
+ label => 'num_hosts',
+ value => $num_hosts,
+ );
+
+ $np->add_perfdata(
+ label => 'num_services',
+ value => $num_services,
+ );
+
+ $np->add_perfdata(
+ label => 'num_contacts',
+ value => $num_contacts,
+ );
+
+ $np->add_perfdata(
+ label => 'num_slaves',
+ value => $num_slaves,
+ );
+
+ $np->add_perfdata(
+ label => 'num_slavenodes',
+ value => $num_slavenodes,
+ );
+
+ $np->add_perfdata(
+ label => 'num_keywords',
+ value => $num_keywords,
+ );
+
+ $np->add_perfdata(
+ label => 'num_logins',
+ value => $num_logins,
+ );
+
+ $np->add_perfdata(
+ label => 'num_snmptraps',
+ value => $snmptraps,
+ );
}
# if showstats
@@ -264,46 +304,6 @@
exit(0);
}
-$np->add_perfdata(
- label => 'num_hosts',
- value => $num_hosts,
-);
-
-$np->add_perfdata(
- label => 'num_services',
- value => $num_services,
-);
-
-$np->add_perfdata(
- label => 'num_contacts',
- value => $num_contacts,
-);
-
-$np->add_perfdata(
- label => 'num_slaves',
- value => $num_slaves,
-);
-
-$np->add_perfdata(
- label => 'num_slavenodes',
- value => $num_slavenodes,
-);
-
-$np->add_perfdata(
- label => 'num_keywords',
- value => $num_keywords,
-);
-
-$np->add_perfdata(
- label => 'num_logins',
- value => $num_logins,
-);
-
-$np->add_perfdata(
- label => 'num_snmptraps',
- value => $snmptraps,
-);
-
# Stop actual send if development. Check after showstats
if ( !$local_opsview_version ) {
$np->nagios_exit(
_______________________________________________
Opsview-checkins mailing list
Opsview-checkins@lists.opsview.org
http://lists.opsview.org/lists/listinfo/opsview-checkins
