From bf09e5844f5bd485154a1871939efc8cde3f6f17 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Thu, 12 Jan 2012 11:16:38 +0000
Subject: [PATCH] os_group ios -> cisco

git-svn-id: http://www.observium.org/svn/observer/trunk@2815 61d68cd4-352d-0410-923a-c4978735b2b8
---
 includes/discovery/bgp-peers.inc.php          | 10 +++++-----
 .../discovery/cisco-entity-sensor.inc.php     |  2 +-
 .../discovery/cisco-mac-accounting.inc.php    |  4 ++--
 includes/discovery/cisco-pw.inc.php           |  6 +++---
 includes/discovery/cisco-vlans.inc.php        |  2 +-
 includes/discovery/cisco-vrf.inc.php          |  4 ++--
 includes/discovery/mempools/cemp.inc.php      |  2 +-
 includes/discovery/mempools/cmp.inc.php       |  2 +-
 includes/discovery/processors/ios.inc.php     |  2 +-
 .../temperatures/cisco-envmon.inc.php         |  2 +-
 includes/polling/bgp-peers.inc.php            |  6 +++---
 .../polling/cisco-ipsec-flow-monitor.inc.php  |  2 +-
 .../cisco-remote-access-monitor.inc.php       |  4 ++--
 includes/polling/cisco-vpdn.inc.php           |  2 +-
 includes/polling/ports.inc.php                |  2 +-
 includes/static-config.php                    | 20 +++++++++----------
 16 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/includes/discovery/bgp-peers.inc.php b/includes/discovery/bgp-peers.inc.php
index 2f2bfed442..d69ba29fb6 100755
--- a/includes/discovery/bgp-peers.inc.php
+++ b/includes/discovery/bgp-peers.inc.php
@@ -80,10 +80,10 @@ if ($config['enable_bgp'])
         echo(".");
       }
 
-      if ($device['os_group'] == "ios" || $device['os'] == "junos")
+      if ($device['os_group'] == "cisco" || $device['os'] == "junos")
       {
 
-        if ($device['os_group'] == "ios")
+        if ($device['os_group'] == "cisco")
         {
           ## Get afi/safi and populate cbgp on cisco ios (xe/xr)
           unset($af_list);
@@ -106,7 +106,7 @@ if ($config['enable_bgp'])
               }
             }
           }
-        } # os=ios
+        } # os_group=cisco
 
         if ($device['os'] == "junos")
         {
@@ -168,7 +168,7 @@ if ($config['enable_bgp'])
             mysql_query("DELETE FROM `bgpPeers_cbgp` WHERE `device_id` = '".$device['device_id']."' AND bgpPeerIdentifier = '".$peer['ip']."' AND afi = '$afi' AND safi = '$safi'");
           }
         } # AF list
-      } # os=ios|junos
+      } # os=cisco|junos
     } # Foreach
 
     unset($j_afisafi);
@@ -206,4 +206,4 @@ if ($config['enable_bgp'])
   echo("\n");
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/cisco-entity-sensor.inc.php b/includes/discovery/cisco-entity-sensor.inc.php
index 73509a837c..4ffaf851e6 100644
--- a/includes/discovery/cisco-entity-sensor.inc.php
+++ b/includes/discovery/cisco-entity-sensor.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "ios" || $device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   echo(" CISCO-ENTITY-SENSOR: ");
 
diff --git a/includes/discovery/cisco-mac-accounting.inc.php b/includes/discovery/cisco-mac-accounting.inc.php
index e5c3820570..ed378b9dee 100755
--- a/includes/discovery/cisco-mac-accounting.inc.php
+++ b/includes/discovery/cisco-mac-accounting.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   echo("Cisco MAC Accounting : ");
 
@@ -43,7 +43,7 @@ if ($device['os_group'] == "ios")
     }
   }
   echo("\n");
-} # os_group=ios
+} # os_group=cisco
 
 // FIXME - NEEDS TO REMOVE STALE ENTRIES?? :O
 ?>
