Gehel has submitted this change and it was merged. Change subject: Adding metric collection to nginx in the context of elasticsearch ......................................................................
Adding metric collection to nginx in the context of elasticsearch Question to reviewer: I'm not yet familiar with our metric collection. Do I need to be carefull about something in particular? Not sending too many metrics to Graphite? Anything else? This change depends on https://gerrit.wikimedia.org/r/#/c/278276/ Bug: T130365 Change-Id: If43defbeb9e61ae17451071098ef77e6dfb3395e --- M modules/diamond/manifests/collector/nginx.pp M modules/elasticsearch/manifests/https.pp M modules/nginx 3 files changed, 12 insertions(+), 3 deletions(-) Approvals: Gehel: Looks good to me, approved Filippo Giunchedi: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/diamond/manifests/collector/nginx.pp b/modules/diamond/manifests/collector/nginx.pp index ad9a843..4f55d4d 100644 --- a/modules/diamond/manifests/collector/nginx.pp +++ b/modules/diamond/manifests/collector/nginx.pp @@ -10,12 +10,17 @@ # [*port*] # Bind the Nginx status site to this port. # -define diamond::collector::nginx( $port = 8080 ) { +define diamond::collector::nginx( + $ensure = present, + $port = 8080, +) { nginx::status_site { 'status': - port => $port, + ensure => $ensure, + port => $port, } diamond::collector { 'Nginx': + ensure => $ensure, settings => { req_port => $port, }, diff --git a/modules/elasticsearch/manifests/https.pp b/modules/elasticsearch/manifests/https.pp index 249d159..f948f7f 100644 --- a/modules/elasticsearch/manifests/https.pp +++ b/modules/elasticsearch/manifests/https.pp @@ -5,13 +5,17 @@ # == Parameters: # - ensure: self explanatory class elasticsearch::https ( - $ensure = 'absent', + $ensure = absent, ){ class { [ 'nginx', 'nginx::ssl' ]: ensure => $ensure, } + diamond::collector::nginx { 'elasticsearch': + ensure => $ensure, + } + ::base::expose_puppet_certs { '/etc/nginx': ensure => $ensure, provide_private => true, diff --git a/modules/nginx b/modules/nginx index 253561e..e74a5c7 160000 --- a/modules/nginx +++ b/modules/nginx -Subproject commit 253561e0a762b5b4ecb0cde178abf073a09a8a14 +Subproject commit e74a5c773f312827c216437fc2b57bd80d24c4d4 -- To view, visit https://gerrit.wikimedia.org/r/278278 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If43defbeb9e61ae17451071098ef77e6dfb3395e Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <[email protected]> Gerrit-Reviewer: Dzahn <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: Gehel <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
