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-143-g7789098 ([email protected])
2. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-144-g4ba45bd ([email protected])
3. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-145-g8fd7747 ([email protected])
4. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-146-ge025e01 ([email protected])
5. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-147-gdedc890 ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 18 Dec 2013 11:32:32 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-143-g7789098
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 7789098cc52639993a2291e685446502f0f7c931 (commit)
from 413bdd905e7e14674caca689dd042022705b29bb (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 7789098cc52639993a2291e685446502f0f7c931
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 14:32:27 2013 -0500
Typo
diff --git a/lib/Netdot/Exporter.pm b/lib/Netdot/Exporter.pm
index 94ae1d2..85ff1c1 100644
--- a/lib/Netdot/Exporter.pm
+++ b/lib/Netdot/Exporter.pm
@@ -118,7 +118,7 @@ sub get_device_info {
$intid, $intnumber, $intname, $intdesc, $intadmin, $intmon, $intcl,
$ip_id, $ip_addr, $ip_version, $subnet, $ip_mon, $name, $zone,
$srv_id, $srv_name, $srv_mon, $srv_cl,
- $peer_addr, $peer_rmon, $peer_cl, $peer_asn, $peer_asname) = @$row;
+ $peer_addr, $peer_mon, $peer_cl, $peer_asn, $peer_asname) = @$row;
my $hostname = ($name eq '@')? $zone : $name.'.'.$zone;
$device_info{$devid}{target_id} = $target_id;
$device_info{$devid}{hostname} = $hostname;
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 2
Date: Wed, 18 Dec 2013 11:34:28 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-144-g4ba45bd
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 4ba45bda3a12652738dba50f62e270fe005e69ea (commit)
from 7789098cc52639993a2291e685446502f0f7c931 (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 4ba45bda3a12652738dba50f62e270fe005e69ea
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 14:34:24 2013 -0500
Typo
diff --git a/lib/Netdot/Exporter.pm b/lib/Netdot/Exporter.pm
index 85ff1c1..48ce536 100644
--- a/lib/Netdot/Exporter.pm
+++ b/lib/Netdot/Exporter.pm
@@ -91,7 +91,7 @@ sub get_device_info {
ip.id, ip.address, ip.version, ip.parent, ip.monitored,
rr.name, zone.name,
service.id, service.name, ipservice.monitored,
ipservice.contactlist,
bgppeering.bgppeeraddr, bgppeering.monitored,
bgppeering.contactlist,
- peer.asn, peer.asname
+ peer.asnumber, peer.asname
FROM rr, zone, device d
LEFT OUTER JOIN bgppeering ON d.id=bgppeering.device
LEFT OUTER JOIN devicecontacts ON d.id=devicecontacts.device
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 3
Date: Wed, 18 Dec 2013 11:47:32 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-145-g8fd7747
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 8fd7747326cb2c60218b79a9354bbd1b2676a411 (commit)
from 4ba45bda3a12652738dba50f62e270fe005e69ea (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 8fd7747326cb2c60218b79a9354bbd1b2676a411
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 14:47:25 2013 -0500
Corrections
diff --git a/lib/Netdot/Exporter.pm b/lib/Netdot/Exporter.pm
index 48ce536..947de63 100644
--- a/lib/Netdot/Exporter.pm
+++ b/lib/Netdot/Exporter.pm
@@ -90,10 +90,11 @@ sub get_device_info {
i.id, i.number, i.name, i.description, i.admin_status,
i.monitored, i.contactlist,
ip.id, ip.address, ip.version, ip.parent, ip.monitored,
rr.name, zone.name,
service.id, service.name, ipservice.monitored,
ipservice.contactlist,
- bgppeering.bgppeeraddr, bgppeering.monitored,
bgppeering.contactlist,
- peer.asnumber, peer.asname
+ bgppeering.bgppeeraddr, bgppeering.contactlist,
peer.asnumber, peer.asname
FROM rr, zone, device d
- LEFT OUTER JOIN bgppeering ON d.id=bgppeering.device
+ LEFT OUTER JOIN (bgppeering, entity peer) ON d.id=bgppeering.device
+ AND bgppeering.entity=peer.id
+ AND bgppeering.monitored=1
LEFT OUTER JOIN devicecontacts ON d.id=devicecontacts.device
LEFT OUTER JOIN contactlist ON
contactlist.id=devicecontacts.contactlist
LEFT OUTER JOIN entity ON d.used_by=entity.id
@@ -102,7 +103,6 @@ sub get_device_info {
LEFT OUTER JOIN ipblock ip ON ip.interface=i.id
LEFT OUTER JOIN ipservice ON ipservice.ip=ip.id
LEFT OUTER JOIN service ON ipservice.service=service.id
- LEFT OUTER JOIN entity peer ON bgppeering.entity=peer.id
WHERE d.monitored='1'
AND i.device=d.id
AND d.name=rr.id
@@ -118,7 +118,7 @@ sub get_device_info {
$intid, $intnumber, $intname, $intdesc, $intadmin, $intmon, $intcl,
$ip_id, $ip_addr, $ip_version, $subnet, $ip_mon, $name, $zone,
$srv_id, $srv_name, $srv_mon, $srv_cl,
- $peer_addr, $peer_mon, $peer_cl, $peer_asn, $peer_asname) = @$row;
+ $peer_addr, $peer_cl, $peer_asn, $peer_asname) = @$row;
my $hostname = ($name eq '@')? $zone : $name.'.'.$zone;
$device_info{$devid}{target_id} = $target_id;
$device_info{$devid}{hostname} = $hostname;
@@ -135,7 +135,6 @@ sub get_device_info {
$device_info{$devid}{site_alias} = $site_alias if defined
$site_alias;
$device_info{$devid}{contactlist}{$clid} = 1 if defined $clid;
if ( $peer_addr ){
- $device_info{$devid}{peering}{$peer_addr}{monitored} = $peer_mon;
$device_info{$devid}{peering}{$peer_addr}{contactlist} = $peer_cl;
$device_info{$devid}{peering}{$peer_addr}{asn} =
$peer_asname if $peer_asn;
$device_info{$devid}{peering}{$peer_addr}{asname} =
$peer_asname if $peer_asname;
diff --git a/lib/Netdot/Exporter/Nagios.pm b/lib/Netdot/Exporter/Nagios.pm
index 34228f9..687e946 100644
--- a/lib/Netdot/Exporter/Nagios.pm
+++ b/lib/Netdot/Exporter/Nagios.pm
@@ -261,7 +261,6 @@ sub generate_configs {
# Add a bgppeer service check for each monitored BGP peering
foreach my $peer_addr ( keys %{$devh->{peering}} ){
my $peering = $devh->{peering}->{$peer_addr};
- next unless ( $peering->{monitored} );
my $srvname = 'BGPPEER_'.$peer_addr;
$srvname .= '_'.$peering->{asname} if $peering->{asname};
$srvname .= '_('.$peering->{asn}.')' if $peering->{asn};
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter.pm | 11 +++++------
lib/Netdot/Exporter/Nagios.pm | 1 -
2 files changed, 5 insertions(+), 7 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 4
Date: Wed, 18 Dec 2013 11:53:27 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-146-ge025e01
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 e025e01407384c22b0a601c0340b64b34be98448 (commit)
from 8fd7747326cb2c60218b79a9354bbd1b2676a411 (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 e025e01407384c22b0a601c0340b64b34be98448
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 14:53:23 2013 -0500
Typo
diff --git a/lib/Netdot/Exporter.pm b/lib/Netdot/Exporter.pm
index 947de63..bc7491e 100644
--- a/lib/Netdot/Exporter.pm
+++ b/lib/Netdot/Exporter.pm
@@ -136,7 +136,7 @@ sub get_device_info {
$device_info{$devid}{contactlist}{$clid} = 1 if defined $clid;
if ( $peer_addr ){
$device_info{$devid}{peering}{$peer_addr}{contactlist} = $peer_cl;
- $device_info{$devid}{peering}{$peer_addr}{asn} =
$peer_asname if $peer_asn;
+ $device_info{$devid}{peering}{$peer_addr}{asn} = $peer_asn
if $peer_asn;
$device_info{$devid}{peering}{$peer_addr}{asname} =
$peer_asname if $peer_asname;
}
$device_info{$devid}{interface}{$intid}{number} = $intnumber;
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
Netdot
------------------------------
Message: 5
Date: Wed, 18 Dec 2013 11:56:04 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-147-gdedc890
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 dedc890f0427411a6aa8bb727b7e561b2aa240c8 (commit)
from e025e01407384c22b0a601c0340b64b34be98448 (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 dedc890f0427411a6aa8bb727b7e561b2aa240c8
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 14:56:00 2013 -0500
Corrections
diff --git a/lib/Netdot/Exporter/Nagios.pm b/lib/Netdot/Exporter/Nagios.pm
index 687e946..970603c 100644
--- a/lib/Netdot/Exporter/Nagios.pm
+++ b/lib/Netdot/Exporter/Nagios.pm
@@ -264,6 +264,7 @@ sub generate_configs {
my $srvname = 'BGPPEER_'.$peer_addr;
$srvname .= '_'.$peering->{asname} if $peering->{asname};
$srvname .= '_('.$peering->{asn}.')' if $peering->{asn};
+ $srvname = $self->_rem_illegal_chars($srvname);
$hosts{$ip}{service}{$srvname}{type} = 'BGPPEER';
$hosts{$ip}{service}{$srvname}{hostname} =
$hosts{$ip}{name};
$hosts{$ip}{service}{$srvname}{peer_addr} = $peer_addr;
-----------------------------------------------------------------------
Summary of changes:
lib/Netdot/Exporter/Nagios.pm | 1 +
1 files changed, 1 insertions(+), 0 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 81, Issue 8
*******************************************
