aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2014-11-28 10:20:18 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2014-11-28 10:20:18 +0200
commit38cd993057ababdbf6b32aab35f834363647b7d8 (patch)
treebd8f576b2a833b5a597b7a8dd7309f5ee5413180
parent443bc6290a6a90b2c74612d7d68945e375af0ec3 (diff)
downloadvarnish-mib-38cd993057ababdbf6b32aab35f834363647b7d8.tar.gz
varnish-mib-38cd993057ababdbf6b32aab35f834363647b7d8.tar.bz2
Remove banTableTimeout oid.
-rw-r--r--src/VARNISH-MIB.txt13
-rw-r--r--src/ban.c14
-rw-r--r--src/varnish-mib.814
-rw-r--r--src/varnish_mib.mib2c8
4 files changed, 6 insertions, 43 deletions
diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt
index bb6075d..71556c4 100644
--- a/src/VARNISH-MIB.txt
+++ b/src/VARNISH-MIB.txt
@@ -22,3 +22,3 @@ IMPORTS
varnishMIB MODULE-IDENTITY
- LAST-UPDATED "201411280136Z"
+ LAST-UPDATED "201411280837Z"
ORGANIZATION "Shared Autonomous sYstems"
@@ -29,3 +29,3 @@ varnishMIB MODULE-IDENTITY
"This MIB module defines objects for Varnish reverse web proxy."
- REVISION "201411280136Z"
+ REVISION "201411280837Z"
DESCRIPTION
@@ -785,11 +785,2 @@ banExpression OBJECT-TYPE
-banTableTimeout OBJECT-TYPE
- SYNTAX Unsigned32
- MAX-ACCESS read-write
- STATUS current
- DESCRIPTION
- "If banTable content is cached, this variable keeps
- the time in seconds after which the table is reloaded.
- Setting it changes that value."
- ::= { agent 1 }
--
diff --git a/src/ban.c b/src/ban.c
index 72aa506..8d48db2 100644
--- a/src/ban.c
+++ b/src/ban.c
@@ -101,16 +101,2 @@ varnish_ban_table_timeout_parser(const char *token, char *line)
-int
-varnish_ban_table_timeout_set(netsnmp_agent_request_info *reqinfo,
- netsnmp_request_info *requests,
- struct VSM_data *vd)
-{
- if (*requests->requestvb->val.integer < 0 ||
- *requests->requestvb->val.integer > UINT_MAX)
- return SNMP_ERR_BADVALUE;
- DEBUGMSGTL(("varnish_ban", "setting banTable timeout %ld\n",
- *requests->requestvb->val.integer));
- banTable_timeout = *requests->requestvb->val.integer;
- return SNMP_ERR_NOERROR;
-}
-
/*
diff --git a/src/varnish-mib.8 b/src/varnish-mib.8
index c2d37cd..05fa177 100644
--- a/src/varnish-mib.8
+++ b/src/varnish-mib.8
@@ -56,5 +56,2 @@ This amount (in seconds) is configured by \fBvarnishBanTableTimeout\fR
statement.
-
-It can also be set remotely by assigning new value to the
-\fBbanTableTimeout\fR oid.
.TP
@@ -337,10 +334,7 @@ total number of rows in the \fBbanTable\fR may diverge from the value
of \fBbansTotal\fR variable. The default update interval is 60
-seconds. It can be configured either in the \fBsnmpd.conf\fR file
-(see the \fBvarnishBanTableTimeout\fR statement above), or via
-the \fBbanTableTimeout\fR variable.
+seconds. It can be configured in the \fBsnmpd.conf\fR file
+(see the \fBvarnishBanTableTimeout\fR statement above).
.SS Branch \(dqagent\(dq
-.TP
-.B banTableTimeout
-Update interval for the \fBbanTable\fR cache. If set, it takes effect
-immediately.
+The \fBagent\fR branch is reserved for OIDs for
+implementation-specific management. It is not used currently.
.SH "SEE ALSO"
diff --git a/src/varnish_mib.mib2c b/src/varnish_mib.mib2c
index c120b0e..5d9cc6b 100644
--- a/src/varnish_mib.mib2c
+++ b/src/varnish_mib.mib2c
@@ -103,6 +103,2 @@ $vars{'varnish_translate'} = sub {
bansPersistedFragmentation => [ 'MAIN', 'bans_persisted_fragmentation' ],
-
- banTableTimeout => [ 'VAR', 'banTable_timeout',
- { varnish_set_action => 'varnish_ban_table_timeout_set'
- } ],
@@ -190,6 +186,2 @@ void varnish_vcli_timeout_parser(const char *token, char *line);
-int varnish_ban_table_timeout_set(netsnmp_agent_request_info *reqinfo,
- netsnmp_request_info *requests,
- struct VSM_data *vd);
-
void varnish_backend_table_timeout_parser(const char *token, char *line);

Return to:

Send suggestions and report system problems to the System administrator.