regexps fixed for collectd 5.x #119
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,7 +10,7 @@ def __init__(self, config): | |
|
|
||
| self.targets = [ | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.(?P<collectd_plugin>cpu)[\-\.](?P<core>[^\.]+)\.cpu[\-\.](?P<type>[^\.]+)$', | ||
| 'target_type': 'gauge_pct', | ||
| 'tags': { | ||
| 'unit': 'Jiff', | ||
|
|
@@ -23,28 +23,116 @@ def __init__(self, config): | |
| 'configure': lambda self, target: self.fix_load(target) | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.interface[\-\.](?P<device>[^\.]+)\.if_(?P<wt>[^\.]+)\.(?P<dir>[^\.]+)$', | ||
| 'target_type': 'counter', | ||
| 'tags': {'collectd_plugin': 'network'}, | ||
| 'configure': lambda self, target: self.fix_network(target) | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.memory\.memory[\-\.](?P<type>[^\.]+)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'B', | ||
| 'where': 'system_memory' | ||
| } | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.df[\-\.](?P<mountpoint>[^\.]+)\.df_complex[\-\.](?P<type>[^\.]+)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': {'unit': 'B'} | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.(?P<collectd_plugin>disk)[\-\.](?P<device>[^\.]+)\.disk_(?P<wt>[^\.]+)\.(?P<operation>[^\.]+)$', | ||
| 'configure': lambda self, target: self.fix_disk(target) | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>irq)\.irq[\-\.](?P<wt>.*)$', | ||
| 'target_type': 'counter', | ||
| 'tags': { | ||
| 'unit': 'calls', | ||
| 'what': 'irq_calls' | ||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>processes)\.ps_state[\-\.](?P<state>.*)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'procs', | ||
|
Contributor
There was a problem hiding this comment. should be Process (see http://metrics20.org/spec/) |
||
| 'what': 'procs_in_state' | ||
|
Contributor
There was a problem hiding this comment. this can be left out entirely (doesn't bring any new info that's not in unit tag or state tag) |
||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>processes)\.(?P<value>fork_rate)$', | ||
| 'target_type': 'counter', | ||
| 'tags': { | ||
| 'unit': 'procs', | ||
|
|
||
| 'what': 'fork_rate' | ||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.swap\.swap[\-\.](?P<type>[^\.]+)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'B', | ||
| 'where': 'swap' | ||
| } | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>[^\.]+)\.swap\.swap_io[\-\.](?P<dir>[^\.]+)$', | ||
| 'target_type': 'counter', | ||
| 'tags': { | ||
| 'unit': 'B', | ||
| 'where': 'swap_io' | ||
| } | ||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>tcpconns)[\-\.](?P<port>\d+)[\-\.]local\.tcp_connections[\-\.](?P<state>.*)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'connections', | ||
|
|
||
| 'what': 'tcp_connections_in_state' | ||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>contextswitch)\.(?P<value>contextswitch)$', | ||
| 'target_type': 'counter', | ||
| 'tags': { | ||
| 'unit': 'fork/s', | ||
| 'what': 'contextswitch' | ||
|
Contributor
There was a problem hiding this comment. forks/s and contextswitches are different things? you can do context switches without doing any forks. |
||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>users)\.(?P<value>users)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'users', | ||
| 'what': 'users_logged' | ||
|
Contributor
There was a problem hiding this comment. we can use unit=User for this (and add it to the spec) |
||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>entropy)\.(?P<value>entropy)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'bits', | ||
|
|
||
| 'what': 'entropy' | ||
| } | ||
|
|
||
| }, | ||
| { | ||
| 'match': prefix + '(?P<server>.+?)\.(?P<collectd_plugin>conntrack)\.(?P<value>conntrack)$', | ||
| 'target_type': 'gauge', | ||
| 'tags': { | ||
| 'unit': 'entries', | ||
|
Contributor
There was a problem hiding this comment. shouldn't this be unit=Conn, cause we track connections right? and this metric denotes how many connections are in the conntrack table? |
||
| 'what': 'conntrack' | ||
| } | ||
|
|
||
| }, | ||
| ] | ||
| super(CollectdPlugin, self).__init__(config) | ||
|
|
||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should introduce a new unit for this, like Irq