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. [Netdot - Support #1783] (New) Update ([email protected])
2. [Netdot - Support #1783] (Resolved) Update
([email protected])
3. [Netdot - Feature #1779] (In Progress) Inherit REMOTE_USER
when set externally ([email protected])
4. [Netdot - Bug #1763] (Resolved) Displays empty recommended OS
Version in reports Model/OS ([email protected])
5. [Netdot] 'WikiStart' wiki page has been updated
([email protected])
6. [Netdot - Feature #1780] (In Progress) Add Owner and Used by
fields to Asset ([email protected])
7. [Netdot - Bug #1754] (Closed) Validation error after changing
subnet mask ([email protected])
8. [Netdot - Bug #1762] (Resolved) Reverse auto DNS breaks in
DeviceIpNamesByInt.pm when a device hostname contains a "."
([email protected])
9. [Netdot - Bug #1760] UTF-8 data retrivied from database
breaks UTF-8 content of the page ([email protected])
10. [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-142-g413bdd9 ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 18 Dec 2013 04:33:20 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Support #1783] (New) Update
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1783 has been reported by Hubert Wirtensohn.
----------------------------------------
Support #1783: Update
https://osl.uoregon.edu/redmine/issues/1783
Author: Hubert Wirtensohn
Status: New
Priority: Normal
Assignee:
Category:
Target version:
Resolution:
Hello!
I am using netdot Version 0.9.10
Whow can i update the database to the newest Version 1.0.4?
What is the actual development Status of the Project? Does
anyone work on the Project or is it sleeping?
Regards, Hubert Wirtensohn
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 2
Date: Wed, 18 Dec 2013 08:09:06 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Support #1783] (Resolved) Update
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1783 has been updated by Carlos Vicente.
Category set to Netdot
Status changed from New to Resolved
Assignee set to Carlos Vicente
Resolution set to fixed
Hello Hubert,
Hubert Wirtensohn wrote:
> Hello!
> I am using netdot Version 0.9.10
> Whow can i update the database to the newest Version 1.0.4?
First you need to download version 1.0.1 and run its upgrade script. See here:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/OlderVersions
Once that's done, you can download 1.0.4 and run the upgrade script from that
one.
If you need more assistance, I recommend joining the users mailing list.
> What is the actual development Status of the Project? Does
> anyone work on the Project or is it sleeping?
There is substantial work being done. We've just been slow in releasing new
versions. I expect to have release 1.0.5 out very soon now.
Best,
cv
----------------------------------------
Support #1783: Update
https://osl.uoregon.edu/redmine/issues/1783#change-3136
Author: Hubert Wirtensohn
Status: Resolved
Priority: Normal
Assignee: Carlos Vicente
Category: Netdot
Target version:
Resolution: fixed
Hello!
I am using netdot Version 0.9.10
Whow can i update the database to the newest Version 1.0.4?
What is the actual development Status of the Project? Does
anyone work on the Project or is it sleeping?
Regards, Hubert Wirtensohn
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 3
Date: Wed, 18 Dec 2013 08:43:47 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Feature #1779] (In Progress) Inherit
REMOTE_USER when set externally
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1779 has been updated by Carlos Vicente.
Status changed from New to In Progress
Target version changed from 1.0.5 to 1.0.6
This needs more work to make sure that it works in both cases (with and without
SSO).
----------------------------------------
Feature #1779: Inherit REMOTE_USER when set externally
https://osl.uoregon.edu/redmine/issues/1779#change-3137
Author: Carlos Vicente
Status: In Progress
Priority: Normal
Assignee:
Category: UserInterface
Target version: 1.0.6
Resolution:
https://gist.github.com/simnv/9b3cd0bb347cc3541239
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 4
Date: Wed, 18 Dec 2013 08:57:49 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1763] (Resolved) Displays empty
recommended OS Version in reports Model/OS
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1763 has been updated by Carlos Vicente.
Status changed from New to Resolved
Assignee set to Carlos Vicente
Target version set to 1.0.5
Resolution set to fixed
----------------------------------------
Bug #1763: Displays empty recommended OS Version in reports Model/OS
https://osl.uoregon.edu/redmine/issues/1763#change-3138
Author: Petr ?ech
Status: Resolved
Priority: Low
Assignee: Carlos Vicente
Category: UserInterface
Target version: 1.0.5
Resolution: fixed
Hi,
I've stumbled over this minor display error in report Model/OS. When there are
multiple OS versions for a given model an empty "(recommended: )" is displayed
(see screenshots).
Attached patch causes the "recommended:" being displayed only when there is a
recommended version set for a given model.
Regards,
Petr
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 5
Date: Wed, 18 Dec 2013 09:02:32 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot] 'WikiStart' wiki page has been
updated
To: [email protected]
Cc: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
The 'WikiStart' wiki page has been updated by Carlos Vicente.
WikiStart:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WikiStart
View differences:
https://osl.uoregon.edu/redmine/projects/netdot/wiki/WikiStart/diff/74
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 6
Date: Wed, 18 Dec 2013 09:09:08 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Feature #1780] (In Progress) Add
Owner and Used by fields to Asset
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1780 has been updated by Carlos Vicente.
Category set to DeviceManagement
Status changed from New to In Progress
Assignee set to Carlos Vicente
Target version set to 1.0.6
I see the value in this, but I wonder if it would make more sense to move the
fields off from Device and into Asset.
This would require a more involved migration of existing data sets, and also
modifications to the UI, so I will not include this in the next release.
----------------------------------------
Feature #1780: Add Owner and Used by fields to Asset
https://osl.uoregon.edu/redmine/issues/1780#change-3139
Author: Matej Vadnjal
Status: In Progress
Priority: Normal
Assignee: Carlos Vicente
Category: DeviceManagement
Target version: 1.0.6
Resolution:
Attached is a patch that adds Owner and Used by fields to Assets.
Here is why we need this:
When a customer connects to our network, they need to provide their own SFP
module, that we plug into our backbone router. If a module happens to fail we
usually provide our own replacement since few customers are able to provide a
replacement quickly. After a while people forget that a module has been loaned,
tickets / emails get buried and nobody is sure anymore to who the module being
used belongs to.
With this patch I can make a script that will send reminders if an asset
plugged in a customer interface is not owned by that customer.
The patch was developed on top of current HEAD of master branch
(ecd83f76715...).
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 7
Date: Wed, 18 Dec 2013 09:11:06 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1754] (Closed) Validation error
after changing subnet mask
To: [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1754 has been updated by Carlos Vicente.
Status changed from New to Closed
Resolution set to wontfix
This has proven difficult to replicate, and the truth is that it will likely
disappear with the migration to Pg. Closing for now.
----------------------------------------
Bug #1754: Validation error after changing subnet mask
https://osl.uoregon.edu/redmine/issues/1754#change-3140
Author: Carlos Vicente
Status: Closed
Priority: Normal
Assignee: Carlos Vicente
Category: IPManagement
Target version: 1.0.5
Resolution: wontfix
Assume I have a larger subnet, say a /26
I then decide that I want to break that into smaller networks
the network subnet previously had DHCP enabled
So, I remove the scope, which I assumes disables DHCP for the subnet
I then change the mask from 26 to 28
then attempt to create another /28 bit it complains that I am attempting to
create a subnet within a subnet
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 8
Date: Wed, 18 Dec 2013 09:22:11 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1762] (Resolved) Reverse auto
DNS breaks in DeviceIpNamesByInt.pm when a device hostname
contains a
"."
To: [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1762 has been updated by Carlos Vicente.
Status changed from New to Resolved
Assignee set to Carlos Vicente
Resolution set to fixed
Nick Hilliard wrote:
> DeviceIpNamesByInt::get_name_from_interface automatically strips anything
> after and including the period in a device name. If the network device
> actually has a legitimate "." in it, this breaks the auto reverse DNS.
>
> E.g. if your device hostname is "router.pop", the interface name is Gi0/0 and
> the domain name is "example.com",
> DeviceIpNamesByInt::get_name_from_interface() will return
> "gi0-0.pop.example.com" instead of "gi0-0.router.pop.example.com". This is
> obviously incorrect.
>
> This can be fixed with the following patch:
>
> [...]
>
> I'm not sure what the best thing is to do here. If this line is removed,
> that will change the default behaviour, which may affect other installations.
> On the other hand, the current behaviour is clearly wrong in many legitimate
> situations.
I agree. That replacement should not be there. The fix should be there in the
next release.
Thanks!
cv
----------------------------------------
Bug #1762: Reverse auto DNS breaks in DeviceIpNamesByInt.pm when a device
hostname contains a "."
https://osl.uoregon.edu/redmine/issues/1762#change-3141
Author: Nick Hilliard
Status: Resolved
Priority: Normal
Assignee: Carlos Vicente
Category: DNS
Target version: 1.0.5
Resolution: fixed
DeviceIpNamesByInt::get_name_from_interface automatically strips anything after
and including the period in a device name. If the network device actually has
a legitimate "." in it, this breaks the auto reverse DNS.
E.g. if your device hostname is "router.pop", the interface name is Gi0/0 and
the domain name is "example.com", DeviceIpNamesByInt::get_name_from_interface()
will return "gi0-0.pop.example.com" instead of "gi0-0.router.pop.example.com".
This is obviously incorrect.
This can be fixed with the following patch:
<pre>
--- lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm.old 2013-06-14
02:13:43.000000000 +0100
+++ lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm 2013-06-19
23:55:21.000000000 +0100
@@ -142,7 +142,7 @@
# Remove any possible prefixes added
# e.g. loopback0.devicename -> devicename
my $devname = $ip->interface->device->short_name;
- $devname =~ s/^.*\.(.*)/$1/;
+# $devname =~ s/^.*\.(.*)/$1/;
$name .= ".".$devname ;
return $name;
</pre>
I'm not sure what the best thing is to do here. If this line is removed, that
will change the default behaviour, which may affect other installations. On
the other hand, the current behaviour is clearly wrong in many legitimate
situations.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 9
Date: Wed, 18 Dec 2013 09:25:34 -0800
From: [email protected]
Subject: [Netdot-devel] [Netdot - Bug #1760] UTF-8 data retrivied from
database breaks UTF-8 content of the page
To: [email protected], [email protected], [email protected]
Message-ID: <[email protected]>
Content-Type: text/plain; charset=utf-8
Issue #1760 has been updated by Carlos Vicente.
Assignee set to Anton Berezin
Target version deleted (1.0.5)
----------------------------------------
Bug #1760: UTF-8 data retrivied from database breaks UTF-8 content of the page
https://osl.uoregon.edu/redmine/issues/1760#change-3142
Author: Andrew Kornilov
Status: New
Priority: Normal
Assignee: Anton Berezin
Category: Netdot
Target version:
Resolution:
Hi there,
We like Netdot very much and want it to be used all around the world. There are
many small ISP companies (and we are one of them) in Russia and they can't use
Netdot with English language. Unfortunately, Netdot doesn't provide anything
like GNU gettext support so we had to start translation right inside the code
and page templates. Furthermore, all our sites, cables, addresses and so on are
in Russian.
Unfortunately, we've found some strange problems: some pages are displayed like
double UTF8 encoded.
Here is the example how it looks like: http://imagebin.org/259678
After discovering i found that this happens in this block of code:
htdocs/cable_plant/autohandler (lines 180-184):
<%perl>
foreach my $site (@sites) {
printf("<option value=\"%s\">%s</option>\n", $site->id,
$site->name);
}
</%perl>
Next step showed that removing Russian site names from output solves the
problem, now it looks like this:
http://imagebin.org/259680
I tried to UTF8 encode retrieved data:
my $site_name = Encode::encode_utf8($site->name);
printf("<option value=\"%s\">%s</option>\n", $site->id, $site_name);
and that solved the problem!
That happens on every page that uses data retrieved from database. So it seems
that Netdot doesn't encode data from database to UTF8 and outputs it in way
that breaks the page.
Could you please take a look into the database code and find what causes that?
We do not want to UTF8-encode each data in every HTML template and so on, so
it's better to make some changes to DB util code to make it work everywhere.
Thank you in advance.
P.S. We use GIT, track last changes of the original Netdot, patch it with
Russian lagnuange and publish it so everyone can use it.
--
You have received this notification because you have either subscribed to it,
or are involved in it.
To change your notification preferences, please click here:
http://osl.uoregon.edu/redmine/my/account
------------------------------
Message: 10
Date: Wed, 18 Dec 2013 11:29:16 -0800
From: [email protected]
Subject: [Netdot-devel] [SCM] Netdot branch netdot-1.0 updated.
netdot-1.0.4-142-g413bdd9
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 413bdd905e7e14674caca689dd042022705b29bb (commit)
via 33bc568385d41fd48386b4af93e5be9f464abece (commit)
via 8eee27687fe6ed9798d85f99dd8e0e96cf9d6960 (commit)
from 3b5852e316e060e18783d7f636860eb33721cde6 (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 413bdd905e7e14674caca689dd042022705b29bb
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 14:29:02 2013 -0500
Fix for #1767 (Include Entity name (from WHOIS query) in BGP Peer Nagios
check service definition)
diff --git a/bin/check_bgppeer.pl b/bin/check_bgppeer.pl
index 58797da..bfd4d1a 100755
--- a/bin/check_bgppeer.pl
+++ b/bin/check_bgppeer.pl
@@ -19,21 +19,11 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
#
-#
-# Report bugs to: cvicente(at)ns.uoregon.edu
-#
-# 08/05/2009 Version 1.1
-# 09/29/2011 Version 1.2 - Fixed incorrect return values
-# 09/29/2011 Version 1.3 - Use radb.net as whois server
use SNMP;
use strict;
use Getopt::Long qw(:config no_ignore_case bundling);
-# whois program for Registry database queries
-my $whois = '/usr/bin/whois';
-my $whoissrv = 'whois.radb.net';
-my $whoisfield = "as-name";
my $TIMEOUT = 30;
my %self;
@@ -74,7 +64,6 @@ my $usage = <<EOF;
-a, --address BGP Peer remote address (NOT peer ID)
-c, --comm SNMP community (default: public)
-v, --version SNMP version (default: 1)
- -w, --whois Query WHOIS for AS name
-d, --debug Print debugging output
-h, --help Show this message
@@ -93,7 +82,6 @@ my $result = GetOptions(
"H|hostname=s" => \$self{HOSTNAME},
"a|address=s" => \$self{PEER},
"c|comm=s" => \$self{COMMUNITY},
- "w|whois" => \$self{WHOIS},
"v|version=s" => \$self{VERSION},
"d|debug" => \$self{DEBUG},
"h|help" => \$self{HELP},
@@ -160,23 +148,7 @@ if ( $bgp_state eq 'established' || $bgp_state eq 'idle' )
{
print "$state\n";
}else {
$state = 'CRITICAL';
- my $asname = "n/a";
- if ( $self{WHOIS} ){
- &debug("Quering WHOIS server $whoissrv");
-
- my @output = `$whois -h $whoissrv AS$as`;
- my ($name, $value);
- foreach (@output) {
- if (/No entries found/i){
- last;
- }
- if (/$whoisfield:/){
- (undef, $asname) = split /\s+/, $_;
- last;
- }
- }
- }
- print ("$state: $as ($asname) is $bgp_state\n");
+ print ("$state: $self{PEER} ($as) is $bgp_state\n");
}
exit $ERRORS{$state};
diff --git a/lib/Netdot/Exporter.pm b/lib/Netdot/Exporter.pm
index 06bef0d..94ae1d2 100644
--- a/lib/Netdot/Exporter.pm
+++ b/lib/Netdot/Exporter.pm
@@ -90,7 +90,8 @@ 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
+ bgppeering.bgppeeraddr, bgppeering.monitored,
bgppeering.contactlist,
+ peer.asn, 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
@@ -101,6 +102,7 @@ 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
@@ -116,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,
- $peeraddr, $peermon, $peercl) = @$row;
+ $peer_addr, $peer_rmon, $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;
@@ -132,8 +134,12 @@ sub get_device_info {
$device_info{$devid}{site_number} = $site_number if defined
$site_number;
$device_info{$devid}{site_alias} = $site_alias if defined
$site_alias;
$device_info{$devid}{contactlist}{$clid} = 1 if defined $clid;
- $device_info{$devid}{peering}{$peeraddr}{monitored} = $peermon if
defined $peeraddr;
- $device_info{$devid}{peering}{$peeraddr}{contactlist} = $peercl if
defined $peeraddr;
+ 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;
+ }
$device_info{$devid}{interface}{$intid}{number} = $intnumber;
$device_info{$devid}{interface}{$intid}{name} = $intname;
$device_info{$devid}{interface}{$intid}{description} = $intdesc;
diff --git a/lib/Netdot/Exporter/Nagios.pm b/lib/Netdot/Exporter/Nagios.pm
index 7a40f3e..34228f9 100644
--- a/lib/Netdot/Exporter/Nagios.pm
+++ b/lib/Netdot/Exporter/Nagios.pm
@@ -259,13 +259,15 @@ sub generate_configs {
if ( $devh->{snmp_managed} ){
# Add a bgppeer service check for each monitored BGP peering
- foreach my $peeraddr ( keys %{$devh->{peering}} ){
- my $peering = $devh->{peering}->{$peeraddr};
+ foreach my $peer_addr ( keys %{$devh->{peering}} ){
+ my $peering = $devh->{peering}->{$peer_addr};
next unless ( $peering->{monitored} );
- my $srvname = "BGPPEER_".$peeraddr;
+ my $srvname = 'BGPPEER_'.$peer_addr;
+ $srvname .= '_'.$peering->{asname} if $peering->{asname};
+ $srvname .= '_('.$peering->{asn}.')' if $peering->{asn};
$hosts{$ip}{service}{$srvname}{type} = 'BGPPEER';
$hosts{$ip}{service}{$srvname}{hostname} =
$hosts{$ip}{name};
- $hosts{$ip}{service}{$srvname}{peeraddr} = $peeraddr;
+ $hosts{$ip}{service}{$srvname}{peer_addr} = $peer_addr;
$hosts{$ip}{service}{$srvname}{srvname} = $srvname;
$hosts{$ip}{service}{$srvname}{community} =
$devh->{community};
my @peercls;
@@ -597,13 +599,13 @@ sub print_service {
}
if ( $srvname =~ /^BGPPEER/o ){
- my $peeraddr;
- unless ( $peeraddr = $argv->{peeraddr} ){
- $logger->warn("Service check for $srvname requires peeraddr." .
+ my $peer_addr;
+ unless ( $peer_addr = $argv->{peer_addr} ){
+ $logger->warn("Service check for $srvname requires peer_addr." .
" Skipping $srvname check for host $hostname.");
return;
}
- $checkcmd .= "!$peeraddr"; # Pass the argument to the check command
+ $checkcmd .= "!$peer_addr"; # Pass the argument to the check command
}
my %levels;
commit 33bc568385d41fd48386b4af93e5be9f464abece
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 09:33:16 2013 -0500
Fix for 1762 (Reverse auto DNS breaks in DeviceIpNamesByInt.pm when a
device hostname contains a .)
diff --git a/lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm
b/lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm
index f2322ba..3d24178 100644
--- a/lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm
+++ b/lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm
@@ -139,10 +139,7 @@ sub get_name_from_interface {
$name =~ s/-\./\./g;
# Append device name
- # Remove any possible prefixes added
- # e.g. loopback0.devicename -> devicename
my $devname = $ip->interface->device->short_name;
- $devname =~ s/^.*\.(.*)/$1/;
$name .= ".".$devname ;
return $name;
commit 8eee27687fe6ed9798d85f99dd8e0e96cf9d6960
Author: Carlos Vicente <[email protected]>
Date: Wed Dec 18 09:09:29 2013 -0500
Fix for #1763 (Displays empty recommended OS Version in reports Model/OS)
diff --git a/htdocs/reports/device_inventory.html
b/htdocs/reports/device_inventory.html
index 148a8e1..217e73b 100644
--- a/htdocs/reports/device_inventory.html
+++ b/htdocs/reports/device_inventory.html
@@ -215,7 +215,7 @@ if ( $report_type eq 'product' || $report_type eq
'product_monitored' ){
my $latest_os;
if ( $prod ne 'Unset' && ($product = Product->retrieve($prod)) ){
push( @row, "<strong><a
href=\"../generic/view.html?table=Product&id=$prod\">" . $product->name .
"</a></strong>" );
- $latest_os = "(recommended: ".$product->latest_os.")" if
defined($product->latest_os);
+ $latest_os = "(recommended: ".$product->latest_os.")" if
($product->latest_os);
}else{
push( @row, $prod );
}
-----------------------------------------------------------------------
Summary of changes:
bin/check_bgppeer.pl | 30 +-----------------------
htdocs/reports/device_inventory.html | 2 +-
lib/Netdot/Exporter.pm | 14 ++++++++---
lib/Netdot/Exporter/Nagios.pm | 18 ++++++++------
lib/Netdot/Model/Plugins/DeviceIpNamesByInt.pm | 3 --
5 files changed, 22 insertions(+), 45 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 7
*******************************************
