diff options
| author | Sjur Fredriksen <sjurtf@ifi.uio.no> | 2023-01-30 22:02:57 +0100 |
|---|---|---|
| committer | Sjur Fredriksen <sjurtf@ifi.uio.no> | 2023-01-30 22:02:57 +0100 |
| commit | 039c05406a8cc29ab4867ffdef1b51890ef694dc (patch) | |
| tree | 9387433c50f208572851771fcd1565e694ae975a | |
| parent | dcf832a28b042687f1d0c742c0804c8eeb747df5 (diff) | |
tg23 init
| -rwxr-xr-x | web/api/public/switch-state | 8 | ||||
| -rw-r--r-- | web/js/nms-info-box.js | 2 | ||||
| -rw-r--r-- | web/js/nms-map-handlers.js | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/web/api/public/switch-state b/web/api/public/switch-state index da108a5..d192504 100755 --- a/web/api/public/switch-state +++ b/web/api/public/switch-state @@ -38,7 +38,7 @@ while ( my $ref = $q->fetchrow_hashref() ) { if ($porti =~ m/\.0$/) { next; } - if ($data{'ports'}{$porti}{'ifAlias'} =~ m/client/i) { + if ($data{'ports'}{$porti}{'ifAlias'} =~ m/C:/i) { $smallport =~ s/[0-9-].*$//; } else { $json{'switches'}{$sysname}{ifs}{$smallport}{'ifAlias'} = $port{'ifAlias'}; @@ -55,7 +55,7 @@ while ( my $ref = $q->fetchrow_hashref() ) { } } if ($data{'ports'}{$porti}{'ifType'} ne "propVirtual" and - $data{'ports'}{$porti}{'ifAlias'} =~ m/Clients/i) { + $data{'ports'}{$porti}{'ifAlias'} =~ m/C:/i) { if ($port{'ifAdminStatus'} eq "up") { $json{'switches'}{$sysname}{'clients'}{'ifHCInOctets'} += $port{'ifHCInOctets'}; $json{'switches'}{$sysname}{'clients'}{'ifHCOutOctets'} += $port{'ifHCOutOctets'}; @@ -107,7 +107,7 @@ while ( my $ref = $q2->fetchrow_hashref() ) { if ($porti =~ m/\.0$/) { next; } - if ($data{'ports'}{$porti}{'ifAlias'} =~ m/client/i) { + if ($data{'ports'}{$porti}{'ifAlias'} =~ m/C:/i) { $smallport =~ s/[0-9-].*$//; } else { $json{'then'}{$sysname}{ifs}{$smallport}{'ifAlias'} = $port{'ifAlias'}; @@ -124,7 +124,7 @@ while ( my $ref = $q2->fetchrow_hashref() ) { } } if ($data{'ports'}{$porti}{'ifType'} ne "propVirtual" and - $data{'ports'}{$porti}{'ifAlias'} =~ m/Clients/i) { + $data{'ports'}{$porti}{'ifAlias'} =~ m/C:/i) { if ($port{'ifAdminStatus'} eq "up") { $json{'then'}{$sysname}{'clients'}{'ifHCInOctets'} += $port{'ifHCInOctets'}; $json{'then'}{$sysname}{'clients'}{'ifHCOutOctets'} += $port{'ifHCOutOctets'}; diff --git a/web/js/nms-info-box.js b/web/js/nms-info-box.js index b00a442..2e3eb06 100644 --- a/web/js/nms-info-box.js +++ b/web/js/nms-info-box.js @@ -953,7 +953,7 @@ var switchLinks = function() { var sw = this.sw; var topp = document.createElement("div") - var urls = [ "http://gondul.tg19.gathering.org/api/templates/magic.conf/switch=" + sw, + var urls = [ "http://gondul.tg23.gathering.org/api/templates/magic.conf/switch=" + sw, "http://185.110.149.4/api/templates/magic.conf/switch=" + sw ]; if (testTree(nmsData,['smanagement','switches',sw])) { var mg = nmsData["smanagement"]["switches"][sw]; diff --git a/web/js/nms-map-handlers.js b/web/js/nms-map-handlers.js index 1779bb5..03ee2ea 100644 --- a/web/js/nms-map-handlers.js +++ b/web/js/nms-map-handlers.js @@ -828,7 +828,7 @@ function snmpUpInfo(sw) { ret.score = 0; } - ret.why = "LAG member (ge/xe/et) speed is " + seen_up + " but logical (ae) is " + total_up; + ret.why = "LAG member (ge/mge/xe/et) speed is " + seen_up + " but logical (ae) is " + total_up; ret.data[0].value = ret.why; } } |