Bug #1769: near-hit and filedescriptor usage missing in SNMP MIB

Add cacheHttpNhSvcTime, cacheCurrentFileDescrCnt & cacheCurrentFileDescrMax
to the SNMP mib.

diff --git a/include/cache_snmp.h b/include/cache_snmp.h
index 32ded68a2eb0224f4db855f96712fd28ea64babc..34023c58dbc7bd24908d74ebf78d414799ed993b 100644 (file)
--- a/include/cache_snmp.h
+++ b/include/cache_snmp.h
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_snmp.h,v 1.28 2006/05/14 09:22:35 serassio Exp $
+ * $Id: cache_snmp.h,v 1.29 2006/09/22 02:48:51 hno Exp $
  */
 
 #ifndef SQUID_CACHE_SNMP_H
@@ -210,6 +210,8 @@ enum {
     PERF_SYS_CURUNLREQ,
     PERF_SYS_CURUNUSED_FD,
     PERF_SYS_CURRESERVED_FD,
+    PERF_SYS_CURUSED_FD,
+    PERF_SYS_CURMAX_FD,
     PERF_SYS_END
 };
 
@@ -252,6 +254,7 @@ enum {
     PERF_MEDIAN_DNS,
     PERF_MEDIAN_RHR,
     PERF_MEDIAN_BHR,
+    PERF_MEDIAN_HTTP_NH,
     PERF_MEDIAN_END
 };
 

diff --git a/src/mib.txt b/src/mib.txt
index cc41a5194dac09cef1207d84fffe8cf530b61739..e156088e8dca362aaddb664025986a9ca7d666a8 100644 (file)
--- a/src/mib.txt
+++ b/src/mib.txt
@@ -2,7 +2,7 @@
 
 SQUID-MIB DEFINITIONS ::= BEGIN
 --
--- $Id: mib.txt,v 1.29 2006/05/14 09:22:35 serassio Exp $
+-- $Id: mib.txt,v 1.30 2006/09/22 02:48:51 hno Exp $
 --
 
 IMPORTS
@@ -260,6 +260,21 @@ squid MODULE-IDENTITY
                        " Reserved number of file descriptors "
         ::= { cacheSysPerf 11 }
 
+       cacheCurrentFileDescrCnt  OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                       " Number of file descriptors in use "
+        ::= { cacheSysPerf 12 }
+
+       cacheCurrentFileDescrMax  OBJECT-TYPE
+                SYNTAX Gauge32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                       " Highest file descriptors in use "
+        ::= { cacheSysPerf 13 }
        --
        -- cacheProtoStats
        --
@@ -423,7 +438,8 @@ squid MODULE-IDENTITY
                cacheIcpReplySvcTime    Integer32,
                cacheDnsSvcTime         Integer32,
                cacheRequestHitRatio    Integer32,
-               cacheRequestByteRatio   Integer32
+               cacheRequestByteRatio   Integer32,
+               cacheHttpNhSvcTime      Integer32
        }
 
        cacheMedianTime OBJECT-TYPE
@@ -455,7 +471,7 @@ squid MODULE-IDENTITY
                 MAX-ACCESS read-only
                 STATUS current
                DESCRIPTION
-                        " HTTP near miss service time "
+                        " HTTP hit not-modified service time "
         ::= { cacheMedianSvcEntry 4 }
 
        cacheHttpHitSvcTime OBJECT-TYPE
@@ -506,6 +522,14 @@ squid MODULE-IDENTITY
                         " Byte Hit Ratios "
         ::= { cacheMedianSvcEntry 10 }
 
+       cacheHttpNhSvcTime OBJECT-TYPE
+                SYNTAX Integer32
+                MAX-ACCESS read-only
+                STATUS current
+               DESCRIPTION
+                        " HTTP refresh hit service time "
+        ::= { cacheMedianSvcEntry 11 }
+
 --
 -- cacheNetwork group
 --

diff --git a/src/snmp_agent.cc b/src/snmp_agent.cc
index 736b4b78074343f263eaf744b3ca1a13694dcfd1..3189c9551cf8f808d03652803b39c318ce497331 100644 (file)
--- a/src/snmp_agent.cc
+++ b/src/snmp_agent.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_agent.cc,v 1.92 2006/05/14 09:22:35 serassio Exp $
+ * $Id: snmp_agent.cc,v 1.93 2006/09/22 02:48:51 hno Exp $
  *
  * DEBUG: section 49     SNMP Interface
  * AUTHOR: Kostas Anagnostakis
@@ -371,6 +371,18 @@ snmp_prfSysFn(variable_list * Var, snint * ErrP)
                                       SMI_GAUGE32);
         break;
 
