Eevans has uploaded a new change for review. https://gerrit.wikimedia.org/r/273061
Change subject: restbase: override logging name ...................................................................... restbase: override logging name Makes the `logging.name` RESTBase config overridable. The default is "restbase" which should make this a noop in production. For staging it is configured as "restbase-test". See also: https://gerrit.wikimedia.org/r/#/c/238431/ and https://gerrit.wikimedia.org/r/#/c/273052/1 Bug: T103124 Change-Id: I8290033b875f61645ff59b99ad25cb29a62771b7 --- M hieradata/regex.yaml M modules/restbase/manifests/init.pp M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 4 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/61/273061/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 0fa7c2a..0dc1e9f 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -119,6 +119,7 @@ - .*\.meanRate$ - .*\.min$ - .*\.stddev$ + restbase::logging_name: restbase-test cassandra_test_codfw: __regex: !ruby/regexp /^restbase-test200[1-3]\.codfw\.wmnet$/ @@ -182,6 +183,7 @@ - .*\.meanRate$ - .*\.min$ - .*\.stddev$ + restbase::logging_name: restbase-test swift_be_codfw_dell: __regex: !ruby/regexp /^ms-be20(0[0-9]|1[0-5])\.codfw\.wmnet$/ diff --git a/modules/restbase/manifests/init.pp b/modules/restbase/manifests/init.pp index bf7fb7a..2ad3f76 100644 --- a/modules/restbase/manifests/init.pp +++ b/modules/restbase/manifests/init.pp @@ -40,6 +40,9 @@ # [*logstash_port*] # GELF logging port. Default: 12201 # +# [*logging_name*] +# The logging name. Default: restbase +# # [*logging_level*] # The logging level. One of ['trace','debug','info','warn','error','fatal'] # Default: 'warn' @@ -87,6 +90,7 @@ $parsoid_uri = 'http://parsoid.svc.eqiad.wmnet:8000', $logstash_host = 'localhost', $logstash_port = 12201, + $logging_name = 'restbase', $logging_level = 'warn', $statsd_host = 'localhost', $statsd_port = '8125', diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index d5097a4..6866fe8 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -123,7 +123,7 @@ worker_heap_limit_mb: 300 logging: - name: restbase + name: <%= @logging_name %> level: <%= @logging_level %> streams: # XXX: Use gelf-stream -> logstash diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index aa2b9d6..dc0da0d 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -874,7 +874,7 @@ worker_heap_limit_mb: 300 logging: - name: restbase + name: <%= @logging_name %> level: <%= @logging_level %> streams: # XXX: Use gelf-stream -> logstash -- To view, visit https://gerrit.wikimedia.org/r/273061 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8290033b875f61645ff59b99ad25cb29a62771b7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Eevans <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
