[MediaWiki-commits] [Gerrit] operations/puppet[production]: sanitarium3: Prepare db1102 to run s4 instance

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

Change subject: sanitarium3: Prepare db1102 to run s4 instance
..


sanitarium3: Prepare db1102 to run s4 instance

s4 will be migrated from db1095 to db1102

Bug: T172996
Change-Id: I50e6af1a1312ba3aec61b5ed7ab1807266fb0c00
---
M modules/role/files/prometheus/mysql-labs_eqiad.yaml
M modules/role/manifests/mariadb/sanitarium_multiinstance.pp
2 files changed, 12 insertions(+), 1 deletion(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/files/prometheus/mysql-labs_eqiad.yaml 
b/modules/role/files/prometheus/mysql-labs_eqiad.yaml
index 67bea22..8673535 100644
--- a/modules/role/files/prometheus/mysql-labs_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-labs_eqiad.yaml
@@ -15,6 +15,11 @@
   targets:
   - db1102:13312
 - labels:
+shard: s4
+role: slave
+  targets:
+  - db1102:13314
+- labels:
 shard: s6
 role: slave
   targets:
diff --git a/modules/role/manifests/mariadb/sanitarium_multiinstance.pp 
b/modules/role/manifests/mariadb/sanitarium_multiinstance.pp
index 55f653c..15507a9 100644
--- a/modules/role/manifests/mariadb/sanitarium_multiinstance.pp
+++ b/modules/role/manifests/mariadb/sanitarium_multiinstance.pp
@@ -57,6 +57,12 @@
 role::prometheus::mysqld_exporter_instance {'s2':
 port => 13312,
 }
+mariadb::instance {'s4':
+port => 3314,
+}
+role::prometheus::mysqld_exporter_instance {'s4':
+port => 13314,
+}
 mariadb::instance {'s6':
 port => 3316,
 }
@@ -76,7 +82,7 @@
 }
 
 class { 'mariadb::monitor_process':
-process_count => 3,
+process_count => 4,
 contact_group => 'admins',
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50e6af1a1312ba3aec61b5ed7ab1807266fb0c00
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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]: sanitarium3: Prepare db1102 to run s4 instance

2017-08-18 Thread Marostegui (Code Review) 
Marostegui has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/372518 )

Change subject: sanitarium3: Prepare db1102 to run s4 instance
..

sanitarium3: Prepare db1102 to run s4 instance

s4 will be migrated from db1095 to db1102

Bug: T172996
Change-Id: I50e6af1a1312ba3aec61b5ed7ab1807266fb0c00
---
M modules/role/files/prometheus/mysql-labs_eqiad.yaml
M modules/role/manifests/mariadb/sanitarium_multiinstance.pp
2 files changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/372518/1

diff --git a/modules/role/files/prometheus/mysql-labs_eqiad.yaml 
b/modules/role/files/prometheus/mysql-labs_eqiad.yaml
index 67bea22..8673535 100644
--- a/modules/role/files/prometheus/mysql-labs_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-labs_eqiad.yaml
@@ -15,6 +15,11 @@
   targets:
   - db1102:13312
 - labels:
+shard: s4
+role: slave
+  targets:
+  - db1102:13314
+- labels:
 shard: s6
 role: slave
   targets:
diff --git a/modules/role/manifests/mariadb/sanitarium_multiinstance.pp 
b/modules/role/manifests/mariadb/sanitarium_multiinstance.pp
index 55f653c..fd897b5 100644
--- a/modules/role/manifests/mariadb/sanitarium_multiinstance.pp
+++ b/modules/role/manifests/mariadb/sanitarium_multiinstance.pp
@@ -57,6 +57,12 @@
 role::prometheus::mysqld_exporter_instance {'s2':
 port => 13312,
 }
+mariadb::instance {'s4':
+port => 3314,
+}
+role::prometheus::mysqld_exporter_instance {'s4':
+port => 13314,
+}
 mariadb::instance {'s6':
 port => 3316,
 }

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

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

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