]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Modified to use SMIv2
authorglenn <>
Thu, 24 Sep 1998 03:21:08 +0000 (03:21 +0000)
committerglenn <>
Thu, 24 Sep 1998 03:21:08 +0000 (03:21 +0000)
src/mib.txt

index c71efafb1b7fe253a6b21bd519cacdefd52cedbe..ff4c4f0c45dc63c3408dde3d1fd23928aebb1415 100644 (file)
@@ -1,38 +1,48 @@
--- File: SQUID.MIB
--- Maintained by: glenn@ircache.net
+SQUID-MIB  DEFINITIONS ::= BEGIN
 --
--- NOTE: This version (1.14) of the mib is supported as of squid1.2beta19. 
+-- $Id: mib.txt,v 1.16 1998/09/23 21:21:08 glenn Exp $
 --
-
-SQUID-MIB DEFINITIONS ::= BEGIN
-               IMPORTS
-               TimeTicks,
-               Counter                FROM RFC1155-SMI
-               DisplayString          FROM RFC1158-MIB
-               mib-2                  FROM RFC1213-MIB
-               OBJECT-TYPE            FROM RFC-1212
-               TRAP-TYPE              FROM RFC-1215;
+IMPORTS
+       enterprises, Unsigned32, TimeTicks, Gauge32, Counter32,
+       MODULE-IDENTITY, OBJECT-TYPE
+               FROM SNMPv2-SMI
+
+       DisplayString
+               FROM SNMPv2-TC;
+
+nlanr OBJECT IDENTIFIER ::= { enterprises 3495 }
+
+squid MODULE-IDENTITY
+    LAST-UPDATED "9809220000Z"
+    ORGANIZATION "National Laboratory for Applied Network Research"
+    CONTACT-INFO
+            "        Glenn Chisholm
+
+             Postal: National Centre for Atmospheric Research (NCAR)
+                    Room 36, SCD
+                    PO Box 3000
+                     Boulder, Colorado 80307  
+                     US
+
+                Tel: +1 303 497 1289
+                Fax: +1 303 497 1818
+
+             E-mail: glenn@ircache.net"
+    DESCRIPTION
+               "Squid MIB defined for the management of the squid
+               proxy server. See http://squid.nlanr.net/."
+           
+    REVISION      "9809220000Z"
+    DESCRIPTION
+               "Move to SMIv2. Prepare to split into proxy/squid."
+    ::= { nlanr 1 }
 
 -- Do NOT remove the following line
 
--- v 1.14 1998/04/03 kostas@nlanr.net
-
--- 
--- definition of squid mib subtree
--- NOTE: This should be left this way for compatibility with various tools
-
-       squid OBJECT IDENTIFIER ::= { 
-               iso 
-               org(3) 
-               dod(6)          
-               internet(1) 
-               experimental(3) 
-               nsfnet(25) 
-               17 
-       }
+-- v 1.16 1998/09/22 glenn@ircache.net
 
 --
--- Major MIB groups
+-- OID Assignments
 --
 
        cacheSystem     OBJECT IDENTIFIER ::= { squid 1 }
@@ -45,161 +55,31 @@ SQUID-MIB DEFINITIONS ::= BEGIN
 --
 -- cacheSystem group
 --
--- Should contain information not otherwise accessible through
--- standard MIB's. Where this is not true, we will align as soon
--- as possible!
--- One reason to keep this information here is for dedicated 
--- hardware as offered by today's commercial caching solutions
--- 
 
         cacheSysVMsize OBJECT-TYPE
                SYNTAX Integer32
-               ACCESS read-only
-               STATUS mandatory
+               MAX-ACCESS read-only
+               STATUS current
                DESCRIPTION
                        " Virtual Memory size in KB"
        ::= { cacheSystem 1 }
 
        cacheSysStorage OBJECT-TYPE
                SYNTAX Integer32
-               ACCESS read-only
-                STATUS mandatory
+               MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Diskspace in KB"
         ::= { cacheSystem 2 }
 
-        -- fd table
-
-        cacheFdTable OBJECT-TYPE
-                SYNTAX SEQUENCE OF CacheFdEntry
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " This table contains an enumeration of
-                          registered filedescriptors , complete with info "
-        ::= { cacheSystem 4 }
-
-        cacheFdEntry OBJECT-TYPE
-                SYNTAX CacheFdEntry
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        " An entry in cacheFdTable " 
-                INDEX   { cacheFdNumber }
-        ::= { cacheFdTable 1 }
-
-        CacheFdEntry ::= SEQUENCE {
-                cacheFdNumber    Integer32,
-                cacheFdNread     Counter32,
-                cacheFdNwrite    Counter32,
-                cacheFdName      DisplayString
-        }
-
-        cacheFdNumber OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Filedescriptor number (in the mib context, 
-                         not really the system-level fdnum) " 
-        ::= { cacheFdEntry 1 }
-
-        cacheFdNread OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Number of bytes read from this filedescriptor " 
-        ::= { cacheFdEntry 2 }
-
-        cacheFdNwrite OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Number of bytes written to this filedescriptor " 
-        ::= { cacheFdEntry 3 }
-
-        cacheFdName OBJECT-TYPE
-                SYNTAX DisplayString
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Name of filedescriptor, revealing type and purpose " 
-        ::= { cacheFdEntry 4 }
-
---
---  cacheActiveConnTable : Table of active network connections
---
-
-       cacheActiveConnTable OBJECT-TYPE
-                SYNTAX SEQUENCE OF CacheActiveConnEntry
-                ACCESS read-only
-                STATUS mandatory
+       cacheUptime  OBJECT-TYPE
+                SYNTAX Timeticks
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
-                        " This table contains an enumeration of
-                          registered filedescriptors , complete with info "
-        ::= { cacheSystem 3 }
-
-        cacheActiveConnEntry OBJECT-TYPE
-                SYNTAX CacheActiveConnEntry
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        " An entry in cacheActiveConnEntry " 
-                INDEX   { cacheActiveConnAddr, cacheActiveConnPort }
-        ::= { cacheActiveConnTable 1 }
-
-        CacheActiveConnEntry ::= SEQUENCE {
-                cacheActiveConnNread    Counter32,
-                cacheActiveConnNwrite   Counter32,
-                cacheActiveConnAddr    IpAddress,
-                cacheActiveConnName     DisplayString,
-                cacheActiveConnType     Integer32
-        }
-
-       cacheActiveConnNread OBJECT-TYPE
-                SYNTAX Counter32 
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Number of bytes read from connection "
-        ::= { cacheActiveConnEntry 1 }
-
-       cacheActiveConnNwrite OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Number of bytes written to connection "
-        ::= { cacheActiveConnEntry 2 }
-
-       cacheActiveConnAddress OBJECT-TYPE
-                SYNTAX IpAddress
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Peer-end IP address " 
-        ::= { cacheActiveConnEntry 3 }
-
-       cacheActiveConnName OBJECT-TYPE
-                SYNTAX DisplayString
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Name assigned to connection by the cache, revealing 
-                         type / purpose "
-        ::= { cacheActiveConnEntry 4 }
-
-        cacheActiveConnPort OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION 
-                        " Peer-end TCP/UDP port number " 
-        ::= { cacheActiveConnEntry 5 }
+                        " Number of timeticks since cache started "
+       ::= { cacheSystem 3 }
 
-       
 --
 -- config group
 --
@@ -208,865 +88,762 @@ SQUID-MIB DEFINITIONS ::= BEGIN
 
        cacheAdmin OBJECT-TYPE
                SYNTAX DisplayString
-               ACCESS read-only
-                STATUS mandatory
+               MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
-                        " Cache Administrator Contact Name and E-Mail address "
+                        " Cache Administrator E-Mail address "
        ::= { cacheConfig 1 }
 
         cacheSoftware OBJECT-TYPE
                 SYNTAX DisplayString
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Software Name "
         ::= { cacheConfig 2 }
 
         cacheVersionId OBJECT-TYPE
                 SYNTAX OCTET STRING
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Software Version "
         ::= { cacheConfig 3 }
 
-       cacheUptime  OBJECT-TYPE
-                SYNTAX Timeticks
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " Number of timeticks since cache started "
-       ::= { cacheConfig 4 }
+       cacheLoggingFacility OBJECT-TYPE
+               SYNTAX DisplayString
+               ACCESS read-write
+               STATUS current
+               DESCRIPTION
+                       " Logging Facility. An informational string
+                         indicating logging info like debug level, 
+                         local/syslog/remote logging etc " 
+       ::= { cacheConfig 4 } 
 
 -- cacheStorageConfig group
 
-       cacheStorageConfig OBJECT IDENTIFIER ::= { cacheConfig  }
+       cacheStorageConfig OBJECT IDENTIFIER ::= { cacheConfig 5 }
 
        cacheMemMaxSize OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Memory Maximum Size "
         ::= { cacheStorageConfig 1 }
 
        cacheMemHighWM OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Memory High Water Mark "
         ::= { cacheStorageConfig 2 }
 
         cacheMemLowWM OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Memory Low Water Mark "
         ::= { cacheStorageConfig 3 }
 
         cacheSwapMaxSize OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Swap Maximum Size "
         ::= { cacheStorageConfig 4 }
 
         cacheSwapHighWM OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Swap High Water Mark "
         ::= { cacheStorageConfig 5 }
 
         cacheSwapLowWM OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
+                MAX-ACCESS read-only
+                STATUS current
                 DESCRIPTION
                         " Cache Swap Low Water Mark "
         ::= { cacheStorageConfig 6 }
 
 -- end of  cacheStorageConfig group
 
-       cacheLoggingFacility OBJECT-TYPE
-               SYNTAX DisplayString
-               ACCESS read-write
-               STATUS mandatory
-               DESCRIPTION
-                       " Logging Facility. An informational string
-                         indicating logging info like debug level, 
-                         local/syslog/remote logging etc " 
-       ::= { cacheConfig 5 } 
-
 --
--- cacheMesh group :  peers , clients and children
+-- performance group { squid 3 }
 --
 
-       cachePeerTable OBJECT-TYPE
-               SYNTAX SEQUENCE OF CachePeerEntry
-               ACCESS read-only
-               STATUS mandatory
-               DESCRIPTION
-                       " This table contains an enumeration of
-                         the peer caches, complete with info "
-        ::= { cacheMesh 1 }
+       cacheSysPerf    OBJECT IDENTIFIER ::= { cachePerf 1 } 
+        cacheProtoStats OBJECT IDENTIFIER ::= { cachePerf 2 }
 
-       cachePeerEntry OBJECT-TYPE
-               SYNTAX CachePeerEntry
-               MAX-ACCESS not-accessible
-               STATUS mandatory
-               DESCRIPTION 
-                       " An entry in cachePeerTable " 
-               INDEX   { cachePeerAddr }
-       ::= { cachePeerTable 1 }
+       --
+       -- cacheSysPerf 
+       --
 
-       CachePeerEntry ::= SEQUENCE {
-         cachePeerName         DisplayString,
-         cachePeerAddr         IpAddress,
-         cachePeerPortHttp     Integer32 (1..65535),
-         cachePeerPortIcp      Integer32 (1..65535),
-         cachePeerType         Integer32,
-         cachePeerState        Integer32,
-         cachePeerPingsSent    Counter32,
-         cachePeerPingsAcked   Counter32,
-         cachePeerFetches      Counter32,
-         cachePeerRtt          Integer32,
-         cachePeerIgnored      Counter32,
-         cachePeerKeepAlSent   Counter32,
-         cachePeerKeepAlRecv   Counter32
-       }
+        cacheSysPageFaults OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+                DESCRIPTION
+                        " Number of system page faults "
+        ::= { cacheSysPerf 1 }
 
-       cachePeerName OBJECT-TYPE
-               SYNTAX DisplayString
-               ACCESS read-only
-               STATUS mandatory
-               DESCRIPTION 
-                         " The FQDN name or internal alias for the
-                           peer cache"
-       ::= { cachePeerEntry 1 } 
+        cacheSysNumReads OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS not-accessible
+                STATUS current 
+                DESCRIPTION
+                        " Number of Reads " 
+               ::= { cacheSysPerf 2 }
 
-       cachePeerAddr OBJECT-TYPE
-                SYNTAX IpAddress
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " The IP Address of the peer cache "
-        ::= { cachePeerEntry 2 }
+        cacheSysDefReads OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS not-accessible
+                STATUS current
+               DESCRIPTION
+                       " see cachemgr "
+               ::= { cacheSysPerf 3 }
 
-       cachePeerPortHttp OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " The port the peer listens for HTTP requests "
-        ::= { cachePeerEntry 3 }
+       cacheMemUsage OBJECT-TYPE
+               SYNTAX Integer32
+               MAX-ACCESS read-only
+               STATUS  current
+               DESCRIPTION
+                       " Amount of system memory allocated by the cache"
+       ::= { cacheSysPerf 4 } 
 
-       cachePeerPortIcp OBJECT-TYPE
+       cacheCpuUsage OBJECT-TYPE
+               SYNTAX Integer32
+               MAX-ACCESS read-only
+                STATUS  current
+                DESCRIPTION
+                        " Amount of cpu seconds consumed"
+       ::= { cacheSysPerf 5 }
+
+       cacheMaxResSize OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " The port the peer listens for ICP requests 
-                         should be 0 if not configured to send ICP requests "
-        ::= { cachePeerEntry 4 }
+                MAX-ACCESS read-only
+                STATUS  current
+                DESCRIPTION
+                        " Maximum Resident Size"
+        ::= { cacheSysPerf 6 }
 
-       cachePeerType OBJECT-TYPE
-                SYNTAX INTEGER {
-                               none(0), 
-                               sibling(1), 
-                                parent(2), 
-                               multicast(3)
-                                }
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        " Peer Type "
-       ::= { cachePeerEntry 5 } 
+       cacheNumObjCount OBJECT-TYPE
+                SYNTAX Counter32                 
+               MAX-ACCESS read-only
+                STATUS  current
+                DESCRIPTION
+                        " Number of objects "
+        ::= { cacheSysPerf 7 }
 
-       cachePeerState OBJECT-TYPE
-                SYNTAX INTEGER { 
-                               down(0), 
-                               up(1)
-                               }
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " The operational state of this peer "
-        ::= { cachePeerEntry 6 }
+        cacheCurrentLRUExpiration OBJECT-TYPE
+                SYNTAX TimeTicks
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheSysPerf 8 }
 
-        cachePeerPingsSent OBJECT-TYPE
+        cacheCurrentUnlinkRequests OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " Number of pings sent to peer "
-        ::= { cachePeerEntry 7 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheSysPerf 9 }
 
-        cachePeerPingsAcked OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " Number of pings received from peer "
-        ::= {  cachePeerEntry 8 }
+        cacheCurrentUnusedFileDescrCount OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheSysPerf 10 }
 
-        cachePeerFetches OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " Number of times this peer was selected  "
-        ::= { cachePeerEntry 9 }
+       cacheCurrentReservedFileDescrCount  OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheSysPerf 11 }
 
-        cachePeerRtt OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " Last known round-trip time to the peer (in ms) "
-        ::= { cachePeerEntry 10 }
+       --
+       -- cacheProtoStats
+       --
 
-        cachePeerIgnored OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " How many times this peer was ignored "
-        ::= { cachePeerEntry 11 }
+               -- cacheProtoAggregateStats
+               --
 
-        cachePeerKeepAlSent OBJECT-TYPE
+       cacheProtoAggregateStats OBJECT IDENTIFIER ::= { cacheProtoStats 1 }
+
+
+       cacheClientHttpRequests  OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " Number of keepalives sent "
-        ::= { cachePeerEntry 12 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 1 }
 
-        cachePeerKeepAlRecv OBJECT-TYPE
+        cacheHttpHits OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION 
-                       " Number of keepalives received "
-        ::= { cachePeerEntry 13 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 2 }
 
----
---- Table of cache's clients, with statistics. Children caches can be identified
---- by non-zero number of ICP requests (unless browsers start using ICP).
----    
-
-        cacheClientTable OBJECT-TYPE
-           SYNTAX  SEQUENCE OF cacheClientEntry
-           ACCESS  not-accessible
-           STATUS  mandatory
-           DESCRIPTION
-                    "A list of cache client entries."
-               ::= { cacheMesh 2 }
-
-       cacheClientEntry OBJECT-TYPE
-           SYNTAX CacheClientEntry
-           ACCESS  not-accessible
-           STATUS  mandatory
-           DESCRIPTION
-                    "An entry in cacheClientTable"
-          INDEX { cacheClientAddr }
-       ::= { cacheClientTable 1 }
-
-       CacheClientEntry ::= SEQUENCE {
-                       cacheClientAddr         NetworkAddress,
-                       cacheClientHttpRequests Counter32,
-                       cacheClientHttpKb       Counter32,
-                       cacheClientHttpHits     Counter32,
-                       cacheClientHTTPHitKb    Counter32,
-               cacheClientIcpRequests  Counter32,
-               cacheClientIcpKb        Counter32,
-                       cacheClientIcpHits      Counter32,
-                       cacheClientIcpHitKb     Counter32
-       }
-
-       cacheClientAddr OBJECT-TYPE
-                SYNTAX NetworkAddress
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    "The client's IP address "
-        ::= { cacheClientEntry 1 }
-
-       cacheClientHttpRequests OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Number of HTTP requests received from client "
-        ::= { cacheClientEntry 2 }
-
-       cacheClientHttpKb OBJECT-TYPE
+        cacheHttpErrors OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Amount of total HTTP traffic to this client  "
-        ::= { cacheClientEntry 3 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 3 }
 
-        cacheClientHttpHits OBJECT-TYPE
+        cacheHttpInKb OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Number of hits in response to this client's HTTP requests "
-        ::= { cacheClientEntry 4 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 4 }
 
-        cacheClientHTTPHitKb OBJECT-TYPE
+        cacheHttpOutKb OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Amount of HTTP hit traffic in KB "
-        ::= { cacheClientEntry 5 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 5 }
 
-       cacheClientIcpRequests OBJECT-TYPE
+       cacheIcpPktsSent OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Number of ICP requests received from client "
-        ::= { cacheClientEntry 6 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 6 }
 
-       cacheClientIcpKb OBJECT-TYPE
+       cacheIcpPktsRecv OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Amount of total ICP traffic to this client (child) "
-        ::= { cacheClientEntry 7 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 7 }
 
-        cacheClientIcpHits OBJECT-TYPE
+        cacheIcpKbSent OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Number of hits in response to this client's ICP requests "
-        ::= { cacheClientEntry 8 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 8 }
 
-        cacheClientIcpHitKb OBJECT-TYPE
+        cacheIcpKbRecv OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-               DESCRIPTION
-                    " Amount of ICP hit traffic in KB "
-        ::= { cacheClientEntry 9 }
-
-       -- end of cacheClientTable
-  
-    -- end of cacheMesh group
-
---
--- cacheNetwork group
---
--- contains dns (ip/fqdn cache etc) info, network statistics and probe results
---
--- 
-
-       cacheDns OBJECT IDENTIFIER ::= { cacheNetwork 2 }
-
-       -- NetDB info
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 9 }
 
-       NetDbTable OBJECT-TYPE
-                SYNTAX SEQUENCE OF NetDbEntry
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " This table contains squid's netdb"
-        ::= { cacheNetwork 1 } 
+        cacheServerRequests OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 10 }
 
-       netDbEntry OBJECT-TYPE
-                SYNTAX NetDbEntry
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION
-                        " An entry in the NetDb" 
-                INDEX   { netDbEntryNetwork }
-        ::= { NetDbTable 1 } 
-
-       NetDbEntry ::= SEQUENCE {
-               NetDbEntryNetwork       IpAddress,
-               NetDbEntryPingsSent     Counter32,
-               NetDbEntryPingsRecv     Counter32, 
-               NetDbEntryHops          Integer32,
-               NetDbEntryRtt           TimeTicks,
-               NetDbEntryPingTime      TimeTicks,
-               NetDbEntryLastUse       TimeTicks,
-       }
+        cacheServerErrors OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 11 }
 
-       NetDbEntryNetwork OBJECT-TYPE
-                SYNTAX IpAddress
-                ACCESS read-only
-                STATUS mandatory
-       ::= { netDbEntry 1 }
+       cacheServerInKb OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 12 }
 
-       NetDbEntryPingsSent OBJECT-TYPE
+        cacheServerOutKb OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { netDbEntry 2 }    
-
-       NetDbEntryPingsRecv OBJECT-TYPE 
-                SYNTAX Counter32        
-                ACCESS read-only        
-                STATUS mandatory  
-        ::= { netDbEntry 3 }            
-
-       NetDbEntryHops OBJECT-TYPE
-                SYNTAX Integer32                
-                ACCESS read-only                
-                STATUS mandatory          
-        ::= { netDbEntry 4 }                    
-
-        NetDbEntryRtt OBJECT-TYPE      
-                SYNTAX TimeTicks
-                ACCESS read-only
-                STATUS mandatory
-        ::= { netDbEntry 5 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 13 }
 
-       NetDbEntryPingTime OBJECT-TYPE
-                SYNTAX TimeTicks
-                ACCESS read-only
-                STATUS mandatory
-        ::= { netDbEntry 6 }
+       cacheCurrentSwapSize OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheProtoAggregateStats 14 }
 
-       NetDbEntryLastUse OBJECT-TYPE
-                SYNTAX TimeTicks
-                ACCESS read-only
-                STATUS mandatory
-        ::= { netDbEntry 7 }
 
-       
-       -- IP cache info
+       --
+       -- cacheProtoMedianSvcStats group
+       -- 
+       -- This is a table, indexed by the interval we want statistics for
+       -- Example: cacheDnsSvcTime.10 gives 10-min medians for Dns Service Time.
 
-       ipCacheTable OBJECT-TYPE
-                SYNTAX SEQUENCE OF iPcacheEntry
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " This table contains information about
-                          cached name -> address dns resolution "
-        ::= { cacheDns 1 }
+       cacheMedianSvcTable OBJECT-TYPE
+                SYNTAX SEQUENCE OF CacheMedianSvcEntry
+                MAX-ACCESS read-only
+                STATUS current
+       ::= { cacheProtoStats 2 }
 
-        iPcacheEntry OBJECT-TYPE
-                SYNTAX IPcacheEntry
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        " An entry in ipCacheTable " 
-                INDEX   { IPcacheEntryId }
-        ::= { ipCacheTable 1 }
-
-        IPcacheEntry ::= SEQUENCE {
-         IPcacheEntryId           Integer32,
-          IPcacheEntryName         DisplayString,
-          IPcacheEntryIP           IpAddress,
-          IPcacheEntryState        Integer32, 
-        }
-
-       IPcacheEntryState OBJECT-TYPE
-                SYNTAX INTEGER { 
-                                pending(1), expired(2), ok(3) }
+        cacheMedianSvcEntry OBJECT-TYPE
+                SYNTAX CacheMedianSvcEntry
                 MAX-ACCESS not-accessible
-                STATUS mandatory
+                STATUS current
                 DESCRIPTION 
-                        " State of IP cache entry " 
-       ::= { iPcacheEntry 3 } 
+                        " An entry in cacheMedianSvcTable " 
+                INDEX   { cacheMedianTime }
+        ::= { cacheMedianSvcTable 1 }
 
-       IPcacheEntryId OBJECT-TYPE
-               SYNTAX Integer32
-               ACCESS read-only
-               STATUS mandatory
-       ::= { iPcacheEntry 1 } 
+        CacheMedianSvcEntry ::= SEQUENCE {
+               cacheMedianTime         Integer32,
+               cacheHttpAllSvcTime     Integer32,
+               cacheHttpMissSvcTime    Integer32,      
+               cacheHttpNmSvcTime      Integer32,
+               cacheHttpHitSvcTime     Integer32,
+               cacheIcpQuerySvcTime    Integer32,
+               cacheIcpReplySvcTime    Integer32,
+               cacheDnsSvcTime         Integer32
+       }
 
-       IPcacheEntryName OBJECT-TYPE
-                SYNTAX DisplayString
-                ACCESS read-only
-                STATUS mandatory
-       ::= { iPcacheEntry 2 }
+       cacheMedianTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 1 }
 
-       IPcacheEntryIP OBJECT-TYPE
-                SYNTAX IpAddress
-                ACCESS read-only
-                STATUS mandatory
-        ::= { iPcacheEntry 3 }
+       cacheHttpAllSvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 2 } 
 
-       IPcacheEntryState OBJECT-TYPE
+       cacheHttpMissSvcTime OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { iPcacheEntry 4 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 3 } 
 
+       cacheHttpNmSvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 4 } 
 
--- fqdn cache info
+       cacheHttpHitSvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 5 } 
 
-        fqdnCacheTable OBJECT-TYPE
-                SYNTAX SEQUENCE OF fqdnCacheEntry
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " This table contains an enumeration of
-                          the peer caches, complete with info "
-        ::= { cacheDns 2 }
+       cacheIcpQuerySvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 6 } 
 
-        fqdnCacheEntry OBJECT-TYPE
-                SYNTAX FQDNcacheEntry
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        " An entry in cachePeerTable " 
-                INDEX   { FQDNcacheEntryId }
-        ::= { fqdnCacheTable 1 }
-
-        FQDNcacheEntry ::= SEQUENCE {
-         FQDNcacheEntryId           Integer32,
-          FQDNcacheEntryName         DisplayString,
-          FQDNcacheEntryIP           IpAddress,
-         FQDNcacheEntryLastRef      TimeTicks,
-         FQDNcacheEntryExpires      TimeTicks,
-          FQDNcacheEntryState        Integer32
-        }
-
-       FQDNcacheEntryId OBJECT-TYPE
-               SYNTAX Integer32
-               ACCESS read-only
-               STATUS mandatory
-       ::= { fqdnCacheEntry 1 }
+       cacheIcpReplySvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 7 } 
 
-       FQDNcacheEntryName OBJECT-TYPE
-                SYNTAX DisplayString
-                ACCESS read-only
-                STATUS mandatory
-       ::= { fqdnCacheEntry 2 }
+       cacheDnsSvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheMedianSvcEntry 8 } 
 
-       FQDNcacheEntryIP OBJECT-TYPE
-                SYNTAX IpAddress
-                ACCESS read-only
-                STATUS mandatory
-        ::= { fqdnCacheEntry 3 }
+--
+-- cacheNetwork group
+--
+-- This material is probably best suited elsewhere, however for now it
+-- will reside here until the both the Proxy and Squid MIBs are implimented.
+--
 
-       FQDNcacheEntryLastRef OBJECT-TYPE
-                SYNTAX TimeTicks
-                ACCESS read-only
-                STATUS mandatory
-        ::= { fqdnCacheEntry 4}
+       cacheIpCache    OBJECT IDENTIFIER ::= { cacheNetwork 1 }
+       cacheFqdnCache  OBJECT IDENTIFIER ::= { cacheNetwork 2 } 
+       cacheDns        OBJECT IDENTIFIER ::= { cacheNetwork 3 }
 
-       FQDNcacheEntryExpires OBJECT-TYPE
-                SYNTAX TimeTicks
-                ACCESS read-only
-                STATUS mandatory
-        ::= { fqdnCacheEntry 5}
+--
+-- cacheIpCache
+--
 
-       FQDNcacheEntryState OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { fqdnCacheEntry 6}
+       cacheEntries OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 1 } 
 
+       cacheRequests OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 2 } 
 
-       FQDNcacheEntryState OBJECT-TYPE
-                SYNTAX INTEGER { 
-                                pending(1), expired(2), ok(3) }
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        "  state of FQDN cache entry "
-        ::= { fqdnCacheEntry 7  }
+       cacheHits OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 3 } 
 
--- end of fqdnCacheTable
+       cachePendingHits OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 4 } 
 
-        cacheNetStat OBJECT IDENTIFIER ::= { cacheNetwork 3 }
+       cacheNegativeHits OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 5 } 
 
-       cacheTCPconnections OBJECT-TYPE
+       cacheMisses OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " Number of TCP connections since start-up "
-       ::= { cacheNetStat 1 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 6 } 
 
-       cacheUDPconnections OBJECT-TYPE
-               SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " Number of UDP connections since start-up "
-        ::= { cacheNetStat 2 }
+       cacheBlockingGetHostByName OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 7 } 
 
+       cacheAttemptReleaseLockedEntries OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 8 } 
+
+       cacheQueueLength OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheIpCache 9 } 
 --
--- performance group { squid 3 }
+-- cacheFqdnCache
 --
 
-       cacheSysPerf    OBJECT IDENTIFIER ::= { cachePerf 1 } 
-        cacheProtoStats OBJECT IDENTIFIER ::= { cachePerf 2 }
-
-       --
-       -- cacheSysPerf 
-       --
+       cacheEntries OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 1 } 
 
-        cacheSysPageFaults OBJECT-TYPE
+       cacheRequests OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-                DESCRIPTION
-                        " Number of system page faults "
-        ::= { cacheSysPerf 1 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 2 } 
 
-        cacheSysNumReads OBJECT-TYPE
+       cacheHits OBJECT-TYPE
                 SYNTAX Counter32
-                MAX-ACCESS not-accessible
-                STATUS mandatory 
-                DESCRIPTION
-                        " Number of Reads " 
-               ::= { cacheSysPerf 2 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 3 } 
 
-        cacheSysDefReads OBJECT-TYPE
-                SYNTAX Counter32
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-               DESCRIPTION
-                       " see cachemgr "
-               ::= { cacheSysPerf 3 }
+       cachePendingHits OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 4 } 
 
-       cacheMemUsage OBJECT-TYPE
-               SYNTAX Integer3232
-               MAX-ACCESS read-only
-               STATUS  current
-               DESCRIPTION
-                       " Amount of system memory allocated by the cache"
-       ::= { cacheSysPerf 4 } 
+       cacheNegativeHits OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 5 } 
 
-       cacheCpuUsage OBJECT-TYPE
-               SYNTAX Integer3232
-               MAX-ACCESS read-only
-                STATUS  current
-                DESCRIPTION
-                        " Amount of cpu seconds consumed"
-       ::= { cacheSysPerf 5 }
+       cacheMisses OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 6 } 
 
-       cacheMaxResSize OBJECT-TYPE
-                SYNTAX Integer3232
+       cacheBlockingGetHostByAddr OBJECT-TYPE
+                SYNTAX Counter32
                 MAX-ACCESS read-only
-                STATUS  current
-                DESCRIPTION
-                        " Maximum Resident Size"
-        ::= { cacheSysPerf 6 }
+                STATUS current
+        ::= { cacheFqdnCache 7 } 
 
-       cacheNumObjCount OBJECT-TYPE
-                SYNTAX Counter32                 
-               MAX-ACCESS read-only
-                STATUS  current
-                DESCRIPTION
-                        " Number of objects "
-        ::= { cacheSysPerf 7 }
+       cacheQueueLength OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheFqdnCache 8 } 
 
-        cacheCurrentLRUExpiration OBJECT-TYPE
-                SYNTAX TimeTicks
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheSysPerf 8 }
+--
+--     cacheDNS 
+--
 
-        cacheCurrentUnlinkRequests OBJECT-TYPE
+       cacheDnsRequests OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheSysPerf 9 }
-
-        cacheCurrentUnusedFileDescrCount OBJECT-TYPE
-                SYNTAX Gauge32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheSysPerf 10 }
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheDns 1 } 
 
-       cacheCurrentReservedFileDescrCount  OBJECT-TYPE
-                SYNTAX Gauge32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheSysPerf 11 }
+       cacheDnsReplies OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheDns 2 } 
 
-       --
-       -- cacheProtoStats
-       --
+       cacheDnsNumberServers OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+        ::= { cacheDns 3 } 
+       
+--
+-- cacheMesh group
+--
 
-               -- cacheProtoAggregateStats
-               --
+       cachePeerTable OBJECT-TYPE
+               SYNTAX SEQUENCE OF CachePeerEntry
+               MAX-ACCESS read-only
+               STATUS current
+               DESCRIPTION
+                       " This table contains an enumeration of
+                         the peer caches, complete with info "
+        ::= { cacheMesh 1 }
 
-       cacheProtoAggregateStats OBJECT IDENTIFIER ::= { cacheProtoStats 1 }
+       cachePeerEntry OBJECT-TYPE
+               SYNTAX CachePeerEntry
+               MAX-ACCESS not-accessible
+               STATUS current
+               DESCRIPTION 
+                       " An entry in cachePeerTable " 
+               INDEX   { cachePeerAddr }
+       ::= { cachePeerTable 1 }
 
+       CachePeerEntry ::= SEQUENCE {
+         cachePeerName         DisplayString,
+         cachePeerAddr         IpAddress,
+         cachePeerPortHttp     Integer32 (1..65535),
+         cachePeerPortIcp      Integer32 (1..65535),
+         cachePeerType         Integer32,
+         cachePeerState        Integer32,
+         cachePeerPingsSent    Counter32,
+         cachePeerPingsAcked   Counter32,
+         cachePeerFetches      Counter32,
+         cachePeerRtt          Integer32,
+         cachePeerIgnored      Counter32,
+         cachePeerKeepAlSent   Counter32,
+         cachePeerKeepAlRecv   Counter32
+       }
 
-       cacheClientHttpRequests  OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 1 }
+       cachePeerName OBJECT-TYPE
+               SYNTAX DisplayString
+               MAX-ACCESS read-only
+               STATUS current
+               DESCRIPTION 
+                         " The FQDN name or internal alias for the
+                           peer cache"
+       ::= { cachePeerEntry 1 } 
 
-        cacheHttpHits OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 2 }
+       cachePeerAddr OBJECT-TYPE
+                SYNTAX IpAddress
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " The IP Address of the peer cache "
+        ::= { cachePeerEntry 2 }
 
-        cacheHttpErrors OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 3 }
+       cachePeerPortHttp OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " The port the peer listens for HTTP requests "
+        ::= { cachePeerEntry 3 }
 
-        cacheHttpInKb OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 4 }
+       cachePeerPortIcp OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " The port the peer listens for ICP requests 
+                         should be 0 if not configured to send ICP requests "
+        ::= { cachePeerEntry 4 }
 
-        cacheHttpOutKb OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 5 }
+       cachePeerType OBJECT-TYPE
+                SYNTAX INTEGER {
+                               none(0), 
+                               sibling(1), 
+                                parent(2), 
+                               multicast(3)
+                                }
+                MAX-ACCESS not-accessible
+                STATUS current
+                DESCRIPTION 
+                        " Peer Type "
+       ::= { cachePeerEntry 5 } 
 
-       cacheIcpPktsSent OBJECT-TYPE
-                SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 6 }
+       cachePeerState OBJECT-TYPE
+                SYNTAX INTEGER { 
+                               down(0), 
+                               up(1)
+                               }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " The operational state of this peer "
+        ::= { cachePeerEntry 6 }
 
-       cacheIcpPktsRecv OBJECT-TYPE
+        cachePeerPingsSent OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 7 }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " Number of pings sent to peer "
+        ::= { cachePeerEntry 7 }
 
-        cacheIcpKbSent OBJECT-TYPE
+        cachePeerPingsAcked OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 8 }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " Number of pings received from peer "
+        ::= {  cachePeerEntry 8 }
 
-        cacheIcpKbRecv OBJECT-TYPE
+        cachePeerFetches OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 9 }
-
-        cacheServerRequests OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 10 }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " Number of times this peer was selected  "
+        ::= { cachePeerEntry 9 }
 
-        cacheServerErrors OBJECT-TYPE
+        cachePeerRtt OBJECT-TYPE
                 SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 11 }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " Last known round-trip time to the peer (in ms) "
+        ::= { cachePeerEntry 10 }
 
-       cacheServerInKb OBJECT-TYPE
+        cachePeerIgnored OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 12 }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " How many times this peer was ignored "
+        ::= { cachePeerEntry 11 }
 
-        cacheServerOutKb OBJECT-TYPE
+        cachePeerKeepAlSent OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 13 }
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " Number of keepalives sent "
+        ::= { cachePeerEntry 12 }
 
-       cacheCurrentSwapSize OBJECT-TYPE
+        cachePeerKeepAlRecv OBJECT-TYPE
                 SYNTAX Counter32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheProtoAggregateStats 14 }
-
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION 
+                       " Number of keepalives received "
+        ::= { cachePeerEntry 13 }
 
-       --
-       -- cacheProtoMedianSvcStats group
-       -- 
-       -- This is a table, indexed by the interval we want statistics for
-       -- Example: cacheDnsSvcTime.10 gives 10-min medians for Dns Service Time.
+---
+--- Table of cache's clients, with statistics. Children caches can be identified
+--- by non-zero number of ICP requests (unless browsers start using ICP).
+---    
 
-       cacheMedianSvcTable OBJECT-TYPE
-                SYNTAX SEQUENCE OF CacheMedianSvcEntry
-                ACCESS read-only
-                STATUS mandatory
-       ::= { cacheProtoStats 2 }
+        cacheClientTable OBJECT-TYPE
+           SYNTAX  SEQUENCE OF cacheClientEntry
+           ACCESS  not-accessible
+           STATUS  mandatory
+           DESCRIPTION
+                    "A list of cache client entries."
+               ::= { cacheMesh 2 }
 
-        cacheMedianSvcEntry OBJECT-TYPE
-                SYNTAX CacheMedianSvcEntry
-                MAX-ACCESS not-accessible
-                STATUS mandatory
-                DESCRIPTION 
-                        " An entry in cacheMedianSvcTable " 
-                INDEX   { cacheMedianTime }
-        ::= { cacheMedianSvcTable 1 }
+       cacheClientEntry OBJECT-TYPE
+           SYNTAX CacheClientEntry
+           ACCESS  not-accessible
+           STATUS  mandatory
+           DESCRIPTION
+                    "An entry in cacheClientTable"
+          INDEX { cacheClientAddr }
+       ::= { cacheClientTable 1 }
 
-        CacheMedianSvcEntry ::= SEQUENCE {
-               cacheMedianTime         Integer32,
-               cacheHttpAllSvcTime     Integer32,
-               cacheHttpMissSvcTime    Integer32,      
-               cacheHttpNmSvcTime      Integer32,
-               cacheHttpHitSvcTime     Integer32,
-               cacheIcpQuerySvcTime    Integer32,
-               cacheIcpReplySvcTime    Integer32,
-               cacheDnsSvcTime         Integer32
+       CacheClientEntry ::= SEQUENCE {
+                       cacheClientAddr         IpAddress
+                       cacheClientHttpRequests Counter32,
+                       cacheClientHttpKb       Counter32,
+                       cacheClientHttpHits     Counter32,
+                       cacheClientHTTPHitKb    Counter32,
+               cacheClientIcpRequests  Counter32,
+               cacheClientIcpKb        Counter32,
+                       cacheClientIcpHits      Counter32,
+                       cacheClientIcpHitKb     Counter32
        }
 
-       cacheMedianTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 1 }
+       cacheClientAddr OBJECT-TYPE
+                SYNTAX IpAddress
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    "The client's IP address "
+        ::= { cacheClientEntry 1 }
 
-       cacheHttpAllSvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 2 } 
+       cacheClientHttpRequests OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Number of HTTP requests received from client "
+        ::= { cacheClientEntry 2 }
 
-       cacheHttpMissSvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 3 } 
+       cacheClientHttpKb OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Amount of total HTTP traffic to this client  "
+        ::= { cacheClientEntry 3 }
 
-       cacheHttpNmSvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 4 } 
+        cacheClientHttpHits OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Number of hits in response to this client's HTTP requests "
+        ::= { cacheClientEntry 4 }
 
-       cacheHttpHitSvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 5 } 
+        cacheClientHTTPHitKb OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Amount of HTTP hit traffic in KB "
+        ::= { cacheClientEntry 5 }
 
-       cacheIcpQuerySvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 6 } 
+       cacheClientIcpRequests OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Number of ICP requests received from client "
+        ::= { cacheClientEntry 6 }
 
-       cacheIcpReplySvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 7 } 
+       cacheClientIcpKb OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Amount of total ICP traffic to this client (child) "
+        ::= { cacheClientEntry 7 }
 
-       cacheDnsSvcTime OBJECT-TYPE
-                SYNTAX Integer32
-                ACCESS read-only
-                STATUS mandatory
-        ::= { cacheMedianSvcEntry 8 } 
+        cacheClientIcpHits OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Number of hits in response to this client's ICP requests "
+        ::= { cacheClientEntry 8 }
+
+        cacheClientIcpHitKb OBJECT-TYPE
+                SYNTAX Counter32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                    " Amount of ICP hit traffic in KB "
+        ::= { cacheClientEntry 9 }
+
+       -- end of cacheClientTable
+  
+    -- end of cacheMesh group
 
 -- end of SQUID-MIB
 --