Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172715
Change subject: Allow specifying journal_dir for rrdcached
......................................................................
Allow specifying journal_dir for rrdcached
Turns out we want to put it under /srv since it has the tendency to grow
a lot. Also pass the -F flag so that on shutdown everything is flushed
While at it, have puppet notify rrdcached/gmetad on configuration file
changes
Change-Id: I515ac8f116890159d5c416aacab5c2ba2b99aca6
---
M manifests/role/ganglia.pp
M modules/ganglia_new/manifests/gmetad.pp
M modules/ganglia_new/manifests/gmetad/rrdcached.pp
M modules/ganglia_new/templates/rrdcached.default.erb
4 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/172715/1
diff --git a/manifests/role/ganglia.pp b/manifests/role/ganglia.pp
index 81dac1f..42dace7 100644
--- a/manifests/role/ganglia.pp
+++ b/manifests/role/ganglia.pp
@@ -90,6 +90,7 @@
class { 'ganglia_new::web':
rrdcached_socket => $gweb_socket,
gmetad_root => $gmetad_root,
+ journal_dir => '/srv/rrdcached_journal',
}
# Get better insight into how disks are faring
diff --git a/modules/ganglia_new/manifests/gmetad.pp
b/modules/ganglia_new/manifests/gmetad.pp
index b0414d0..de8c5ec 100644
--- a/modules/ganglia_new/manifests/gmetad.pp
+++ b/modules/ganglia_new/manifests/gmetad.pp
@@ -49,8 +49,9 @@
content => template('ganglia_new/gmetad.upstart'),
}
- Package['gmetad'] -> File['/etc/ganglia/gmetad.conf'] -> Service['gmetad']
- Package['gmetad'] -> File['/etc/init/gmetad.conf'] -> Service['gmetad']
+ # We also notify on file changes
+ Package['gmetad'] -> File['/etc/ganglia/gmetad.conf'] ~> Service['gmetad']
+ Package['gmetad'] -> File['/etc/init/gmetad.conf'] ~> Service['gmetad']
File[$gmetad_root] -> File[$rrd_rootdir]
File[$rrd_rootdir] -> Service['gmetad']
}
diff --git a/modules/ganglia_new/manifests/gmetad/rrdcached.pp
b/modules/ganglia_new/manifests/gmetad/rrdcached.pp
index 7d70438..7ac83cd 100644
--- a/modules/ganglia_new/manifests/gmetad/rrdcached.pp
+++ b/modules/ganglia_new/manifests/gmetad/rrdcached.pp
@@ -4,9 +4,17 @@
$rrdpath,
$gmetad_socket,
$gweb_socket,
+ $journal_dir='/var/lib/rrdcached/journal',
) {
package { 'rrdcached':
ensure => $ensure,
+ }
+
+ file { $journal_dir:
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0755',
}
file { '/etc/default/rrdcached':
@@ -22,5 +30,6 @@
provider => 'upstart',
}
- Package['rrdcached'] -> File['/etc/default/rrdcached'] ->
Service['rrdcached']
+ # We also notify on file changes
+ Package['rrdcached'] -> File['/etc/default/rrdcached'] ~>
Service['rrdcached']
}
diff --git a/modules/ganglia_new/templates/rrdcached.default.erb
b/modules/ganglia_new/templates/rrdcached.default.erb
index f2f1082..20b6ac8 100644
--- a/modules/ganglia_new/templates/rrdcached.default.erb
+++ b/modules/ganglia_new/templates/rrdcached.default.erb
@@ -12,7 +12,7 @@
# (do not specify -p <pidfile> - this is handled by the init script)
# default: see /etc/init.d/rrdcached
#OPTS=""
-OPTS="-s nogroup -l unix:<%= @gmetad_socket %> -s www-data -P
PENDING,FLUSH,STATS -l unix:<%= @gweb_socket %> -j /var/lib/rrdcached/journal/
-b <%= @rrdpath %> -B"
+OPTS="-s nogroup -l unix:<%= @gmetad_socket %> -s www-data -P
PENDING,FLUSH,STATS -l unix:<%= @gweb_socket %> -j <%= @journal_dir %> -F -b
<%= @rrdpath %> -B"
# number of seconds to wait for rrdcached to shut down
# (writing the data to disk may take some time;
--
To view, visit https://gerrit.wikimedia.org/r/172715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I515ac8f116890159d5c416aacab5c2ba2b99aca6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
