Skip to content
Snippets Groups Projects
Commit 0218b0ff authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

uprava sloupcu tabulky

parent 89eca116
Branches
Tags
No related merge requests found
...@@ -82,23 +82,23 @@ $sth->execute or die "Cannot execute statement: " . $sth->errstr; ...@@ -82,23 +82,23 @@ $sth->execute or die "Cannot execute statement: " . $sth->errstr;
my $hash_ref = $sth->fetchall_hashref("client_id"); my $hash_ref = $sth->fetchall_hashref("client_id");
# print table of clients # print table of clients
print "+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; print "+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
print "| Client ID | Hostname | Registered | Requestor | Service | CT | Type | ROE | Description tags | IP Net Client | Valid |\n"; print "| Client ID | Hostname | Registered | Requestor | Service | CT | Type | ROE | Description tags | IP Net Client | V |\n";
print "+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; print "+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
foreach my $key (sort {$a<=>$b} keys %$hash_ref) { foreach my $key (sort {$a<=>$b} keys %$hash_ref) {
printf("| %-10s ", $hash_ref->{$key}->{client_id} || "unknown"); printf("| %-14s ", $hash_ref->{$key}->{client_id} || "unknown");
printf("| %-30s ", $hash_ref->{$key}->{hostname} || "unknown"); printf("| %-36s ", $hash_ref->{$key}->{hostname} || "unknown");
printf("| %19s ", $hash_ref->{$key}->{registered} || "unknown"); printf("| %19s ", $hash_ref->{$key}->{registered} || "unknown");
printf("| %-23s ", $hash_ref->{$key}->{requestor} || "unknown"); printf("| %-27s ", $hash_ref->{$key}->{requestor} || "unknown");
printf("| %-25s ", $hash_ref->{$key}->{service} || "-"); printf("| %-22s ", $hash_ref->{$key}->{service} || "-");
printf("| %-2s ", $hash_ref->{$key}->{client_type} || "unknown"); printf("| %-1s ", $hash_ref->{$key}->{client_type} || "unknown");
printf("| %-15s ", $hash_ref->{$key}->{type} || "-"); printf("| %-16s ", $hash_ref->{$key}->{type} || "-");
printf("| %-4s ", $hash_ref->{$key}->{receive_own_events} || "-"); printf("| %-1s ", $hash_ref->{$key}->{receive_own_events} || "-");
printf("| %-50s ", $hash_ref->{$key}->{description_tags} || "-"); printf("| %-47s ", $hash_ref->{$key}->{description_tags} || "-");
printf("| %-18s ", $hash_ref->{$key}->{ip_net_client}|| "unknown"); printf("| %-18s ", $hash_ref->{$key}->{ip_net_client}|| "unknown");
printf("| %-5s |\n", $hash_ref->{$key}->{valid}|| "unknown"); printf("| %-1s |\n", $hash_ref->{$key}->{valid}|| "unknown");
} }
print "+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n"; print "+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+\n";
print "\n"; print "\n";
print "Current registered clients in: " . scalar localtime(time) . "\n"; print "Current registered clients in: " . scalar localtime(time) . "\n";
......
...@@ -80,7 +80,7 @@ my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST ...@@ -80,7 +80,7 @@ my $dbh = WardenCommon::connectDB($WardenCommon::DB_NAME, $WardenCommon::DB_HOST
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Warden server variables # Warden server variables
my $package_version = WardenCommon::trim(`cat $etc/package_version`); my $package_version = WardenCommon::trim(`cat /opt/warden-server/etc/package_version`);
my $version = substr($package_version, 14); my $version = substr($package_version, 14);
my $hostname = WardenCommon::trim(`hostname -f`); my $hostname = WardenCommon::trim(`hostname -f`);
my $ip_address = WardenCommon::trim(`hostname -i`); my $ip_address = WardenCommon::trim(`hostname -i`);
...@@ -105,6 +105,7 @@ $sth->execute($WardenCommon::DB_NAME, 'events') or die "Cannot execute statement ...@@ -105,6 +105,7 @@ $sth->execute($WardenCommon::DB_NAME, 'events') or die "Cannot execute statement
my $size = $sth->fetchrow(); my $size = $sth->fetchrow();
my $db_size = defined $size ? Format::Human::Bytes::base10($size) : "none"; my $db_size = defined $size ? Format::Human::Bytes::base10($size) : "none";
# sum of all records in table events # sum of all records in table events
$sth = $dbh->prepare("SELECT count(*) FROM events;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT count(*) FROM events;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
...@@ -137,6 +138,7 @@ if (!defined $events_sum_invalid) { ...@@ -137,6 +138,7 @@ if (!defined $events_sum_invalid) {
$events_sum_invalid = "none"; $events_sum_invalid = "none";
} }
# id of last record in table events # id of last record in table events
$sth = $dbh->prepare("SELECT max(id) FROM events WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT max(id) FROM events WHERE valid = 't';") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
...@@ -145,6 +147,7 @@ if (!defined $events_last_id) { ...@@ -145,6 +147,7 @@ if (!defined $events_last_id) {
$events_last_id = "none"; $events_last_id = "none";
} }
# timestamp of first record in table events # timestamp of first record in table events
$sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events WHERE valid = 't');") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT received FROM events WHERE id = (SELECT min(id) FROM events WHERE valid = 't');") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
...@@ -161,6 +164,7 @@ if (!defined $events_last_timestamp) { ...@@ -161,6 +164,7 @@ if (!defined $events_last_timestamp) {
$events_last_timestamp = "none"; $events_last_timestamp = "none";
} }
# sum of all records in table clients # sum of all records in table clients
$sth = $dbh->prepare("SELECT count(*) FROM clients;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT count(*) FROM clients;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
...@@ -189,7 +193,9 @@ if (!defined $clients_sum_invalid) { ...@@ -189,7 +193,9 @@ if (!defined $clients_sum_invalid) {
# Statistics of active registered senders # Statistics of active registered senders
my $hash_ref; my $hash_ref;
if ($clients_sum != 0) { if ($clients_sum != 0) {
# $sth = $dbh->prepare("SELECT clients.client_id, clients.hostname, clients.service, count(*), max(received) FROM events LEFT JOIN clients ON (events.hostname=clients.hostname AND events.service=clients.service) WHERE clients.valid='t' AND events.valid='t' GROUP BY client_id;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth = $dbh->prepare("SELECT clients.client_id, clients.hostname, clients.service, count(*), max(received) FROM events LEFT JOIN clients ON (events.client_id=clients.client_id) WHERE clients.valid='t' AND events.valid='t' GROUP BY client_id;") or die "Cannot prepare statement: " . $dbh->errstr; $sth = $dbh->prepare("SELECT clients.client_id, clients.hostname, clients.service, count(*), max(received) FROM events LEFT JOIN clients ON (events.client_id=clients.client_id) WHERE clients.valid='t' AND events.valid='t' GROUP BY client_id;") or die "Cannot prepare statement: " . $dbh->errstr;
$sth->execute or die "Cannot execute statement: " . $sth->errstr; $sth->execute or die "Cannot execute statement: " . $sth->errstr;
my ($client_id, $hostname, $service, $count, $timestamp, $client_status); my ($client_id, $hostname, $service, $count, $timestamp, $client_status);
$hash_ref = $sth->fetchall_hashref("client_id"); $hash_ref = $sth->fetchall_hashref("client_id");
...@@ -231,17 +237,17 @@ print "\n"; ...@@ -231,17 +237,17 @@ print "\n";
if ($clients_sum != 0) { if ($clients_sum != 0) {
print "Statistics of ACTIVE and VALID registered senders:\n"; print "Statistics of ACTIVE and VALID registered senders:\n";
print "==================================================\n"; print "==================================================\n";
print "+----------------------------------------------------------------------------------------------------------------+\n"; print "+------------------------------------------------------------------------------------------------------------------------+\n";
print "| Client ID | Hostname | Service | Stored events | Last insertion (UTC) |\n"; print "| Client ID | Hostname | Service | Stored events | Last insertion (UTC) |\n";
print "+----------------------------------------------------------------------------------------------------------------+\n"; print "+------------------------------------------------------------------------------------------------------------------------+\n";
foreach my $key (sort {$a<=>$b} keys %$hash_ref) { foreach my $key (sort {$a<=>$b} keys %$hash_ref) {
printf("| %-10s ", $hash_ref->{$key}->{client_id} || "unknown"); printf("| %-14s ", $hash_ref->{$key}->{client_id} || "unknown");
printf("| %-30s ", $hash_ref->{$key}->{hostname}|| "unknown"); printf("| %-36s ", $hash_ref->{$key}->{hostname}|| "unknown");
printf("| %-25s ", $hash_ref->{$key}->{service} || "unknown"); printf("| %-22s ", $hash_ref->{$key}->{service} || "unknown");
printf("| %-13s ", $hash_ref->{$key}->{"count(*)"} || "unknown"); printf("| %-14s ", $hash_ref->{$key}->{"count(*)"} || "unknown");
printf("| %-20s |\n", $hash_ref->{$key}->{"max(received)"} || "unknown"); printf("| %-20s |\n", $hash_ref->{$key}->{"max(received)"} || "unknown");
} }
print "+----------------------------------------------------------------------------------------------------------------+\n"; print "+------------------------------------------------------------------------------------------------------------------------+\n";
print "\n"; print "\n";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment