[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/graphite: rename director, don't send cross-dc t...

2017-08-04 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370107 )

Change subject: cache::misc/graphite: rename director, don't send cross-dc 
traffic
..


cache::misc/graphite: rename director, don't send cross-dc traffic

The director itself should just be called "graphite" and not
contain any numbers. It's above datacenter-level.

It should have 2 backends, one in eqiad and one in codfw,
but until it truly is active-active, codfw won't be activated.

Also, note how the current setup uses a codfw hostname for eqiad
in the director called graphite2001. This would cause unencrypted
cross-DC traffic if the director was used.

This should not change anything, still graphite1001 will be used
as the only active backend, for now.

Change-Id: Ib9c817adbeb036671673618ad42431c54e94e566
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index e9d003a..834484e 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -66,12 +66,10 @@
   contint1001:
 backends:
   eqiad: 'contint1001.wikimedia.org'
-  graphite1001:
+  graphite:
 backends:
   eqiad: 'graphite1001.eqiad.wmnet'
-  graphite2001:
-backends:
-  eqiad: 'graphite2001.codfw.wmnet'
+# codfw: 'graphite2001.codfw.wmnet'
   krypton:
 backends:
   eqiad: 'krypton.eqiad.wmnet'
@@ -189,7 +187,7 @@
   graphite-labs.wikimedia.org:
 director: 'labmon1001'
   graphite.wikimedia.org:
-director: 'graphite1001'
+director: 'graphite'
   horizon.wikimedia.org:
 director: 'californium'
   hue.wikimedia.org:
@@ -220,7 +218,7 @@
 director: 'rutherfordium'
 caching: 'pass'
   performance.wikimedia.org:
-director: 'graphite1001'
+director: 'graphite'
   phabricator.wikimedia.org:
 director: 'phabricator'
   phabricator-new.wikimedia.org:

-- 
To view, visit https://gerrit.wikimedia.org/r/370107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib9c817adbeb036671673618ad42431c54e94e566
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cache::misc/graphite: rename director, don't send cross-dc t...

2017-08-03 Thread Dzahn (Code Review) 
Dzahn has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/370107 )

Change subject: cache::misc/graphite: rename director, don't send cross-dc 
traffic
..

cache::misc/graphite: rename director, don't send cross-dc traffic

The director itself should just be called "graphite" and not
contain any numbers. It's above datacenter-level.

It should have 2 backends, one in eqiad and one in codfw,
but until it truly is active-active, codfw won't be activated.

This should not change anything, still graphite1001 will be used
as the only active backend, for now.

Change-Id: Ib9c817adbeb036671673618ad42431c54e94e566
---
M hieradata/role/common/cache/misc.yaml
1 file changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/370107/1

diff --git a/hieradata/role/common/cache/misc.yaml 
b/hieradata/role/common/cache/misc.yaml
index cfdd87e..cefa0ca 100644
--- a/hieradata/role/common/cache/misc.yaml
+++ b/hieradata/role/common/cache/misc.yaml
@@ -66,12 +66,10 @@
   contint1001:
 backends:
   eqiad: 'contint1001.wikimedia.org'
-  graphite1001:
+  graphite:
 backends:
   eqiad: 'graphite1001.eqiad.wmnet'
-  graphite2001:
-backends:
-  eqiad: 'graphite2001.codfw.wmnet'
+# codfw: 'graphite2001.codfw.wmnet'
   krypton:
 backends:
   eqiad: 'krypton.eqiad.wmnet'
@@ -189,7 +187,7 @@
   graphite-labs.wikimedia.org:
 director: 'labmon1001'
   graphite.wikimedia.org:
-director: 'graphite1001'
+director: 'graphite'
   horizon.wikimedia.org:
 director: 'californium'
   hue.wikimedia.org:
@@ -220,7 +218,7 @@
 director: 'rutherfordium'
 caching: 'pass'
   performance.wikimedia.org:
-director: 'graphite1001'
+director: 'graphite'
   phabricator.wikimedia.org:
 director: 'phabricator'
   phabricator-new.wikimedia.org:

-- 
To view, visit https://gerrit.wikimedia.org/r/370107
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib9c817adbeb036671673618ad42431c54e94e566
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits