diff --git a/extern/tor_ b/extern/tor_ index 701e211..d84a48c 100644 --- a/extern/tor_ +++ b/extern/tor_ @@ -203,7 +203,7 @@ class TorBandwidth(TorPlugin): graph = {'title': 'Tor observed bandwidth', 'args': '-l 0 --base 1000', 'vlabel': 'bytes/s', - 'category': 'network', + 'category': 'tor', 'info': 'estimated capacity based on usage in bytes/s'} labels = {'bandwidth': {'label': 'bandwidth', 'min': 0, 'type': 'GAUGE'}} @@ -241,7 +241,7 @@ class TorConnections(TorPlugin): graph = {'title': 'Tor connections', 'args': '-l 0 --base 1000', 'vlabel': 'connections', - 'category': 'network', + 'category': 'tor', 'info': 'OR connections by state'} labels = {'new': {'label': 'new', 'min': 0, 'max': 25000, 'type': 'GAUGE'}, 'launched': {'label': 'launched', 'min': 0, 'max': 25000, 'type': 'GAUGE'}, @@ -291,7 +291,7 @@ class TorCountries(TorPlugin): graph = {'title': 'Tor countries', 'args': '-l 0 --base 1000', 'vlabel': 'countries', - 'category': 'network', + 'category': 'tor', 'info': 'OR connections by state'} labels = {} @@ -368,7 +368,7 @@ class TorDormant(TorPlugin): graph = {'title': 'Tor dormant', 'args': '-l 0 --base 1000', 'vlabel': 'dormant', - 'category': 'network', + 'category': 'tor', 'info': 'Is Tor not building circuits because it is idle?'} labels = {'dormant': {'label': 'dormant', 'min': 0, 'max': 1, 'type': 'GAUGE'}} @@ -396,7 +396,7 @@ class TorFlags(TorPlugin): graph = {'title': 'Tor relay flags', 'args': '-l 0 --base 1000', 'vlabel': 'flags', - 'category': 'network', + 'category': 'tor', 'info': 'Flags active for relay'} labels = {flag: {'label': flag, 'min': 0, 'max': 1, 'type': 'GAUGE'} for flag in stem.Flag} @@ -438,7 +438,7 @@ class TorRouters(TorPlugin): graph = {'title': 'Tor routers', 'args': '-l 0', 'vlabel': 'routers', - 'category': 'network', + 'category': 'tor', 'info': 'known Tor onion routers'} labels = {'routers': {'label': 'routers', 'min': 0, 'type': 'GAUGE'}} TorPlugin.conf_from_dict(graph, labels) @@ -472,7 +472,7 @@ class TorTraffic(TorPlugin): graph = {'title': 'Tor traffic', 'args': '-l 0 --base 1024', 'vlabel': 'bytes/s', - 'category': 'network', + 'category': 'tor', 'info': 'bytes read/written'} labels = {'read': {'label': 'read', 'min': 0, 'type': 'DERIVE'}, 'written': {'label': 'written', 'min': 0, 'type': 'DERIVE'}}