|
|
@@ -175,55 +175,7 @@ class _Statistics():
|
|
|
_data = {}
|
|
|
# default statistics spec used in case the specfile is omitted when
|
|
|
# constructing a Counters() object
|
|
|
- _spec = [
|
|
|
- {
|
|
|
- "item_name": "zones",
|
|
|
- "item_type": "named_set",
|
|
|
- "item_optional": False,
|
|
|
- "item_default": {
|
|
|
- "_SERVER_" : {
|
|
|
- "notifyoutv4" : 0,
|
|
|
- "notifyoutv6" : 0
|
|
|
- }
|
|
|
- },
|
|
|
- "item_title": "Zone names",
|
|
|
- "item_description": "Zone names",
|
|
|
- "named_set_item_spec": {
|
|
|
- "item_name": "classname",
|
|
|
- "item_type": "named_set",
|
|
|
- "item_optional": False,
|
|
|
- "item_default": {},
|
|
|
- "item_title": "RR class name",
|
|
|
- "item_description": "RR class name",
|
|
|
- "named_set_item_spec": {
|
|
|
- "item_name": "zonename",
|
|
|
- "item_type": "map",
|
|
|
- "item_optional": False,
|
|
|
- "item_default": {},
|
|
|
- "item_title": "Zone name",
|
|
|
- "item_description": "Zone name",
|
|
|
- "map_item_spec": [
|
|
|
- {
|
|
|
- "item_name": "notifyoutv4",
|
|
|
- "item_type": "integer",
|
|
|
- "item_optional": False,
|
|
|
- "item_default": 0,
|
|
|
- "item_title": "IPv4 notifies",
|
|
|
- "item_description": "Number of IPv4 notifies per zone name sent out"
|
|
|
- },
|
|
|
- {
|
|
|
- "item_name": "notifyoutv6",
|
|
|
- "item_type": "integer",
|
|
|
- "item_optional": False,
|
|
|
- "item_default": 0,
|
|
|
- "item_title": "IPv6 notifies",
|
|
|
- "item_description": "Number of IPv6 notifies per zone name sent out"
|
|
|
- }
|
|
|
- ]
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- ]
|
|
|
+ _spec = []
|
|
|
|
|
|
class Counters():
|
|
|
"""A class for holding and manipulating all statistics counters
|
|
|
@@ -237,56 +189,8 @@ class Counters():
|
|
|
stop_timer() and get() are useful for this. Saved counters can be
|
|
|
cleared by the method clear_all(). Manipulating counters and
|
|
|
timers can be temporarily disabled. If disabled, counter values are
|
|
|
- not changed even if methods to update them are invoked. Including
|
|
|
- per-zone counters, a list of counters which can be handled in the
|
|
|
- class are like the following:
|
|
|
-
|
|
|
- zones/IN/example.com./notifyoutv4
|
|
|
- zones/IN/example.com./notifyoutv6
|
|
|
- zones/IN/example.com./xfrrej
|
|
|
- zones/IN/example.com./xfrreqdone
|
|
|
- zones/IN/example.com./soaoutv4
|
|
|
- zones/IN/example.com./soaoutv6
|
|
|
- zones/IN/example.com./axfrreqv4
|
|
|
- zones/IN/example.com./axfrreqv6
|
|
|
- zones/IN/example.com./ixfrreqv4
|
|
|
- zones/IN/example.com./ixfrreqv6
|
|
|
- zones/IN/example.com./xfrsuccess
|
|
|
- zones/IN/example.com./xfrfail
|
|
|
- zones/IN/example.com./last_ixfr_duration
|
|
|
- zones/IN/example.com./last_axfr_duration
|
|
|
- ixfr_running
|
|
|
- axfr_running
|
|
|
- socket/unixdomain/open
|
|
|
- socket/unixdomain/openfail
|
|
|
- socket/unixdomain/close
|
|
|
- socket/unixdomain/bindfail
|
|
|
- socket/unixdomain/acceptfail
|
|
|
- socket/unixdomain/accept
|
|
|
- socket/unixdomain/senderr
|
|
|
- socket/unixdomain/recverr
|
|
|
- socket/ipv4/tcp/open
|
|
|
- socket/ipv4/tcp/openfail
|
|
|
- socket/ipv4/tcp/close
|
|
|
- socket/ipv4/tcp/connfail
|
|
|
- socket/ipv4/tcp/conn
|
|
|
- socket/ipv4/tcp/senderr
|
|
|
- socket/ipv4/tcp/recverr
|
|
|
- socket/ipv6/tcp/open
|
|
|
- socket/ipv6/tcp/openfail
|
|
|
- socket/ipv6/tcp/close
|
|
|
- socket/ipv6/tcp/connfail
|
|
|
- socket/ipv6/tcp/conn
|
|
|
- socket/ipv6/tcp/senderr
|
|
|
- socket/ipv6/tcp/recverr
|
|
|
- """
|
|
|
+ not changed even if methods to update them are invoked."""
|
|
|
|
|
|
- # '_SERVER_' is a special zone name representing an entire
|
|
|
- # count. It doesn't mean a specific zone, but it means an
|
|
|
- # entire count in the server.
|
|
|
- _entire_server = '_SERVER_'
|
|
|
- # zone names are contained under this dirname in the spec file.
|
|
|
- _perzone_prefix = 'zones'
|
|
|
# default statistics data set
|
|
|
_statistics = _Statistics()
|
|
|
|
|
|
@@ -307,13 +211,6 @@ class Counters():
|
|
|
self._statistics._spec = \
|
|
|
isc.config.module_spec_from_file(spec_file_name).\
|
|
|
get_statistics_spec()
|
|
|
- if self._perzone_prefix in \
|
|
|
- isc.config.spec_name_list(self._statistics._spec):
|
|
|
- self._zones_item_list = isc.config.spec_name_list(
|
|
|
- isc.config.find_spec_part(
|
|
|
- self._statistics._spec,
|
|
|
- '%s/%s/%s' % (self._perzone_prefix,
|
|
|
- '_CLASS_', self._entire_server)))
|
|
|
|
|
|
def clear_all(self):
|
|
|
"""clears all statistics data"""
|
|
|
@@ -408,32 +305,9 @@ class Counters():
|
|
|
del branch_map[leaf]
|
|
|
|
|
|
def get_statistics(self):
|
|
|
- """Calculates an entire server's counts, and returns statistics
|
|
|
- data in a format to send out to the stats module, including each
|
|
|
- counter. If nothing is counted yet, then it returns an empty
|
|
|
- dictionary."""
|
|
|
+ """Returns statistics data in a format to send out to the
|
|
|
+ stats module, including each counter. If nothing is counted
|
|
|
+ yet, then it returns an empty dictionary."""
|
|
|
# entire copy
|
|
|
statistics_data = self._statistics._data.copy()
|
|
|
- # If there is no 'zones' found in statistics_data,
|
|
|
- # i.e. statistics_data contains no per-zone counter, it just
|
|
|
- # returns statistics_data because calculating total counts
|
|
|
- # across the zone names isn't necessary.
|
|
|
- if self._perzone_prefix not in statistics_data:
|
|
|
- return statistics_data
|
|
|
- zones = statistics_data[self._perzone_prefix]
|
|
|
- # Start calculation for '_SERVER_' counts
|
|
|
- zones_spec = isc.config.find_spec_part(self._statistics._spec,
|
|
|
- self._perzone_prefix)
|
|
|
- zones_data = {}
|
|
|
- for cls in zones.keys():
|
|
|
- for zone in zones[cls].keys():
|
|
|
- for (attr, val) in zones[cls][zone].items():
|
|
|
- id_str1 = '%s/%s/%s' % (cls, zone, attr)
|
|
|
- id_str2 = '%s/%s/%s' % (cls, self._entire_server, attr)
|
|
|
- _set_counter(zones_data, zones_spec, id_str1, val)
|
|
|
- _inc_counter(zones_data, zones_spec, id_str2, val)
|
|
|
- # insert entire-server counts
|
|
|
- statistics_data[self._perzone_prefix] = dict(
|
|
|
- statistics_data[self._perzone_prefix],
|
|
|
- **zones_data)
|
|
|
return statistics_data
|
Naoki Kambe