15 files changed, 254 insertions, 52 deletions

diff --git a/Makefile.am b/Makefile.am
index 30060d5..cea3646 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 # This file is part of varnish-mib -*- automake -*-
-# Copyright (C) 2014-2015 Sergey Poznyakoff
+# Copyright (C) 2014-2018 Sergey Poznyakoff
 #
diff --git a/NEWS b/NEWS
index f12c539..e447533 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,2 @@
-Varnish-mib NEWS -- history of user-visible changes. 2016-04-27
-Copyright (C) 2014-2016 Sergey Poznyakoff
+Varnish-mib NEWS -- history of user-visible changes. 2018-02-05
 See the end of file for copying conditions.
@@ -6,2 +5,87 @@ Please send Varnish-mib bug reports to <gray@gnu.org>
 
+Version 2.0, 2018-02-05
+
+This version is written for Varnish 5.2.0. It will definitely not
+compile with Varnish 5.2.1 and later. You'll have to use version 3.0
+for that.
+
+Most important changes: 
+
+New OIDs:
+
+** VarnishMIB::objects branch
+
+  objectsCount
+    
+    Approximate number of HTTP objects (headers + body,
+    if present) in the cache.
+    [Varnish variable MAIN.n_object]
+    
+  objectsVampire
+    Number of unresurrected objects.
+    [MAIN.n_vampireobject]
+
+  objectsCore
+    Approximate number of object metadata elements in the cache. Each
+    object needs an objectcore, extra objectcores are for
+    hit-for-miss, hit-for-pass and busy objects.
+    [MAIN.n_objectcore]
+
+  objectsHead
+    Approximate number of different hash entries in the cache.
+    [MAIN.n_objecthead]
+    
+  objectsExpired
+    Number of objects that expired from cache because of old age.
+    [MAIN.n_expired]
+    
+  objectsLRUNuked
+    How many objects have been forcefully evicted from
+    storage to make room for a new object.
+    [MAIN.n_lru_nuked]
+    
+  objectsLRUMoved
+    Number of move operations done on the LRU list.
+    [MAIN.n_lru_moved]
+    
+  objectsPurges
+    Number of purge operations executed.
+    [MAIN.n_purges]
+    
+  objectsObjPurged
+    Number of purged objects.
+    [MAIN.n_obj_purged]
+
+  objectsGzip
+    Number of gzip operations.
+    [MAIN.n_gzip]
+    
+  objectsGunzip
+    Number of gunzip operations.
+    [MAIN.n_gunzip]
+
+** VarnishMIB::vcl branch
+
+  vclTotal
+    Number of loaded VCLs in total.
+    [MAIN.n_vcl]
+    
+  vclAvail
+    Number of VCLs available.
+    [MAIN.n_vcl_avail]
+    
+  vclDiscard
+    Number of discarded VCLs.
+    [MAIN.n_vcl_discard]
+    
+  vclFail
+    Number of VCL failures.
+    [MAIN.vcl_fail]
+
+* Removed OIDs
+
+Several OIDs have been withdrawn due to changes in the Varnish API.
+These are: clientRequests411, clientRequests413, and backendConnUnused.
+
+
 Version 1.1.90 (Git)
@@ -23,3 +107,3 @@ Initial release.
 
-Copyright (C) 2014-2016 Sergey Poznyakoff
+Copyright (C) 2014-2018 Sergey Poznyakoff
 
diff --git a/README b/README
index 8e68d6a..1917254 100644
--- a/README
+++ b/README
@@ -1,3 +1,2 @@
 Varnish-mib README
-Copyright (C) 2014-2015 Sergey Poznyakoff
 See the end of file for copying conditions.
@@ -12,2 +11,5 @@ manpage.
 
+If you are building varnish-mib from Git repository, jump to
+the section GIT SOURCES, below.
+
 * Overview
@@ -18,7 +20,15 @@ MIBs from varnishsnmp project (http://varnishsnmp.sourceforge.net).
 
+This and other versions of Varnish-mib is available for download from
+<http://download.gnu.org.ua/release/varnish-mib>. The following table
+describes the relation between the release number and the version
+of Varnish API version it is written for:
+
+  1.0 and up to 2.0    Varnish 4.0 and 4.1
+  2.0 (this release)   Varnish 5.2.0
+  3.0                  Varnish 5.2.1
+
 * Installation
 
-In order to compile the package you need to have Net-snmp and Varnish
-installed.  Only Varnish 4.x is supported.  The installation sequence
-is as usual:
+In order to compile the package you need to have Net-SNMP and Varnish
+installed.  The installation sequence is as usual:
 
@@ -42,2 +52,16 @@ installed in $prefix/share/snmp.
 
+* GIT SOURCES
+
+If you cloned the sources from GIT, you will need the following
+additional tools in order to bootstrap the package:
+
+ + Perl
+ + mib2c
+ + Perl module Inline::C
+ + Flex
+
+Make sure to check out the branch corresponding to the version of
+Varnish you are using.  Run ./bootstrap.  Then, proceed as discussed
+above.
+ 
 * Bug reporting
@@ -49,3 +73,3 @@ Send bug reports and suggestions to <gray@gnu.org>
 
-Copyright (C) 2014 Sergey Poznyakoff
+Copyright (C) 2014-2018 Sergey Poznyakoff
 
diff --git a/configure.ac b/configure.ac
index 84544b2..917bab5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,3 +17,3 @@
 AC_PREREQ(2.69)
-AC_INIT([varnish-mib], 1.1.90, [gray@gnu.org])
+AC_INIT([varnish-mib], 2.0, [gray@gnu.org])
 AC_CONFIG_SRCDIR(src/varnish_mib.mib2c)
@@ -47,6 +47,6 @@ PKG_CHECK_MODULES([VARNISHAPI], [varnishapi >= 5.0])
 
-varnishapi_version() {
-    AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$1],[Varnish API major version number])
-    AC_DEFINE_UNQUOTED([VARNISHAPI_MINOR],[$2],[Varnish API minor version number])
-    AC_DEFINE_UNQUOTED([VARNISHAPI_PATCH],[$3],[Varnish API patchlevel])
+check_minor_number() {
+    if [ "$2" -gt 1 ]; then
+        AC_MSG_ERROR([Unsupported Varnish API version; please try varnish_mib 3.0 or newer])
+    fi
 }
@@ -57,3 +57,3 @@ if test -n "$v"; then
     IFS='.'
-    varnishapi_version $v
+    check_minor_number $v
     IFS=$save_IFS
diff --git a/lib/VarnishMib/HashTable.pm b/lib/VarnishMib/HashTable.pm
index 1faef96..00224ac 100644
--- a/lib/VarnishMib/HashTable.pm
+++ b/lib/VarnishMib/HashTable.pm
@@ -1 +1,17 @@
+# This file is part of varnish-mib -*- automake -*-
+# Copyright (C) 2018 Sergey Poznyakoff
+#
+# varnish-mib is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# varnish-mib is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with varnish-mib.  If not, see <http://www.gnu.org/licenses/>.
+
 package VarnishMib::HashTable;
diff --git a/lib/VarnishMib/MIBTable.pm b/lib/VarnishMib/MIBTable.pm
index 6aa959f..da0ca19 100644
--- a/lib/VarnishMib/MIBTable.pm
+++ b/lib/VarnishMib/MIBTable.pm
@@ -1 +1,17 @@
+# This file is part of varnish-mib -*- automake -*-
+# Copyright (C) 2018 Sergey Poznyakoff
+#
+# varnish-mib is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# varnish-mib is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with varnish-mi