Version 2.0

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,8 +1,8 @@
 # This file is part of varnish-mib -*- automake -*-
-# Copyright (C) 2014-2015 Sergey Poznyakoff
+# Copyright (C) 2014-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.
 #
diff --git a/NEWS b/NEWS
index f12c539..e447533 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,96 @@
-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.
 
 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)
 
 * Support for Varnish 4.1
 
 
 Version 1.1, 2015-02-25
@@ -18,13 +102,13 @@ Version 1.0, 2014-11-28
 
 Initial release.
 
 
 * Copyright information:
 
-Copyright (C) 2014-2016 Sergey Poznyakoff
+Copyright (C) 2014-2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
    copyright notice and this permission notice are preserved,
    thus giving the recipient permission to redistribute in turn.
 
diff --git a/README b/README
index 8e68d6a..1917254 100644
--- a/README
+++ b/README
@@ -1,29 +1,39 @@
 Varnish-mib README
-Copyright (C) 2014-2015 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 * Introduction
 
 This file contains brief information about configuring, testing
 and using Varnish-mib. It is *not* intended as a replacement
 for the documentation, and is provided as a brief reference only.
 For a detailed documentation, please see the varnish-mib(8)
 manpage.
 
+If you are building varnish-mib from Git repository, jump to
+the section GIT SOURCES, below.
+
 * Overview
 
 Varnish-mib is a dynamically loadable object module for net-snmp
 snmpd, that provides access to Varnish Cache statistics.  It uses
 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:
 
   ./configure [options]
   make
   make install
 
 (the last step normally requires root privileges).  For generic
@@ -37,20 +47,34 @@ $PREFIX/lib/snmp, where $PREFIX stands for the installation prefix.
 
 ** --with-mibdir=DIR
 
 Install MIBs (the file VARNISH-MIB.txt in DIR.  By default it is
 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
 
 Send bug reports and suggestions to <gray@gnu.org>