diff options
| author | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-21 12:22:34 +0100 |
|---|---|---|
| committer | Nicolai Tellefsen <niccofyren@gmail.com> | 2016-03-21 12:22:34 +0100 |
| commit | ac9fec052dce3bd911690e9a4ecb5010c5fd9673 (patch) | |
| tree | 979d72c73df9b35baf557e67cf9ef652865f9ab3 | |
| parent | 9f2d2bc0faba3eef6ddfd7cfaf87dc28988acecf (diff) | |
| parent | 9294a2f2b20a9289a9b5c4a4b72f308de85d8c30 (diff) | |
Merge branch 'master' of https://github.com/tech-server/tgmanage
| -rwxr-xr-x | clients/snmpfetchng.pl | 2 | ||||
| -rwxr-xr-x | tools/get_mibs.sh | 5 | ||||
| -rw-r--r-- | web/nms.gathering.org/js/nms-info-box.js | 2 | ||||
| -rw-r--r-- | web/nms.gathering.org/js/nms-map.js | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/clients/snmpfetchng.pl b/clients/snmpfetchng.pl index bece8ab..36dd675 100755 --- a/clients/snmpfetchng.pl +++ b/clients/snmpfetchng.pl @@ -95,7 +95,7 @@ sub inner_loop } } mylog( "Polling " . @switches . " switches: $poll_todo"); - SNMP::MainLoop(5); + SNMP::MainLoop(10); } sub callback{ diff --git a/tools/get_mibs.sh b/tools/get_mibs.sh index cab9fa3..7c8cc52 100755 --- a/tools/get_mibs.sh +++ b/tools/get_mibs.sh @@ -1,6 +1,5 @@ #!/bin/sh -MIBS="SNMPv2 ENTITY IF LLDP IP IP-FORWARD" ORIGPWD=$PWD TMP=$(mktemp -d) set -x @@ -10,9 +9,7 @@ wget ftp://ftp.cisco.com/pub/mibs/v2/v2.tar.gz tar xvzf v2.tar.gz --strip-components=2 mkdir -p mibs -for a in $MIBS; do - cp v2/$a-MIB.my mibs/ -done +cp v2/* mibs/ mv mibs ${ORIGPWD}/ cd ${ORIGPWD} rm -rf ${TMP} diff --git a/web/nms.gathering.org/js/nms-info-box.js b/web/nms.gathering.org/js/nms-info-box.js index 88bc7d7..dc993a9 100644 --- a/web/nms.gathering.org/js/nms-info-box.js +++ b/web/nms.gathering.org/js/nms-info-box.js @@ -133,6 +133,8 @@ nmsInfoBox._windowTypes.addSwitch = { if(result.switches_addded.length > 0) { nmsInfoBox.hide(); } + nmsData.invalidate("switches"); + nmsData.invalidate("smanagement"); } }); } diff --git a/web/nms.gathering.org/js/nms-map.js b/web/nms.gathering.org/js/nms-map.js index bbb304f..b74626a 100644 --- a/web/nms.gathering.org/js/nms-map.js +++ b/web/nms.gathering.org/js/nms-map.js @@ -433,7 +433,7 @@ nmsMap._moveSubmit = function() { var myData = JSON.stringify([data]); $.ajax({ type: "POST", - url: "/api/private/switch-add", + url: "/api/private/switch-update", dataType: "text", data:myData, success: function (data, textStatus, jqXHR) { |