+    case PERF_SYS_CURUSED_FD:
+       Answer = snmp_var_new_integer(Var->name, Var->name_length,
+                                     (snint) Number_FD,
+                                     SMI_GAUGE32);
+       break;
+
+    case PERF_SYS_CURMAX_FD:
+       Answer = snmp_var_new_integer(Var->name, Var->name_length,
+                                     (snint) Biggest_FD,
+                                     SMI_GAUGE32);
+       break;
+
     case PERF_SYS_NUMOBJCNT:
         Answer = snmp_var_new_integer(Var->name, Var->name_length,
                                       (snint) StoreEntry::inUseCount(),
@@ -564,6 +576,11 @@ snmp_prfProtoFn(variable_list * Var, snint * ErrP)
             x = statByteHitRatio(minutes);
             break;
 
+       case PERF_MEDIAN_HTTP_NH:
+           x = statHistDeltaMedian(&l->client_http.nh_svc_time,
+                                   &f->client_http.nm_svc_time);
+           break;
+
         default:
             *ErrP = SNMP_ERR_NOSUCHNAME;
             return NULL;

diff --git a/src/snmp_core.cc b/src/snmp_core.cc
index 3e05098efb405ef8876e1428a3cfb3769b88c1e3..dcc071ef6627db5770a8eada42405d50b336e233 100644 (file)
--- a/src/snmp_core.cc
+++ b/src/snmp_core.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: snmp_core.cc,v 1.74 2006/05/14 09:22:35 serassio Exp $
+ * $Id: snmp_core.cc,v 1.75 2006/09/22 02:48:51 hno Exp $
  *
  * DEBUG: section 49    SNMP support
  * AUTHOR: Glenn Chisholm
@@ -151,7 +151,7 @@ snmpInit(void)
                                                                                                                     snmpAddNode(snmpCreateOid(LEN_SQ_PRF, SQ_PRF),
                                                                                                                                 LEN_SQ_PRF, NULL, NULL, 2,
                                                                                                                                 snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 1, SQ_PRF, PERF_SYS),
-                                                                                                                                            LEN_SQ_PRF + 1, NULL, NULL, 11,
+                                                                                                                                            LEN_SQ_PRF + 1, NULL, NULL, 13,
                                                                                                                                             snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_SYS, 1),
                                                                                                                                                         LEN_SQ_PRF + 2, snmp_prfSysFn, static_Inst, 0),
                                                                                                                                             snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_SYS, 2),
@@ -173,7 +173,11 @@ snmpInit(void)
                                                                                                                                             snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_SYS, 10),
                                                                                                                                                         LEN_SQ_PRF + 2, snmp_prfSysFn, static_Inst, 0),
                                                                                                                                             snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_SYS, 11),
-                                                                                                                                                        LEN_SQ_PRF + 2, snmp_prfSysFn, static_Inst, 0)),
+                                                                                                                                                        LEN_SQ_PRF + 2, snmp_prfSysFn, static_Inst, 0),
+                                                                                                                                           snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_SYS, 12),
+                                                                                                                                                       LEN_SQ_PRF + 2, snmp_prfSysFn, static_Inst, 0),
+                                                                                                                                           snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_SYS, 13),
+                                                                                                                                                       LEN_SQ_PRF + 2, snmp_prfSysFn, static_Inst, 0)),
                                                                                                                                 snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 1, SQ_PRF, PERF_PROTO),
                                                                                                                                             LEN_SQ_PRF + 1, NULL, NULL, 2,
                                                                                                                                             snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_PROTO, 1),
@@ -211,7 +215,7 @@ snmpInit(void)
                                                                                                                                             snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 2, SQ_PRF, PERF_PROTO, 2),
                                                                                                                                                         LEN_SQ_PRF + 2, NULL, NULL, 1,
                                                                                                                                                         snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 3, SQ_PRF, PERF_PROTO, 2, 1),
-                                                                                                                                                                    LEN_SQ_PRF + 3, NULL, NULL, 10,
+                                                                                                                                                                    LEN_SQ_PRF + 3, NULL, NULL, 11,
                                                                                                                                                                     snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 1),
                                                                                                                                                                                 LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
                                                                                                                                                                     snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 2),
@@ -231,6 +235,8 @@ snmpInit(void)
                                                                                                                                                                     snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 9),
                                                                                                                                                                                 LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
                                                                                                                                                                     snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 10),
+                                                                                                                                                                                LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0),
+                                                                                                                                                                    snmpAddNode(snmpCreateOid(LEN_SQ_PRF + 4, SQ_PRF, PERF_PROTO, 2, 1, 11),
                                                                                                                                                                                 LEN_SQ_PRF + 4, snmp_prfProtoFn, time_Inst, 0))))),
                                                                                                                     snmpAddNode(snmpCreateOid(LEN_SQ_NET, SQ_NET),
                                                                                                                                 LEN_SQ_NET, NULL, NULL, 3,