diff --git a/includes/discovery/cisco-pw.inc.php b/includes/discovery/cisco-pw.inc.php
index abbd8ffad9..1b156d1eec 100755
--- a/includes/discovery/cisco-pw.inc.php
+++ b/includes/discovery/cisco-pw.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($config['enable_pseudowires'] && $device['os_group'] == "ios")
+if ($config['enable_pseudowires'] && $device['os_group'] == "cisco")
 {
   unset($cpw_count);
   unset($cpw_exists);
@@ -74,6 +74,6 @@ if ($config['enable_pseudowires'] && $device['os_group'] == "ios")
 
   echo("\n");
 
-} # enable_pseudowires + os_group=ios
+} # enable_pseudowires + os_group=cisco
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/discovery/cisco-vlans.inc.php b/includes/discovery/cisco-vlans.inc.php
index caa9ecc4b6..1350338d03 100755
--- a/includes/discovery/cisco-vlans.inc.php
+++ b/includes/discovery/cisco-vlans.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   echo("Cisco VLANs : ");
 
diff --git a/includes/discovery/cisco-vrf.inc.php b/includes/discovery/cisco-vrf.inc.php
index f05d0d375b..f48ffcdc81 100755
--- a/includes/discovery/cisco-vrf.inc.php
+++ b/includes/discovery/cisco-vrf.inc.php
@@ -2,7 +2,7 @@
 
 if ($config['enable_vrfs'])
 {
-  if ($device['os_group'] == "ios" || $device['os_group'] == "junos" || $device['os'] == "ironware")
+  if ($device['os_group'] == "cisco" || $device['os_group'] == "junos" || $device['os'] == "ironware")
   {
     unset($vrf_count);
 
@@ -101,7 +101,7 @@ if ($config['enable_vrfs'])
     unset($valid_vrf);
 
     echo("\n");
-  } # ios/junos/ironware
+  } # cisco/junos/ironware
 } # enable_vrfs
 
 ?>
diff --git a/includes/discovery/mempools/cemp.inc.php b/includes/discovery/mempools/cemp.inc.php
index 02c2bc7545..2bdec8b5ad 100755
--- a/includes/discovery/mempools/cemp.inc.php
+++ b/includes/discovery/mempools/cemp.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "ios" || $device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   echo("CISCO-ENHANCED-MEMORY-POOL: ");
 
diff --git a/includes/discovery/mempools/cmp.inc.php b/includes/discovery/mempools/cmp.inc.php
index 29443267d4..116f6382a4 100755
--- a/includes/discovery/mempools/cmp.inc.php
+++ b/includes/discovery/mempools/cmp.inc.php
@@ -4,7 +4,7 @@
 
 $cemp_count = mysql_result(mysql_query("SELECT COUNT(*) FROM `mempools` WHERE `device_id` = '".$device['device_id']."' AND `mempool_type` = 'cemp'"),0);
 
