Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: add cluster_servers graphite-web setting
......................................................................
graphite: add cluster_servers graphite-web setting
moving to multiple graphite machines means instructing graphite-web to ask
other servers for metrics when queried
Bug: T85451
Change-Id: I71697f084f40c1bbdb0217f5136b34d01170c0dd
---
M modules/graphite/manifests/web.pp
M modules/graphite/templates/local_settings.py.erb
M modules/role/manifests/graphite/base.pp
3 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index 06cf490..45156a4 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -37,6 +37,10 @@
# An optional array of HTTP Origin header values or regexp patterns
# for which graphite-web should set CORS headers.
#
+# [*cluster_servers*]
+# An optional array of servers running graphite-web to be queried for
+# metrics.
+#
class graphite::web(
$admin_pass,
$secret_key,
@@ -47,6 +51,7 @@
$documentation_url = 'http://graphite.readthedocs.org/',
$remote_user_auth = false,
$cors_origins = undef,
+ $cluster_servers = undef,
) {
include ::graphite
diff --git a/modules/graphite/templates/local_settings.py.erb
b/modules/graphite/templates/local_settings.py.erb
index 69131a1..567d65f 100644
--- a/modules/graphite/templates/local_settings.py.erb
+++ b/modules/graphite/templates/local_settings.py.erb
@@ -48,6 +48,10 @@
## Carbon
+<%- if @cluster_servers -%>
+CLUSTER_SERVERS = [<%= @cluster_servers.map { |s| "\"#{s}\"" }.join(', ') %>]
+<%- end -%>
+
<%- carbon_settings = scope.lookupvar('::graphite::carbon_settings'); if
carbon_settings.key? 'relay' -%>
CARBONLINK_HOSTS = [<%=
carbon_settings['relay']['destinations'].map { |dest|
diff --git a/modules/role/manifests/graphite/base.pp
b/modules/role/manifests/graphite/base.pp
index 3231799..94344bf 100644
--- a/modules/role/manifests/graphite/base.pp
+++ b/modules/role/manifests/graphite/base.pp
@@ -20,6 +20,7 @@
$auth = true,
$hostname = 'graphite.wikimedia.org',
$c_relay_settings = {},
+ $cluster_servers = undef,
) {
include ::passwords::graphite
@@ -187,6 +188,7 @@
secret_key => $::passwords::graphite::secret_key,
storage_dir => $carbon_storage_dir,
documentation_url => '//wikitech.wikimedia.org/wiki/Graphite',
+ cluster_servers => $cluster_servers,
cors_origins => [
'https?://(grafana|grafana-admin).wikimedia.org' ],
}
--
To view, visit https://gerrit.wikimedia.org/r/281631
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I71697f084f40c1bbdb0217f5136b34d01170c0dd
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
