Send Netdot-devel mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
or, via email, send a message with subject or body 'help' to
[email protected]
You can reach the person managing the list at
[email protected]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Netdot-devel digest..."
Today's Topics:
1. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-57-g0c8fe91 ([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-58-g3cfa3a0 ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 27 Apr 2013 10:38:45 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-57-g0c8fe91
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 0c8fe91e3a35f61d487dae7446f3dae069bc7d97 (commit)
from ca6e8bc97712d24650af4d0ebb25a3b9d57c3bbe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 0c8fe91e3a35f61d487dae7446f3dae069bc7d97
Author: Carlos Vicente <[email protected]>
Date: Sat Apr 27 13:32:26 2013 -0400
Correction
diff --git a/lib/Netdot/Exporter/Nagios.pm b/lib/Netdot/Exporter/Nagios.pm
index 8ab496c..84da787 100644
--- a/lib/Netdot/Exporter/Nagios.pm
+++ b/lib/Netdot/Exporter/Nagios.pm
@@ -304,10 +304,14 @@ sub generate_configs {
if ( $nd && $device_parents->{$devid}->{$nd} ){
# Neighbor device is my parent
if ( exists $device_info->{$nd} ){
- if (
$device_info->{$nd}->{interface}->{$neighbor}->{monitored} ){
+ my $ndh = $device_info->{$nd};
+ if (
$ndh->{interface}->{$neighbor}->{monitored} ){
if ( my $nifindex =
$intid2ifindex->{$neighbor} ){
$hosts{$ip}{service}{$srvname}{parent_host} =
$self->strip_domain($device_info->{$nd}->{hostname});
-
$hosts{$ip}{service}{$srvname}{parent_service} = "IFSTATUS_$nifindex";
+ my $p_srv = "IFSTATUS_$nifindex";
+ $p_srv .=
'_'.$ndh->{interface}->{$neighbor}->{name} if defined
$ndh->{interface}->{$neighbor}->{name};
+ $p_srv =
$self->_rem_illegal_chars($p_srv);
+
$hosts{$ip}{service}{$srvname}{parent_service} = $p_srv;
}
}else{
$hosts{$ip}{service}{$srvname}{parent_host}
= $self->strip_domain($device_info->{$nd}->{hostname});
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter/Nagios.pm | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Sat, 27 Apr 2013 10:46:02 -0700
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-58-g3cfa3a0
To: [email protected]
Message-ID: <[email protected]>
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Netdot".
The branch, netdot-1.0 has been updated
via 3cfa3a0d69d41e758cfc68f4057f688f8ba33af2 (commit)
from 0c8fe91e3a35f61d487dae7446f3dae069bc7d97 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3cfa3a0d69d41e758cfc68f4057f688f8ba33af2
Author: Carlos Vicente <[email protected]>
Date: Sat Apr 27 13:45:55 2013 -0400
Order Nagios members lists alphabetically
diff --git a/lib/Netdot/Exporter/Nagios.pm b/lib/Netdot/Exporter/Nagios.pm
index 84da787..f99e716 100644
--- a/lib/Netdot/Exporter/Nagios.pm
+++ b/lib/Netdot/Exporter/Nagios.pm
@@ -731,7 +731,7 @@ sub print_contacts {
}
}
# Create the contactgroup
- my $members = join ',', @members;
+ my $members = join ',', sort @members;
print $out "define contactgroup{\n";
print $out "\tcontactgroup_name $clname-level_$level\n";
@@ -757,7 +757,7 @@ sub print_hostgroups{
my $alias = $groups->{$group}->{alias} || $group;
next unless ( defined $groups->{$group}->{members} &&
ref($groups->{$group}->{members}) eq 'ARRAY' );
- my $hostlist = join ',', @{ $groups->{$group}->{members} };
+ my $hostlist = join ',', sort @{ $groups->{$group}->{members} };
print $out "define hostgroup{\n";
print $out "\thostgroup_name $group\n";
print $out "\talias $alias\n";
@@ -779,7 +779,7 @@ sub print_servicegroups{
foreach my $group ( keys %$groups ){
# servicegroup members are like:
# members=<host1>,<service1>,<host2>,<service2>,...,
- my $hostlist = join ',', map { "$_,$group" }@{
$groups->{$group}{members} };
+ my $hostlist = join ',', sort map { "$_,$group" }@{
$groups->{$group}{members} };
print $out "define servicegroup{\n";
print $out "\tservicegroup_name $group\n";
print $out "\talias $group\n";
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter/Nagios.pm | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
_______________________________________________
Netdot-devel mailing list
[email protected]
https://osl.uoregon.edu/mailman/listinfo/netdot-devel
End of Netdot-devel Digest, Vol 73, Issue 11
********************************************
