Filippo Giunchedi has submitted this change and it was merged.
Change subject: cassandra: multi-instance aware CQL checks
......................................................................
cassandra: multi-instance aware CQL checks
install multiple check_tcp checks, one for each cassandra instance
Bug: T93886
Change-Id: If41939c44a51d3d603d0058c26598e7e3a2b14d3
---
M manifests/role/cassandra.pp
M modules/cassandra/manifests/instance.pp
2 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 801f3da..d468ab4 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -18,13 +18,6 @@
description => 'Cassandra server',
}
- # CQL query interface monitoring (T93886)
- monitoring::service { 'cassandra-cql':
- description => 'Cassandra CQL query interface',
- check_command => 'check_tcp!9042',
- contact_group => 'admins,team-services',
- }
-
$cassandra_hosts = hiera('cassandra::seeds')
$cassandra_hosts_ferm = join($cassandra_hosts, ' ')
diff --git a/modules/cassandra/manifests/instance.pp
b/modules/cassandra/manifests/instance.pp
index 03440b5..0006c50 100644
--- a/modules/cassandra/manifests/instance.pp
+++ b/modules/cassandra/manifests/instance.pp
@@ -221,4 +221,11 @@
nrpe::monitor_systemd_unit_state { $service_name:
require => Service[$service_name],
}
+
+ # CQL query interface monitoring (T93886)
+ monitoring::service { "${service_name}-cql":
+ description => "${service_name} CQL ${listen_address}:9042",
+ check_command => "check_tcp_ip!${listen_address}!9042",
+ contact_group => 'admins,team-services',
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/250439
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If41939c44a51d3d603d0058c26598e7e3a2b14d3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Eevans <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
