Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395563 )
Change subject: profile: add redis_exporter to ores::redis
......................................................................
profile: add redis_exporter to ores::redis
The redis' "instances" list (i.e. the fact that the are two instances) is
already split among the
profile and ores::redis. For consistency include profile::redis_exporter within
profile::ores::redis
rather than inside ores::redis.
Bug: T148637
Change-Id: I4b32a61161ddada6b4733766ad78cb1c8a1e9b62
---
M modules/profile/manifests/ores/redis.pp
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/profile/manifests/ores/redis.pp
b/modules/profile/manifests/ores/redis.pp
index 8da21a2..58a9d81 100644
--- a/modules/profile/manifests/ores/redis.pp
+++ b/modules/profile/manifests/ores/redis.pp
@@ -4,19 +4,28 @@
$password = hiera('profile::ores::redis::password'),
$redis_clients = hiera('profile::ores::redis::client_hosts'),
$slaveof = hiera('profile::ores::redis::slaveof', undef),
+ $prometheus_nodes = hiera('prometheus_nodes'),
){
include ::standard
include ::base::firewall
+
+ $instances = ['6379', '6380']
class { '::ores::redis':
password => $password,
slaveof => $slaveof,
}
+ ::profile::prometheus::redis_exporter{ $instances:
+ password => $password,
+ prometheus_nodes => $prometheus_nodes,
+ }
+
$redis_hosts_ferm = join($redis_clients, ' ')
+ $redis_ports_ferm = join($instances, ' ')
ferm::service { 'ores_redis':
proto => 'tcp',
- port => '(6379 6380)',
+ port => "(${redis_ports_ferm})",
srange => "@resolve((${redis_hosts_ferm}))",
}
}
--
To view, visit https://gerrit.wikimedia.org/r/395563
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b32a61161ddada6b4733766ad78cb1c8a1e9b62
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: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
