aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@nxc.no>2018-02-05 20:56:59 +0100
committerSergey Poznyakoff <gray@nxc.no>2018-02-05 20:56:59 +0100
commitf7677f32b90eea37e54b39a3e26e5437924a2ada (patch)
tree4112eecd0acecd664e613fd1b66dd177b7ab87ba /src
parent027e83b6f5dc6a63ed9c69e534c0b994041df14f (diff)
downloadvarnish-mib-f7677f32b90eea37e54b39a3e26e5437924a2ada.tar.gz
varnish-mib-f7677f32b90eea37e54b39a3e26e5437924a2ada.tar.bz2
Version 2.0
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am2
-rw-r--r--src/VARNISH-MIB.txt6
-rw-r--r--src/auth.c2
-rw-r--r--src/backend.h3
-rw-r--r--src/ban.c2
-rw-r--r--src/belex.l17
-rw-r--r--src/modconf.c17
-rw-r--r--src/varnish-mib.885
-rw-r--r--src/vcli.c2
9 files changed, 99 insertions, 37 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 55cdb85..5c79dfc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,14 +1,14 @@
1# This file is part of varnish-mib -*- automake -*- 1# This file is part of varnish-mib -*- automake -*-
2# Copyright (C) 2014-2015 Sergey Poznyakoff 2# Copyright (C) 2014-2018 Sergey Poznyakoff
3# 3#
4# varnish-mib is free software; you can redistribute it and/or modify 4# varnish-mib is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option) 6# the Free Software Foundation; either version 3, or (at your option)
7# any later version. 7# any later version.
8# 8#
9# varnish-mib is distributed in the hope that it will be useful, 9# varnish-mib is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of 10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU General Public License for more details. 12# GNU General Public License for more details.
13# 13#
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
diff --git a/src/VARNISH-MIB.txt b/src/VARNISH-MIB.txt
index 6b03f21..b7e77f1 100644
--- a/src/VARNISH-MIB.txt
+++ b/src/VARNISH-MIB.txt
@@ -11,32 +11,32 @@ VARNISH-MIB DEFINITIONS ::= BEGIN
11IMPORTS 11IMPORTS
12 MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, TimeTicks, 12 MODULE-IDENTITY, OBJECT-TYPE, enterprises, Counter64, TimeTicks,
13 Counter32, Integer32 13 Counter32, Integer32
14 FROM SNMPv2-SMI 14 FROM SNMPv2-SMI
15 TEXTUAL-CONVENTION, DateAndTime 15 TEXTUAL-CONVENTION, DateAndTime
16 FROM SNMPv2-TC 16 FROM SNMPv2-TC
17 InetAddressIPv4, InetAddressIPv6, InetPortNumber 17 InetAddressIPv4, InetAddressIPv6, InetPortNumber
18 FROM INET-ADDRESS-MIB 18 FROM INET-ADDRESS-MIB
19 OBJECT-GROUP, MODULE-COMPLIANCE 19 OBJECT-GROUP, MODULE-COMPLIANCE
20 FROM SNMPv2-CONF; 20 FROM SNMPv2-CONF;
21 21
22varnishMIB MODULE-IDENTITY 22varnishMIB MODULE-IDENTITY
23 LAST-UPDATED "201802020845Z" 23 LAST-UPDATED "201802052024Z"
24 ORGANIZATION "Shared Autonomous sYstems" 24 ORGANIZATION "Shared Autonomous sYstems"
25 CONTACT-INFO "Morten Hermanrud <mhe@say.no> 25 CONTACT-INFO "Morten Hermanrud <mhe@say.no>
26 Sergey Poznyakoff <gray@gnu.org> 26 Sergey Poznyakoff <gray@gnu.org>
27 " 27 "
28 DESCRIPTION 28 DESCRIPTION
29 "This MIB module defines objects for Varnish reverse web proxy." 29 "This MIB module defines objects for Varnish reverse web proxy."
30 REVISION "201802020845Z" 30 REVISION "201802052024Z"
31 DESCRIPTION 31 DESCRIPTION
32 "Second revision." 32 "Second revision."
33 ::= { varnish 0 } 33 ::= { varnish 0 }
34 34
35varnish OBJECT IDENTIFIER ::= { enterprises 33043 6 1 } 35varnish OBJECT IDENTIFIER ::= { enterprises 33043 6 1 }
36client OBJECT IDENTIFIER ::= { varnish 1 } 36client OBJECT IDENTIFIER ::= { varnish 1 }
37backend OBJECT IDENTIFIER ::= { varnish 2 } 37backend OBJECT IDENTIFIER ::= { varnish 2 }
38total OBJECT IDENTIFIER ::= { varnish 3 } 38total OBJECT IDENTIFIER ::= { varnish 3 }
39master OBJECT IDENTIFIER ::= { varnish 4 } 39master OBJECT IDENTIFIER ::= { varnish 4 }
40session OBJECT IDENTIFIER ::= { varnish 5 } 40session OBJECT IDENTIFIER ::= { varnish 5 }
41threads OBJECT IDENTIFIER ::= { varnish 6 } 41threads OBJECT IDENTIFIER ::= { varnish 6 }
42bans OBJECT IDENTIFIER ::= { varnish 7 } 42bans OBJECT IDENTIFIER ::= { varnish 7 }
@@ -845,25 +845,25 @@ objectsLRUMoved OBJECT-TYPE
845 SYNTAX Counter64 845 SYNTAX Counter64
846 MAX-ACCESS read-only 846 MAX-ACCESS read-only
847 STATUS current 847 STATUS current
848 DESCRIPTION 848 DESCRIPTION
849 "Number of move operations done on the LRU list." 849 "Number of move operations done on the LRU list."
850 ::= { objects 7 } 850 ::= { objects 7 }
851 851
852objectsPurges OBJECT-TYPE 852objectsPurges OBJECT-TYPE
853 SYNTAX Counter64 853 SYNTAX Counter64
854 MAX-ACCESS read-only 854 MAX-ACCESS read-only
855 STATUS current 855 STATUS current
856 DESCRIPTION 856 DESCRIPTION
857 "Number of purge operations executed" 857 "Number of purge operations executed."
858 ::= { objects 8 } 858 ::= { objects 8 }
859 859
860objectsObjPurged OBJECT-TYPE 860objectsObjPurged OBJECT-TYPE
861 SYNTAX Counter64 861 SYNTAX Counter64
862 MAX-ACCESS read-only 862 MAX-ACCESS read-only
863 STATUS current 863 STATUS current
864 DESCRIPTION 864 DESCRIPTION
865 "Number of purged objects." 865 "Number of purged objects."
866 ::= { objects 9 } 866 ::= { objects 9 }
867 867
868objectsGzip OBJECT-TYPE 868objectsGzip OBJECT-TYPE
869 SYNTAX Counter64 869 SYNTAX Counter64
diff --git a/src/auth.c b/src/auth.c
index e9abbe4..2ff6aba 100644
--- a/src/auth.c
+++ b/src/auth.c
@@ -1,14 +1,14 @@
1/* This file is part of varnish-mib -*- c -*- 1/* This file is part of varnish-mib -*- c -*-
2 Copyright (C) 2014-2015 Sergey Poznyakoff 2 Copyright (C) 2014-2018 Sergey Poznyakoff
3 3
4 Varnish-mib is free software; you can redistribute it and/or modify 4 Varnish-mib is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 3, or (at your option) 6 the Free Software Foundation; either version 3, or (at your option)
7 any later version. 7 any later version.
8 8
9 Varnish-mib is distributed in the hope that it will be useful, 9 Varnish-mib is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details. 12 GNU General Public License for more details.
13 13
14 You should have received a copy of the GNU General Public License 14 You should have received a copy of the GNU General Public License
diff --git a/src/backend.h b/src/backend.h
index d60f613..b13e644 100644
--- a/src/backend.h
+++ b/src/backend.h
@@ -1,16 +1,15 @@
1typedef struct be_string { 1typedef struct be_string {
2 char const *start; 2 char const *start;
3 size_t len; 3 size_t len;
4} be_string_t; 4} be_string_t;
5 5
6typedef void (*regfun_t)(be_string_t *, be_string_t *, be_string_t *, void *); 6typedef void (*regfun_t)(be_string_t *, be_string_t *, be_string_t *, void *);
7 7
8void read_defs(const char *str, size_t len, regfun_t regfun, void *d); 8struct vsm;
9void varnish_backend_table_timeout_parser(const char *token, char *line);
10struct VSC_point; 9struct VSC_point;
11void backend_register(char const *name, size_t len, char const *param, 10void backend_register(char const *name, size_t len, char const *param,
12 const struct VSC_point *vpt); 11 const struct VSC_point *vpt);
13void backend_clear(void); 12void backend_clear(void);
14int backend_collect_addr(struct vsm *vsm); 13int backend_collect_addr(struct vsm *vsm);
15void backend_parser(const char *str, size_t len, regfun_t regfun, void *d); 14void backend_parser(const char *str, size_t len, regfun_t regfun, void *d);
16 15
diff --git a/src/ban.c b/src/ban.c
index 1f4583b..a50b5a3 100644
--- a/src/ban.c
+++ b/src/ban.c
@@ -1,14 +1,14 @@
1/* This file is part of varnish-mib -*- c -*- 1/* This file is part of varnish-mib -*- c -*-
2 Copyright (C) 2014-2015 Sergey Poznyakoff 2 Copyright (C) 2014-2018 Sergey Poznyakoff
3 3
4 Varnish-mib is free software; you can redistribute it and/or modify 4 Varnish-mib is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 3, or (at your option) 6 the Free Software Foundation; either version 3, or (at your option)
7 any later version. 7 any later version.
8 8
9 Varnish-mib is distributed in the hope that it will be useful, 9 Varnish-mib is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details. 12 GNU General Public License for more details.
13 13
14 You should have received a copy of the GNU General Public License 14 You should have received a copy of the GNU General Public License
diff --git a/src/belex.l b/src/belex.l
index f35f114..bc0bfc0 100644
--- a/src/belex.l
+++ b/src/belex.l
@@ -1,12 +1,29 @@
1/* This file is part of varnish-mib
2 Copyright (C) 2018 Sergey Poznyakoff
3
4 Varnish-mib is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 3, or (at your option)
7 any later version.
8
9 Varnish-mib is distributed in the hope that it will be useful,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details.
13
14 You should have received a copy of the GNU General Public License
15 along with varnish-mib. If not, see <http://www.gnu.org/licenses/>.
16*/
17
1%option nounput 18%option nounput
2%option noinput 19%option noinput
3 20
4%{ 21%{
5#include "backend.h"