Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401502 )
Change subject: mtail: stop sending metrics to graphite
......................................................................
mtail: stop sending metrics to graphite
Prometheus is running production now, also lessen the load on Graphite when
emitting high
cardinality metrics.
Change-Id: I7021322cce9af95cee975b81af2a49de57df8000
---
M modules/mtail/manifests/init.pp
M modules/mtail/templates/default.erb
2 files changed, 1 insertion(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/mtail/manifests/init.pp b/modules/mtail/manifests/init.pp
index fc3fd1d..7bb8497 100644
--- a/modules/mtail/manifests/init.pp
+++ b/modules/mtail/manifests/init.pp
@@ -10,23 +10,17 @@
# [*port*]
# TCP port to listen to for Prometheus-style metrics
#
-# [*graphite_hostport*]
-# Also send metrics via graphite line-oriented protocol to this host:port.
-#
# [*ensure*]
# Whether mtail should be running or stopped.
class mtail (
$logs = ['/var/log/syslog'],
$port = '3903',
- $graphite_hostport = 'graphite-in.eqiad.wmnet:2003',
- $graphite_prefix = "mtail.${::hostname}.",
$ensure = 'running',
$group = 'root',
) {
validate_array($logs)
validate_re($port, '^[0-9]+$')
- validate_string($graphite_hostport)
validate_re($ensure, '^(running|stopped)$')
require_package('mtail')
diff --git a/modules/mtail/templates/default.erb
b/modules/mtail/templates/default.erb
index e26726f..8c0ca64 100644
--- a/modules/mtail/templates/default.erb
+++ b/modules/mtail/templates/default.erb
@@ -1,6 +1,5 @@
# Arguments used by SysV init script, systemd service file uses only EXTRA_ARGS
-#GRAPHITE_HOSTPORT=<%= @graphite_hostport %>
#PORT=<%= @port %>
#LOGS=<%= @logs.join(',') %>
-EXTRA_ARGS="-graphite_prefix <%= @graphite_prefix %> -graphite_host_port <%=
@graphite_hostport %> -logs <%= @logs.join(',') %> -port <%= @port %> "
+EXTRA_ARGS="-logs <%= @logs.join(',') %> -port <%= @port %>"
--
To view, visit https://gerrit.wikimedia.org/r/401502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7021322cce9af95cee975b81af2a49de57df8000
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