-if (($device['os'] == "ios" || $device['os_group'] == "ios") && $cemp_count == "0")
+if (($device['os_group'] == "cisco") && $cemp_count == "0")
 {
   echo("OLD-CISCO-MEMORY-POOL: ");
 
diff --git a/includes/discovery/processors/ios.inc.php b/includes/discovery/processors/ios.inc.php
index 7dbfc9f355..d7389290e5 100755
--- a/includes/discovery/processors/ios.inc.php
+++ b/includes/discovery/processors/ios.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if ($device['os'] == "ios" || $device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   echo("CISCO-PROCESS-MIB : ");
   $processors_array = snmpwalk_cache_oid($device, "cpmCPU", NULL, "CISCO-PROCESS-MIB");
diff --git a/includes/discovery/temperatures/cisco-envmon.inc.php b/includes/discovery/temperatures/cisco-envmon.inc.php
index bcb4e17568..ccb5dff48e 100644
--- a/includes/discovery/temperatures/cisco-envmon.inc.php
+++ b/includes/discovery/temperatures/cisco-envmon.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os'] == "ios" || $device['os_group'] == "ios"))
+if (mysql_result(mysql_query("SELECT COUNT(*) FROM `sensors` WHERE `device_id` = '".$device['device_id']."' AND `sensor_class` = 'temperature' AND (`sensor_type` = 'cisco-entity-sensor' OR `sensor_type` = 'entity-sensor')"),0) == "0" && ($device['os_group'] == "cisco"))
 {
   echo("Cisco ");
   $oids = snmp_walk($device, ".1.3.6.1.4.1.9.9.13.1.3.1.2", "-Osqn", "CISCO-ENVMON-MIB");
diff --git a/includes/polling/bgp-peers.inc.php b/includes/polling/bgp-peers.inc.php
index 1342e65e23..0153f9d8b9 100755
--- a/includes/polling/bgp-peers.inc.php
+++ b/includes/polling/bgp-peers.inc.php
@@ -134,7 +134,7 @@ else
 
     dbUpdate($peer['update'], 'bgpPeers', '`device_id` = ? AND `bgpPeerIdentifier` = ?', array($device['device_id'], $peer['bgpPeerIdentifier']));
 
-    if ($device['os_group'] == "ios" || $device['os'] == "junos")
+    if ($device['os_group'] == "cisco" || $device['os'] == "junos")
     {
       ## Poll each AFI/SAFI for this peer (using CISCO-BGP4-MIB or BGP4-V2-JUNIPER MIB)
       $peer_afis = dbFetchRows("SELECT * FROM bgpPeers_cbgp WHERE `device_id` = ? AND bgpPeerIdentifier = ?", array($device['device_id'], $peer['bgpPeerIdentifier']));
@@ -144,7 +144,7 @@ else
         $safi = $peer_afi['safi'];
         if ($debug) { echo("$afi $safi\n"); }
 
-        if ($device['os_group'] == "ios")
+        if ($device['os_group'] == "cisco")
         {
           ## FIXME - move to function
           $cbgp_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . " -m CISCO-BGP4-MIB -Ovq -" . $device['snmpver'] . " -c" . $device['community'] . " " . $device['hostname'].":".$device['port'];
@@ -238,7 +238,7 @@ else
         }
         rrdtool_update("$cbgp_rrd", "N:$cbgpPeerAcceptedPrefixes:$cbgpPeerDeniedPrefixes:$cbgpPeerAdvertisedPrefixes:$cbgpPeerSuppressedPrefixes:$cbgpPeerWithdrawnPrefixes");
       } # while
-    } # os=ios | junos
+    } # os_group=cisco | junos
     echo("\n");
 
   } ## End While loop on peers
diff --git a/includes/polling/cisco-ipsec-flow-monitor.inc.php b/includes/polling/cisco-ipsec-flow-monitor.inc.php
index 76e813efcf..f0ea6dff9b 100755
--- a/includes/polling/cisco-ipsec-flow-monitor.inc.php
+++ b/includes/polling/cisco-ipsec-flow-monitor.inc.php
@@ -32,7 +32,7 @@
 #CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalNoSaFails.0 = Counter32: 5 Failures
 #CISCO-IPSEC-FLOW-MONITOR-MIB::cipSecGlobalSysCapFails.0 = Counter32: 0 Failures
 
-if ($device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   $data = snmpwalk_cache_oid($device, "cipSecGlobalStats", NULL, "CISCO-IPSEC-FLOW-MONITOR-MIB");
   $data = $data[0];
diff --git a/includes/polling/cisco-remote-access-monitor.inc.php b/includes/polling/cisco-remote-access-monitor.inc.php
index 3702de8ed6..7c329700ba 100755
--- a/includes/polling/cisco-remote-access-monitor.inc.php
+++ b/includes/polling/cisco-remote-access-monitor.inc.php
@@ -31,7 +31,7 @@
 #CISCO-REMOTE-ACCESS-MONITOR-MIB::crasWebvpnCumulateSessions.0 = Counter32: 29 Sessions
 #CISCO-REMOTE-ACCESS-MONITOR-MIB::crasWebvpnPeakConcurrentSessions.0 = Gauge32: 9 Sessions
 
-if ($device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   $oid_list = "crasEmailNumSessions.0 crasIPSecNumSessions.0 crasL2LNumSessions.0 crasLBNumSessions.0 crasSVCNumSessions.0 crasWebvpnNumSessions.0";
   $data = snmp_get_multi($device, $oid_list, "-OUQs", "CISCO-REMOTE-ACCESS-MONITOR-MIB");
@@ -85,4 +85,4 @@ if ($device['os_group'] == "ios")
   unset($data, $$rrd_filename, $rrd_create, $rrd_update);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/includes/polling/cisco-vpdn.inc.php b/includes/polling/cisco-vpdn.inc.php
index af3c4df6ef..a2254b9a6b 100755
--- a/includes/polling/cisco-vpdn.inc.php
+++ b/includes/polling/cisco-vpdn.inc.php
@@ -8,7 +8,7 @@
 #CISCO-VPDN-MGMT-MIB::cvpdnSystemDeniedUsersTotal.l2tp = Counter32: 0 attempts
 #CISCO-VPDN-MGMT-MIB::cvpdnSystemClearSessions.0 = INTEGER: none(1)
 
-if ($device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   $data = snmpwalk_cache_oid($device, "cvpdnSystemEntry", NULL, "CISCO-VPDN-MGMT-MIB");
 
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index e7fc737645..3c88b12f46 100755
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -76,7 +76,7 @@ if ($device['adsl_count'] > "0")
 #foreach ($cisco_oids as $oid)     { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "OLD-CISCO-INTERFACES-MIB"); }
 #foreach ($pagp_oids as $oid)      { $port_stats = snmpwalk_cache_oid($device, $oid, $port_stats, "CISCO-PAGP-MIB"); }
 
-if ($device['os_group'] == "ios")
+if ($device['os_group'] == "cisco")
 {
   $port_stats = snmp_cache_portIfIndex ($device, $port_stats);
   $port_stats = snmp_cache_portName ($device, $port_stats);
diff --git a/includes/static-config.php b/includes/static-config.php
index 766b340194..1210384a55 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -149,7 +149,7 @@ $config['os'][$os]['icon']              = "alcatellucent";
 ## Cisco OSes
 
 $os = "ios";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco IOS";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['ifXmcbc']           = 1;
@@ -162,8 +162,8 @@ $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 $config['os'][$os]['icon']              = "cisco";
 
 $os = "acsw";
-$config['os'][$os]['group']             = "ios";
-$config['os'][$os]['text']              = "Cisco Application Control Software";
+$config['os'][$os]['group']             = "cisco";
+$config['os'][$os]['text']              = "Cisco ACE";
 $config['os'][$os]['ifname']            = 1;
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "cisco";
@@ -187,7 +187,7 @@ $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "iosxe";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco IOS-XE";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['ifXmcbc']           = 1;
@@ -200,7 +200,7 @@ $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 $config['os'][$os]['icon']              = "cisco";
 
 $os = "iosxr";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco IOS-XR";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['ifXmcbc']           = 1;
@@ -213,7 +213,7 @@ $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "asa";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco ASA";
 $config['os'][$os]['ifname']            = 1;
 $config['os'][$os]['type']              = "firewall";
@@ -224,7 +224,7 @@ $config['os'][$os]['over'][1]['graph']  = "device_processor";
 $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 
 $os = "pix";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco PIX-OS";
 $config['os'][$os]['ifname']            = 1;
 $config['os'][$os]['type']              = "firewall";
@@ -237,7 +237,7 @@ $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "nxos";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco NX-OS";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "cisco";
@@ -249,7 +249,7 @@ $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "sanos";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco SAN-OS";
 $config['os'][$os]['type']              = "network";
 $config['os'][$os]['icon']              = "cisco";
@@ -261,7 +261,7 @@ $config['os'][$os]['over'][2]['graph']  = "device_mempool";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
 $os = "catos";
-$config['os'][$os]['group']             = "ios";
+$config['os'][$os]['group']             = "cisco";
 $config['os'][$os]['text']              = "Cisco CatOS";
 $config['os'][$os]['ifname']            = 1;
 $config['os'][$os]['type']              = "network";