Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: mediawiki-monitoring: correct diamond naming, path
......................................................................
mediawiki-monitoring: correct diamond naming, path
Change-Id: Idb4411b0cdf47f9e40689bc4e78c10c0f08b6e0a
Signed-off-by: Giuseppe Lavagetto <glavage...@wikimedia.org>
---
M modules/mediawiki/files/monitoring/collectors/apc.py
M modules/mediawiki/manifests/monitoring/webserver.pp
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki/files/monitoring/collectors/apc.py
b/modules/mediawiki/files/monitoring/collectors/apc.py
index c2f46df..1cd9adb 100644
--- a/modules/mediawiki/files/monitoring/collectors/apc.py
+++ b/modules/mediawiki/files/monitoring/collectors/apc.py
@@ -15,13 +15,13 @@
import diamond.collector
-class MW_ApcCollector(diamond.collector.Collector):
+class mw_apcCollector(diamond.collector.Collector):
def get_default_config_help(self):
pass
def get_default_config(self):
- config = super(MW_ApcCollector, self).get_default_config()
+ config = super(mw_apcCollector, self).get_default_config()
config.update({
'host': 'localhost',
'url': 'apc',
@@ -53,8 +53,7 @@
try:
data = json.load(response)
for k, v in data.iteritems():
- metric = 'apache2.mod_php.apc.{}'.format(k)
- self.publish(metric, v)
+ self.publish(k, v)
except:
self.log.error(
"error parsing and publishing data received:\n%s",
diff --git a/modules/mediawiki/manifests/monitoring/webserver.pp
b/modules/mediawiki/manifests/monitoring/webserver.pp
index 511c647..838eff7 100644
--- a/modules/mediawiki/manifests/monitoring/webserver.pp
+++ b/modules/mediawiki/manifests/monitoring/webserver.pp
@@ -58,7 +58,7 @@
source => "puppet:///modules/mediawiki/monitoring/${endpoint}"
}
- diamond::collector {"MW_${title}":
+ diamond::collector {"mw_${title}":
ensure => $ensure,
source =>
"puppet:///modules/mediawiki/monitoring/collectors/${title}.py",
settings => { host => $::fqdn, url => "${title}" }
--
To view, visit https://gerrit.wikimedia.org/r/143851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idb4411b0cdf47f9e40689bc4e78c10c0f08b6e0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
