Eevans has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/328667 )
Change subject: [WIP]: Enable Cassandra on restbase-test100[1-3]
......................................................................
[WIP]: Enable Cassandra on restbase-test100[1-3]
This still needs IP addresses for the instances, and some bikeshedding might
be in order for the labels (services-dev-test, restbase-dev-test, etc).
Another changeset to add keys will also be needed.
Bug: T153880
Change-Id: Ief72465bd0b7f2e7c2fd065737951d191aba2ca2
---
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
A hieradata/hosts/restbase-test1001.yaml
A hieradata/hosts/restbase-test1002.yaml
A hieradata/hosts/restbase-test1003.yaml
M hieradata/regex.yaml
6 files changed, 118 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/67/328667/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 93e7062..275d33d 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -275,6 +275,11 @@
id: 58
sites:
codfw: []
+ services_dev_test:
+ description: "Services development test"
+ id: 59
+ sites:
+ eqiad: []
puppetmaster: "puppet"
active_labstore_host: 'labstore1001'
statistics_servers:
diff --git a/hieradata/common/monitoring.yaml b/hieradata/common/monitoring.yaml
index 927dea3..2d044af 100644
--- a/hieradata/common/monitoring.yaml
+++ b/hieradata/common/monitoring.yaml
@@ -194,6 +194,8 @@
description: Restbase test/staging eqiad
restbase_test_codfw:
description: Restbase test/staging codfw
+ services_dev_test_eqiad:
+ description: Services development test eqiad
# Service Clusters
sca_eqiad:
diff --git a/hieradata/hosts/restbase-test1001.yaml
b/hieradata/hosts/restbase-test1001.yaml
new file mode 100644
index 0000000..d98cd15
--- /dev/null
+++ b/hieradata/hosts/restbase-test1001.yaml
@@ -0,0 +1,13 @@
+cassandra::instances:
+ a:
+ jmx_port: 7189
+ listen_address: xx.xxx.xx.xxx
+ rpc_address: xx.xxx.xx.xxx
+ rpc_interface: eth0
+ b:
+ jmx_port: 7190
+ listen_address: xx.xxx.xx.xxx
+ rpc_address: xx.xxx.xx.xxx
+ rpc_interface: eth0
+
+do_paging: false
diff --git a/hieradata/hosts/restbase-test1002.yaml
b/hieradata/hosts/restbase-test1002.yaml
new file mode 100644
index 0000000..d98cd15
--- /dev/null
+++ b/hieradata/hosts/restbase-test1002.yaml
@@ -0,0 +1,13 @@
+cassandra::instances:
+ a:
+ jmx_port: 7189
+ listen_address: xx.xxx.xx.xxx
+ rpc_address: xx.xxx.xx.xxx
+ rpc_interface: eth0
+ b:
+ jmx_port: 7190
+ listen_address: xx.xxx.xx.xxx
+ rpc_address: xx.xxx.xx.xxx
+ rpc_interface: eth0
+
+do_paging: false
diff --git a/hieradata/hosts/restbase-test1003.yaml
b/hieradata/hosts/restbase-test1003.yaml
new file mode 100644
index 0000000..d98cd15
--- /dev/null
+++ b/hieradata/hosts/restbase-test1003.yaml
@@ -0,0 +1,13 @@
+cassandra::instances:
+ a:
+ jmx_port: 7189
+ listen_address: xx.xxx.xx.xxx
+ rpc_address: xx.xxx.xx.xxx
+ rpc_interface: eth0
+ b:
+ jmx_port: 7190
+ listen_address: xx.xxx.xx.xxx
+ rpc_address: xx.xxx.xx.xxx
+ rpc_interface: eth0
+
+do_paging: false
diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 1e59764..aa40a2b 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -278,6 +278,78 @@
cassandra::start_rpc: 'true'
cassandra::target_version: '2.2'
+services_dev_test_eqiad:
+ __regex: !ruby/regexp /^restbase-test100[1-3]\.eqiad\.wmnet$/
+ cluster: services_dev_test
+ cassandra::seeds:
+ - restbase-test1001.eqiad.wmnet
+ - restbase-test1001-a.eqiad.wmnet
+ - restbase-test1001-b.eqiad.wmnet
+ - restbase-test1002.eqiad.wmnet
+ - restbase-test1002-a.eqiad.wmnet
+ - restbase-test1002-b.eqiad.wmnet
+ - restbase-test1003.eqiad.wmnet
+ - restbase-test1003-a.eqiad.wmnet
+ - restbase-test1003-b.eqiad.wmnet
+ restbase::seeds:
+ - restbase-test1001-a.eqiad.wmnet
+ - restbase-test1001-b.eqiad.wmnet
+ - restbase-test1002-a.eqiad.wmnet
+ - restbase-test1002-b.eqiad.wmnet
+ - restbase-test1003-a.eqiad.wmnet
+ - restbase-test1003-b.eqiad.wmnet
+ restbase::hosts:
+ - restbase-test1001.eqiad.wmnet
+ - restbase-test1002.eqiad.wmnet
+ - restbase-test1003.eqiad.wmnet
+ restbase::cassandra_datacenters:
+ - eqiad
+ restbase::statsd_prefix: restbase-dev-test
+ cassandra::max_heap_size: 12g
+ cassandra::cluster_name: cassandra-dev-test
+ cassandra::tls_cluster_name: casssandra-dev-test
+ cassandra::internode_encryption: dc
+ cassandra::application_username: restb
+ cassandra::application_password: "%{passwords::cassandra::restbase}"
+ restbase::cassandra_user: restb
+ restbase::cassandra_password: "%{passwords::cassandra::restbase}"
+ cassandra::metrics::whitelist:
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorReadLatency\..*$
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.CoordinatorScanLatency\..*$
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedColumnCountHistogram\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedRowCount\..*$
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.EstimatedRowSizeHistogram\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.LiveDiskSpaceUsed\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.LiveSSTableCount\..*$
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.LiveScannedHistogram\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.MaxRowSize\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.MeanRowSize\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.MinRowSize\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.PendingCompactions\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.PendingFlushes\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.RangeLatency\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.ReadLatency\..*$
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.SSTablesPerReadHistogram\..*$
+ -
.*\.metrics\.ColumnFamily\.local_group_.*\.meta\.TombstoneScannedHistogram\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.TotalDiskSpaceUsed\..*$
+ - .*\.metrics\.ColumnFamily\.local_group_.*\.meta\.WriteLatency\..*$
+ cassandra::metrics::blacklist:
+ - .*\.15MinuteRate$
+ - .*\.5MinuteRate$
+ - .*\.98percentile$
+ - .*\.999percentile$
+ - .*\.max$
+ - .*\.mean$
+ - .*\.meanRate$
+ - .*\.min$
+ - .*\.stddev$
+ - .*\.metrics\.Keyspace\..*$
+ - .*\.metrics\.Client\..*$
+ restbase::logging_name: restbase-dev-test
+ restbase::skip_updates: true
+ cassandra::start_rpc: 'true'
+ cassandra::target_version: '2.2'
+
swift_be_codfw_dell:
__regex: !ruby/regexp /^ms-be20(0[0-9]|1[0-5])\.codfw\.wmnet$/
swift_storage_drives: [
--
To view, visit https://gerrit.wikimedia.org/r/328667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief72465bd0b7f2e7c2fd065737951d191aba2ca2
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
