Filippo Giunchedi has submitted this change and it was merged.
Change subject: cassandra: add cassandra::metrics class and deps
......................................................................
cassandra: add cassandra::metrics class and deps
see also related commits in cassandra submodule
Bug: T78514
Change-Id: I6600609237a4e5635409fb2a944a7572691bcc69
---
A hieradata/role/common/cassandra.yaml
M manifests/role/cassandra.pp
M manifests/role/deployment.pp
3 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/hieradata/role/common/cassandra.yaml
b/hieradata/role/common/cassandra.yaml
new file mode 100644
index 0000000..8634e9c
--- /dev/null
+++ b/hieradata/role/common/cassandra.yaml
@@ -0,0 +1 @@
+cassandra::metrics::graphite_host: 'graphite-in.eqiad.wmnet'
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 5537b2c..758c504 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -3,6 +3,7 @@
class role::cassandra {
# Parameters to be set by Hiera
class { '::cassandra': }
+ class { '::cassandra::metrics': }
system::role { 'role::cassandra':
description => 'Cassandra server',
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 4cfc0f6..b9610a0 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -114,6 +114,10 @@
'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy',
'checkout_submodules' => true,
},
+ 'dropwizard/metrics' => {
+ 'gitfat_enabled' => 'true',
+ 'upstream' =>
'https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics',
+ },
}
}
--
To view, visit https://gerrit.wikimedia.org/r/191654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6600609237a4e5635409fb2a944a7572691bcc69
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
