tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clarified: Manage probe and remote services individually

Browse source 
Fixes #4.
This commit is contained in:
Ossi Salmi 2013-09-02 14:00:13 +03:00
parent f33820a1f5
commit c05b882bdb
1 changed files with 67 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
clarified/manifests/init.pp
View file

@ -15,8 +15,8 @@ class clarified::analyzer {
file { "/usr/local/src/clarified-analyzer-linux-i686.sh": file { "/usr/local/src/clarified-analyzer-linux-i686.sh":
ensure => present, ensure => present,
mode => "0755", mode => "0755",
owner => root, owner => "root",
group => root, group => "root",
source => "puppet:///files/packages/${clarified_analyzer_package}", source => "puppet:///files/packages/${clarified_analyzer_package}",
before => Exec["/usr/local/src/clarified-analyzer-linux-i686.sh"], before => Exec["/usr/local/src/clarified-analyzer-linux-i686.sh"],
} }
@ -50,8 +50,8 @@ class clarified::recorder {
file { $recorder_datadir: file { $recorder_datadir:
ensure => directory, ensure => directory,
mode => "0700", mode => "0700",
owner => root, owner => "root",
group => root, group => "root",
} }
file { "/var/lib/recorder": file { "/var/lib/recorder":
@ -63,8 +63,8 @@ class clarified::recorder {
file { "/var/lib/recorder": file { "/var/lib/recorder":
ensure => directory, ensure => directory,
mode => "0700", mode => "0700",
owner => root, owner => "root",
group => root, group => "root",
} }
} }
@ -73,8 +73,8 @@ class clarified::recorder {
"/etc/clarified/remote.d", ]: "/etc/clarified/remote.d", ]:
ensure => directory, ensure => directory,
mode => "0644", mode => "0644",
owner => root, owner => "root",
group => root, group => "root",
before => Exec["/usr/local/src/clarified-recorder-linux.sh"], before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
} }
@ -88,8 +88,8 @@ class clarified::recorder {
file { "/usr/local/src/clarified-recorder-linux.sh": file { "/usr/local/src/clarified-recorder-linux.sh":
ensure => present, ensure => present,
mode => "0755", mode => "0755",
owner => root, owner => "root",
group => root, group => "root",
source => "puppet:///files/packages/${clarified_recorder_package}", source => "puppet:///files/packages/${clarified_recorder_package}",
before => Exec["/usr/local/src/clarified-recorder-linux.sh"], before => Exec["/usr/local/src/clarified-recorder-linux.sh"],
} }
@ -117,18 +117,24 @@ class clarified::recorder {
file { "/etc/init.d/clarified-probe": file { "/etc/init.d/clarified-probe":
ensure => present, ensure => present,
mode => "0755", mode => "0755",
owner => root, owner => "root",
group => root, group => "root",
source => "/usr/local/probe/probe-init.sh", source => "/usr/local/probe/probe-init.sh",
require => Exec["/usr/local/src/clarified-recorder-linux.sh"], require => Exec["/usr/local/src/clarified-recorder-linux.sh"],
before => Service["clarified-probe"], notify => Exec["add-service-clarified-probe"],
}
exec { "add-service-clarified-probe":
path => "/bin:/usr/bin:/sbin:/usr/sbin",
command => $::operatingsystem ? {
"debian" => "update-rc.d clarified-probe defaults",
"ubuntu" => "update-rc.d clarified-probe defaults",
default => "chkconfig --add clarified-probe",
},
refreshonly => true,
before => Service["clarified-probe"],
} }
service { "clarified-probe": service { "clarified-probe":
ensure => running, enable => true,
enable => true,
hasrestart => true,
status => "pgrep -f /usr/local/probe",
} }
} }
@ -179,17 +185,39 @@ define clarified::probe($interface="", $snaplen="65535", $keeptime="100GB",
$interface_real = $name $interface_real = $name
} }
file { "/var/lib/recorder/${name}":
ensure => directory,
mode => "0700",
owner => "root",
group => "root",
}
file { "/etc/clarified/probe.d/${name}": file { "/etc/clarified/probe.d/${name}":
ensure => $probe ? { ensure => $probe ? {
true => present, true => present,
false => absent, false => absent,
}, },
mode => "0755", mode => "0755",
owner => root, owner => "root",
group => root, group => "root",
content => template("clarified/probe.erb"), content => template("clarified/probe.erb"),
require => File["/etc/clarified/probe.d"], require => File["/var/lib/recorder/${name}"],
notify => Service["clarified-probe"], notify => $probe ? {
true => Service["probe-${name}"],
false => undef,
},
}
service { "probe-${name}":
ensure => $probe ? {
true => running,
false => stopped,
},
provider => "base",
start => "/etc/clarified/probe.d/${name} start",
restart => "/etc/clarified/probe.d/${name} restart",
stop => "pkill -f /var/run/probe/${name}.pid",
status => "pgrep -f /var/run/probe/${name}.pid",
} }
file { "/etc/clarified/remote.d/${name}": file { "/etc/clarified/remote.d/${name}":
@ -198,20 +226,26 @@ define clarified::probe($interface="", $snaplen="65535", $keeptime="100GB",
false => absent, false => absent,
}, },
mode => "0755", mode => "0755",
owner => root, owner => "root",
group => root, group => "root",
content => template("clarified/remote.erb"), content => template("clarified/remote.erb"),
require => File["/etc/clarified/remote.d"], require => File["/var/lib/recorder/${name}"],
notify => Service["clarified-probe"], notify => $remote ? {
true => Service["remote-${name}"],
false => undef,
},
} }
file { "/var/lib/recorder/${name}": service { "remote-${name}":
ensure => directory, ensure => $remote ? {
mode => "0700", true => running,
owner => root, false => stopped,
group => root, },
require => File["/var/lib/recorder"], provider => "base",
before => Service["clarified-probe"], start => "/etc/clarified/remote.d/${name} start",
restart => "/etc/clarified/remote.d/${name} restart",
stop => "pkill -f /var/run/remote/${name}.pid",
status => "pgrep -f /var/run/remote/${name}.pid",
} }
} }