coren has submitted this change and it was merged.
Change subject: Tweaks to the conntrack collector:
......................................................................
Tweaks to the conntrack collector:
- Resource name is partly case significant and diamond can
be confused if it doesn't keep the same case as the class
- saner reported value names to place them in the hierarchy
Bug: T90437
Change-Id: I08a935faaecd4a5ce6417194cf5a00f2c9fba1d8
---
M modules/diamond/files/collector/conntrack.py
M modules/diamond/manifests/collector/conntrack.pp
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/diamond/files/collector/conntrack.py
b/modules/diamond/files/collector/conntrack.py
index aeabef4..92b2db3 100644
--- a/modules/diamond/files/collector/conntrack.py
+++ b/modules/diamond/files/collector/conntrack.py
@@ -6,8 +6,8 @@
filtering.
Reports:
- - nf_conntrack_max
- - nf_conntrack_count
+ - network.netfilter.conntrack_max
+ - network.netfilter.conntrack_count
Adapted from PuppetAgentCollector
@@ -44,8 +44,8 @@
value = self._get_sysctl('net.netfilter.nf_conntrack_max')
if value is not None:
- self.publish('nf_conntrack_max', value)
+ self.publish('network.netfilter.conntrack_max', value)
value = self._get_sysctl('net.netfilter.nf_conntrack_count')
if value is not None:
- self.publish('nf_conntrack_count', value)
+ self.publish('network.netfilter.conntrack_count', value)
diff --git a/modules/diamond/manifests/collector/conntrack.pp
b/modules/diamond/manifests/collector/conntrack.pp
index e609393..69f0a67 100644
--- a/modules/diamond/manifests/collector/conntrack.pp
+++ b/modules/diamond/manifests/collector/conntrack.pp
@@ -6,7 +6,7 @@
#
define diamond::collector::conntrack {
- diamond::collector { 'conntrack':
+ diamond::collector { 'Conntrack':
source => 'puppet:///modules/diamond/collector/conntrack.py',
}
--
To view, visit https://gerrit.wikimedia.org/r/201188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I08a935faaecd4a5ce6417194cf5a00f2c9fba1d8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: coren <mpellet...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
