Asher has submitted this change and it was merged.
Change subject: enumerate unused dbs outside of an ugly regex, testing graphite
0.910 on db1014
......................................................................
enumerate unused dbs outside of an ugly regex, testing graphite 0.910 on db1014
Change-Id: Ic90ef430ed5bc5ec6ed27e8f617ed9eae42b12ba
---
M manifests/misc/graphite.pp
M manifests/site.pp
2 files changed, 40 insertions(+), 22 deletions(-)
Approvals:
Asher: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/graphite.pp b/manifests/misc/graphite.pp
index f1ff857..cc0e628 100644
--- a/manifests/misc/graphite.pp
+++ b/manifests/misc/graphite.pp
@@ -14,6 +14,11 @@
}
file {
+ "/a/graphite":
+ owner => "www-data",
+ group => "www-data",
+ mode => 0755,
+ ensure => directory;
"/etc/apache2/sites-available/graphite":
owner => "root",
group => "root",
@@ -66,27 +71,27 @@
class { "varnish::monitoring::ganglia": varnish_instances => [
"graphite" ] }
- varnish::instance { "graphite":
- name => "",
- vcl => "graphite",
- port => 81,
- admin_port => 6082,
- storage => "-s malloc,256M",
- backends => [ 'localhost' ],
- directors => { 'backend' => [ 'localhost' ] },
- vcl_config => {
- 'retry5xx' => 0
- },
- backend_options => {
- 'port' => 80,
- 'connect_timeout' => "5s",
- 'first_byte_timeout' => "35s",
- 'between_bytes_timeout' => "4s",
- 'max_connections' => 100,
- 'probe' => "options",
- },
- xff_sources => $network::constants::all_networks
- }
+ #varnish::instance { "graphite":
+ # name => "",
+ # vcl => "graphite",
+ # port => 81,
+ # admin_port => 6082,
+ # storage => "-s malloc,256M",
+ # backends => [ 'localhost' ],
+ # directors => { 'backend' => [ 'localhost' ] },
+ # vcl_config => {
+ # 'retry5xx' => 0
+ # },
+ # backend_options => {
+ # 'port' => 80,
+ # 'connect_timeout' => "5s",
+ # 'first_byte_timeout' => "35s",
+ # 'between_bytes_timeout' => "4s",
+ # 'max_connections' => 100,
+ # 'probe' => "options",
+ # },
+ # xff_sources => $network::constants::all_networks
+ #}
}
class misc::graphite::gdash {
diff --git a/manifests/site.pp b/manifests/site.pp
index 8f13005..167d90b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -741,10 +741,23 @@
## 2013-04-10: py using db101[45] and db1023 and db1033 for testing
## not currently in production and/or hardware issues
-node /^db10(1[45]|2[3]|3[367]|44)\.eqiad\.wmnet/ {
+# db1015
+# db1023
+# db1033
+# db1036
+# db1037
+# db1044
+node /^db10(15|2[3]|3[367]|44)\.eqiad\.wmnet/ {
include standard
}
+node "db1014.eqiad.wmnet" {
+ $cluster = "misc"
+ include standard,
+ misc::graphite,
+ udpprofile::collector
+}
+
# 2013-09-11: sp testing delayed slave mariadb 10
node "db1045.eqiad.wmnet" {
include standard
--
To view, visit https://gerrit.wikimedia.org/r/83953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic90ef430ed5bc5ec6ed27e8f617ed9eae42b12ba
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: Asher <afeld...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
