Gehel has uploaded a new change for review. https://gerrit.wikimedia.org/r/278278
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 2 files changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/78/278278/1 diff --git a/modules/diamond/manifests/collector/nginx.pp b/modules/diamond/manifests/collector/nginx.pp index ad9a843..7e22eb4 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..a7abfeb 100644 --- a/modules/elasticsearch/manifests/https.pp +++ b/modules/elasticsearch/manifests/https.pp @@ -12,6 +12,10 @@ ensure => $ensure, } + diamond::collector::nginx { 'elasticsearch': + ensure => $ensure, + } + ::base::expose_puppet_certs { '/etc/nginx': ensure => $ensure, provide_private => true, -- To view, visit https://gerrit.wikimedia.org/r/278278 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If43defbeb9e61ae17451071098ef77e6dfb3395e Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Gehel <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
