diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-11-26 17:03:41 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2014-11-26 17:07:29 +0200 |
commit | ee352ea3182b86d7906e9cd0fefdd878a6f0fa49 (patch) | |
tree | 5ee5e647fab831a840777e07fc8ac4f9e41f271a /src | |
parent | 50813ca9aa276c72e6f766a5ecd23c1170273528 (diff) | |
download | varnish-mib-ee352ea3182b86d7906e9cd0fefdd878a6f0fa49.tar.gz varnish-mib-ee352ea3182b86d7906e9cd0fefdd878a6f0fa49.tar.bz2 |
Implement control over the banTable update interval (timeout)
* configure.ac: Version 0.90.90
* NEWS: Likewise.
* src/VARNISH-MIB.txt: New oid "agent.banTableTimeout"
* src/ban.c: Implement setting the banTable timeout.
* src/varnish_mib.mib2c: Register new configuration statement
varnishBanTableTimeout; handle agent.banTableTimeout OID.
* src/varnish-mib.8: Update.
Diffstat (limited to 'src')
-rw-r--r-- | src/VARNISH-MIB.txt | 167 | ||||
-rw-r--r-- | src/ban.c | 43 | ||||
-rw-r--r-- | src/varnish-mib.8 | 217 | ||||
-rw-r--r-- | src/varnish_mib.mib2c | 38 |
4 files changed, 364 insertions, 101 deletions
diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt index 47e39c8..fe91735 100644 --- a/src/VARNISH-MIB.txt +++ b/src/VARNISH-MIB.txt | |||
@@ -9,7 +9,8 @@ VARNISH-MIB DEFINITIONS ::= BEGIN | |||
9 | -- ************************************************************* | 9 | -- ************************************************************* |
10 | 10 | ||
11 | IMPORTS | 11 | IMPORTS |
12 | MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, TimeTicks | 12 | MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, TimeTicks, |
13 | Unsigned32 | ||
13 | FROM SNMPv2-SMI | 14 | FROM SNMPv2-SMI |
14 | DateAndTime | 15 | DateAndTime |
15 | FROM SNMPv2-TC | 16 | FROM SNMPv2-TC |
@@ -17,14 +18,16 @@ IMPORTS | |||
17 | FROM SNMPv2-CONF; | 18 | FROM SNMPv2-CONF; |
18 | 19 | ||
19 | varnishMIB MODULE-IDENTITY | 20 | varnishMIB MODULE-IDENTITY |
20 | LAST-UPDATED "201411260759Z" | 21 | LAST-UPDATED "201411261613Z" |
21 | ORGANIZATION "Shared Autonomous sYstems" | 22 | ORGANIZATION "Shared Autonomous sYstems" |
22 | CONTACT-INFO "mhe@say.no" | 23 | CONTACT-INFO "Morten Hermanrud <mhe@say.no> |
24 | Sergey Poznyakoff <gray@gnu.org> | ||
25 | " | ||
23 | DESCRIPTION | 26 | DESCRIPTION |
24 | "This MIB module defines objects for Varnish reverse web proxy." | 27 | "This MIB module defines objects for Varnish reverse web proxy." |
25 | REVISION "201411260759Z" | 28 | REVISION "201411261044Z" |
26 | DESCRIPTION | 29 | DESCRIPTION |
27 | "Initial version." | 30 | "Second revision." |
28 | ::= { varnish 0 } | 31 | ::= { varnish 0 } |
29 | 32 | ||
30 | varnish OBJECT IDENTIFIER ::= { enterprises 33043 6 1 } | 33 | varnish OBJECT IDENTIFIER ::= { enterprises 33043 6 1 } |
@@ -35,13 +38,14 @@ master OBJECT IDENTIFIER ::= { varnish 4 } | |||
35 | session OBJECT IDENTIFIER ::= { varnish 5 } | 38 | session OBJECT IDENTIFIER ::= { varnish 5 } |
36 | threads OBJECT IDENTIFIER ::= { varnish 6 } | 39 | threads OBJECT IDENTIFIER ::= { varnish 6 } |
37 | bans OBJECT IDENTIFIER ::= { varnish 7 } | 40 | bans OBJECT IDENTIFIER ::= { varnish 7 } |
41 | agent OBJECT IDENTIFIER ::= { varnish 8 } | ||
38 | 42 | ||
39 | clientAcceptedConnections OBJECT-TYPE | 43 | clientAcceptedConnections OBJECT-TYPE |
40 | SYNTAX Counter64 | 44 | SYNTAX Counter64 |
41 | MAX-ACCESS read-only | 45 | MAX-ACCESS read-only |
42 | STATUS current | 46 | STATUS current |
43 | DESCRIPTION | 47 | DESCRIPTION |
44 | "Client connections accepted" | 48 | "Client connections accepted." |
45 | ::= { client 1 } | 49 | ::= { client 1 } |
46 | 50 | ||
47 | clientRequestsReceived OBJECT-TYPE | 51 | clientRequestsReceived OBJECT-TYPE |
@@ -49,7 +53,7 @@ clientRequestsReceived OBJECT-TYPE | |||
49 | MAX-ACCESS read-only | 53 | MAX-ACCESS read-only |
50 | STATUS current | 54 | STATUS current |
51 | DESCRIPTION | 55 | DESCRIPTION |
52 | "Client requests received" | 56 | "Client requests received." |
53 | ::= { client 2 } | 57 | ::= { client 2 } |
54 | 58 | ||
55 | clientCacheHits OBJECT-TYPE | 59 | clientCacheHits OBJECT-TYPE |
@@ -57,7 +61,7 @@ clientCacheHits OBJECT-TYPE | |||
57 | MAX-ACCESS read-only | 61 | MAX-ACCESS read-only |
58 | STATUS current | 62 | STATUS current |
59 | DESCRIPTION | 63 | DESCRIPTION |
60 | "Cache hits" | 64 | "Cache hits." |
61 | ::= { client 3 } | 65 | ::= { client 3 } |
62 | 66 | ||
63 | clientCacheHitsPass OBJECT-TYPE | 67 | clientCacheHitsPass OBJECT-TYPE |
@@ -65,7 +69,7 @@ clientCacheHitsPass OBJECT-TYPE | |||
65 | MAX-ACCESS read-only | 69 | MAX-ACCESS read-only |
66 | STATUS current | 70 | STATUS current |
67 | DESCRIPTION | 71 | DESCRIPTION |
68 | "Cache hits for pass" | 72 | "Cache hits for pass." |
69 | ::= { client 4 } | 73 | ::= { client 4 } |
70 | 74 | ||
71 | clientCacheMisses OBJECT-TYPE | 75 | clientCacheMisses OBJECT-TYPE |
@@ -73,13 +77,13 @@ clientCacheMisses OBJECT-TYPE | |||
73 | MAX-ACCESS read-only | 77 | MAX-ACCESS read-only |
74 | STATUS current | 78 | STATUS current |
75 | DESCRIPTION | 79 | DESCRIPTION |
76 | "Cache misses" | 80 | "Cache misses." |
77 | ::= { client 5 } | 81 | ::= { client 5 } |
78 | 82 | ||
79 | VarnishBanString ::= TEXTUAL-CONVENTION | 83 | VarnishBanString ::= TEXTUAL-CONVENTION |
80 | DISPLAY-HINT "1024t" | 84 | DISPLAY-HINT "1024t" |
81 | STATUS current | 85 | STATUS current |
82 | DESCRIPTION "" | 86 | DESCRIPTION "A string containing Varnish ban expression." |
83 | SYNTAX OCTET STRING (SIZE (0..1024)) | 87 | SYNTAX OCTET STRING (SIZE (0..1024)) |
84 | 88 | ||
85 | clientBan OBJECT-TYPE | 89 | clientBan OBJECT-TYPE |
@@ -96,7 +100,7 @@ clientRequests400 OBJECT-TYPE | |||
96 | MAX-ACCESS read-only | 100 | MAX-ACCESS read-only |
97 | STATUS current | 101 | STATUS current |
98 | DESCRIPTION | 102 | DESCRIPTION |
99 | "Client requests received, subject to 400 errors" | 103 | "Client requests received, subject to 400 errors." |
100 | ::= { client 7 } | 104 | ::= { client 7 } |
101 | 105 | ||
102 | clientRequests411 OBJECT-TYPE | 106 | clientRequests411 OBJECT-TYPE |
@@ -104,16 +108,15 @@ clientRequests411 OBJECT-TYPE | |||
104 | MAX-ACCESS read-only | 108 | MAX-ACCESS read-only |
105 | STATUS current | 109 | STATUS current |
106 | DESCRIPTION | 110 | DESCRIPTION |
107 | "Client requests received, subject to 411 errors" | 111 | "Client requests received, subject to 411 errors." |
108 | ::= { client 8 } | 112 | ::= { client 8 } |
109 | 113 | ||
110 | |||
111 | clientRequests413 OBJECT-TYPE | 114 | clientRequests413 OBJECT-TYPE |
112 | SYNTAX Counter64 | 115 | SYNTAX Counter64 |
113 | MAX-ACCESS read-only | 116 | MAX-ACCESS read-only |
114 | STATUS current | 117 | STATUS current |
115 | DESCRIPTION | 118 | DESCRIPTION |
116 | "Client requests received, subject to 413 errors" | 119 | "Client requests received, subject to 413 errors." |
117 | ::= { client 9 } | 120 | ::= { client 9 } |
118 | 121 | ||
119 | clientRequests417 OBJECT-TYPE | 122 | clientRequests417 OBJECT-TYPE |
@@ -121,7 +124,7 @@ clientRequests417 OBJECT-TYPE | |||
121 | MAX-ACCESS read-only | 124 | MAX-ACCESS read-only |
122 | STATUS current | 125 | STATUS current |
123 | DESCRIPTION | 126 | DESCRIPTION |
124 | "Client requests received, subject to 417 errors" | 127 | "Client requests received, subject to 417 errors." |
125 | ::= { client 10 } | 128 | ::= { client 10 } |
126 | 129 | ||
127 | connections OBJECT IDENTIFIER ::= { backend 1 } | 130 | connections OBJECT IDENTIFIER ::= { backend 1 } |
@@ -131,7 +134,7 @@ backendConnSuccess OBJECT-TYPE | |||
131 | MAX-ACCESS read-only | 134 | MAX-ACCESS read-only |
132 | STATUS current | 135 | STATUS current |
133 | DESCRIPTION | 136 | DESCRIPTION |
134 | "Backend connections success" | 137 | "Backend connections success." |
135 | ::= { connections 1 } | 138 | ::= { connections 1 } |
136 | 139 | ||
137 | backendConnNotAttempted OBJECT-TYPE | 140 | backendConnNotAttempted OBJECT-TYPE |
@@ -139,7 +142,7 @@ backendConnNotAttempted OBJECT-TYPE | |||
139 | MAX-ACCESS read-only | 142 | MAX-ACCESS read-only |
140 | STATUS current | 143 | STATUS current |
141 | DESCRIPTION | 144 | DESCRIPTION |
142 | "Backend connections not attempted" | 145 | "Backend connections not attempted." |
143 | ::= { connections 2 } | 146 | ::= { connections 2 } |
144 | 147 | ||
145 | backendConnToMany OBJECT-TYPE | 148 | backendConnToMany OBJECT-TYPE |
@@ -147,7 +150,7 @@ backendConnToMany OBJECT-TYPE | |||
147 | MAX-ACCESS read-only | 150 | MAX-ACCESS read-only |
148 | STATUS current | 151 | STATUS current |
149 | DESCRIPTION | 152 | DESCRIPTION |
150 | "Backend connections too many" | 153 | "Backend connections too many." |
151 | ::= { connections 3 } | 154 | ::= { connections 3 } |
152 | 155 | ||
153 | backendConnFailures OBJECT-TYPE | 156 | backendConnFailures OBJECT-TYPE |
@@ -155,7 +158,7 @@ backendConnFailures OBJECT-TYPE | |||
155 | MAX-ACCESS read-only | 158 | MAX-ACCESS read-only |
156 | STATUS current | 159 | STATUS current |
157 | DESCRIPTION | 160 | DESCRIPTION |
158 | "Backend connections failures" | 161 | "Backend connections failures." |
159 | ::= { connections 4 } | 162 | ::= { connections 4 } |
160 | 163 | ||
161 | backendConnReuses OBJECT-TYPE | 164 | backendConnReuses OBJECT-TYPE |
@@ -163,7 +166,7 @@ backendConnReuses OBJECT-TYPE | |||
163 | MAX-ACCESS read-only | 166 | MAX-ACCESS read-only |
164 | STATUS current | 167 | STATUS current |
165 | DESCRIPTION | 168 | DESCRIPTION |
166 | "Backend connections reuses" | 169 | "Backend connections reuses." |
167 | ::= { connections 5 } | 170 | ::= { connections 5 } |
168 | 171 | ||
169 | backendConnRecycled OBJECT-TYPE | 172 | backendConnRecycled OBJECT-TYPE |
@@ -171,7 +174,7 @@ backendConnRecycled OBJECT-TYPE | |||
171 | MAX-ACCESS read-only | 174 | MAX-ACCESS read-only |
172 | STATUS current | 175 | STATUS current |
173 | DESCRIPTION | 176 | DESCRIPTION |
174 | "Backend connections recycles" | 177 | "Backend connections recycles." |
175 | ::= { connections 6 } | 178 | ::= { connections 6 } |