Filippo Giunchedi has submitted this change and it was merged.
Change subject: graphite: parametrize cors_origins for labs
......................................................................
graphite: parametrize cors_origins for labs
Bug: T143556
Change-Id: Ia424041cddb5c23ae217ebce86f33fe82b7bb720
---
M modules/role/manifests/graphite/base.pp
M modules/role/manifests/labs/graphite.pp
2 files changed, 6 insertions(+), 4 deletions(-)
Approvals:
Yuvipanda: Looks good to me, but someone else must approve
Filippo Giunchedi: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/graphite/base.pp
b/modules/role/manifests/graphite/base.pp
index 4f39c04..da9eab4 100644
--- a/modules/role/manifests/graphite/base.pp
+++ b/modules/role/manifests/graphite/base.pp
@@ -19,6 +19,7 @@
$storage_dir = '/var/lib/carbon',
$auth = true,
$hostname = 'graphite.wikimedia.org',
+ $cors_origins = [ 'https?://(grafana|grafana-admin).wikimedia.org' ],
$c_relay_settings = {},
$cluster_servers = undef,
) {
@@ -196,7 +197,7 @@
storage_dir => $carbon_storage_dir,
documentation_url => '//wikitech.wikimedia.org/wiki/Graphite',
cluster_servers => $cluster_servers,
- cors_origins => [
'https?://(grafana|grafana-admin).wikimedia.org' ],
+ cors_origins => $cors_origins,
}
diff --git a/modules/role/manifests/labs/graphite.pp
b/modules/role/manifests/labs/graphite.pp
index 702eae4..0b57d23 100644
--- a/modules/role/manifests/labs/graphite.pp
+++ b/modules/role/manifests/labs/graphite.pp
@@ -4,9 +4,10 @@
class role::labs::graphite {
class { 'role::graphite::base':
- storage_dir => '/srv/carbon',
- auth => false,
- hostname => 'graphite-labs.wikimedia.org',
+ storage_dir => '/srv/carbon',
+ auth => false,
+ hostname => 'graphite-labs.wikimedia.org',
+ cors_origins => [
'https?://(grafana-labs|grafana-labs-admin).wikimedia.org' ],
}
include graphite::labs::archiver
--
To view, visit https://gerrit.wikimedia.org/r/306467
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia424041cddb5c23ae217ebce86f33fe82b7bb720
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[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
