Dzahn has submitted this change and it was merged.
Change subject: puppet lint: fix "double quoted string containing no variables"
and "quoted boolean value"s
......................................................................
puppet lint: fix "double quoted string containing no variables"
and "quoted boolean value"s
Change-Id: Ie60b011e0fea62cfe76bb356ede9a53127ffc470
---
M manifests/misc/icinga.pp
1 file changed, 225 insertions(+), 225 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/misc/icinga.pp b/manifests/misc/icinga.pp
index 24763f9..f9f6322 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -1,7 +1,7 @@
# misc/icinga.pp
class icinga::user {
- systemuser { 'icinga': name => "icinga", home => "/home/icinga", groups
=> [ "icinga", "dialout", "nagios" ] }
+ systemuser { 'icinga': name => 'icinga', home => '/home/icinga', groups
=> [ 'icinga', 'dialout', 'nagios' ] }
}
class icinga::monitor {
@@ -40,10 +40,10 @@
#It is called master hosts as monitor_host is already
#a service.
- $master_hosts = [ "neon.wikimedia.org", "spence.wikimedia.org" ]
+ $master_hosts = [ 'neon.wikimedia.org', 'spence.wikimedia.org' ]
- $icinga_config_dir = "/etc/icinga"
- $nagios_config_dir = "/etc/nagios"
+ $icinga_config_dir = '/etc/icinga'
+ $nagios_config_dir = '/etc/nagios'
# puppet_hosts.cfg must be first
$puppet_files = [
@@ -66,7 +66,7 @@
}
class icinga::monitor::apache {
- class {"webserver::php5": ssl => "true";}
+ class {'webserver::php5': ssl => true;}
include webserver::php5-gd
@@ -74,31 +74,31 @@
$proxypass = $passwords::ldap::wmf_cluster::proxypass
file {
- "/usr/share/icinga/htdocs/images/logos/ubuntu.png":
- source => "puppet:///files/icinga/ubuntu.png",
+ '/usr/share/icinga/htdocs/images/logos/ubuntu.png':
+ source => 'puppet:///files/icinga/ubuntu.png',
owner => 'root',
group => 'root',
mode => '0644';
# install the icinga Apache site
- "/etc/apache2/sites-available/icinga.wikimedia.org":
+ '/etc/apache2/sites-available/icinga.wikimedia.org':
ensure => present,
owner => 'root',
group => 'root',
mode => '0444',
- content =>
template("apache/sites/icinga.wikimedia.org.erb");
+ content =>
template('apache/sites/icinga.wikimedia.org.erb');
}
# remove icinga default config
- file { "/etc/icinga/apache2.conf":
+ file { '/etc/icinga/apache2.conf':
ensure => absent;
- "/etc/apache2/conf.d/icinga.conf":
+ '/etc/apache2/conf.d/icinga.conf':
ensure => absent;
}
- apache_site { 'icinga': name => "icinga.wikimedia.org" }
- install_certificate{ "star.wikimedia.org": }
+ apache_site { 'icinga': name => 'icinga.wikimedia.org' }
+ install_certificate{ 'star.wikimedia.org': }
}
@@ -106,19 +106,19 @@
require icinga::monitor::packages
- file {"/usr/lib/nagios/plugins/check_to_check_nagios_paging":
- source => "puppet:///files/nagios/check_to_check_nagios_paging",
+ file {'/usr/lib/nagios/plugins/check_to_check_nagios_paging':
+ source => 'puppet:///files/nagios/check_to_check_nagios_paging',
owner => 'root',
group => 'root',
mode => '0755';
}
- monitor_service { "check_to_check_nagios_paging":
- description => "check_to_check_nagios_paging",
- check_command => "check_to_check_nagios_paging",
+ monitor_service { 'check_to_check_nagios_paging':
+ description => 'check_to_check_nagios_paging',
+ check_command => 'check_to_check_nagios_paging',
normal_check_interval => 1,
retry_check_interval => 1,
- contact_group => "pager_testing",
- critical => "false"
+ contact_group => 'pager_testing',
+ critical => false
}
}
@@ -134,26 +134,26 @@
# Icinga configuration files
- file { "/etc/icinga/cgi.cfg":
- source => "puppet:///files/icinga/cgi.cfg",
+ file { '/etc/icinga/cgi.cfg':
+ source => 'puppet:///files/icinga/cgi.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/icinga.cfg":
- source => "puppet:///files/icinga/icinga.cfg",
+ '/etc/icinga/icinga.cfg':
+ source => 'puppet:///files/icinga/icinga.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/nsca_payments.cfg":
- source => "puppet:///private/nagios/nsca_payments.cfg",
+ '/etc/icinga/nsca_payments.cfg':
+ source => 'puppet:///private/nagios/nsca_payments.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/htpasswd.users":
- source => "puppet:///private/nagios/htpasswd.users",
+ '/etc/icinga/htpasswd.users':
+ source => 'puppet:///private/nagios/htpasswd.users',
owner => 'root',
group => 'root',
mode => '0644';
@@ -161,50 +161,50 @@
# TEMP: analytics eqiad cluster manual entries.
# These will be removed from this manually managed file
# once analytics puppetization goes to production.
- "/etc/icinga/analytics.cfg":
- content => template("icinga/analytics.cfg.erb"),
+ '/etc/icinga/analytics.cfg':
+ content => template('icinga/analytics.cfg.erb'),
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/checkcommands.cfg":
- content => template("icinga/checkcommands.cfg.erb"),
+ '/etc/icinga/checkcommands.cfg':
+ content => template('icinga/checkcommands.cfg.erb'),
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/contactgroups.cfg":
- source => "puppet:///files/nagios/contactgroups.cfg",
+ '/etc/icinga/contactgroups.cfg':
+ source => 'puppet:///files/nagios/contactgroups.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/contacts.cfg":
- source => "puppet:///private/nagios/contacts.cfg",
+ '/etc/icinga/contacts.cfg':
+ source => 'puppet:///private/nagios/contacts.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/misccommands.cfg":
- source => "puppet:///files/icinga/misccommands.cfg",
+ '/etc/icinga/misccommands.cfg':
+ source => 'puppet:///files/icinga/misccommands.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/resource.cfg":
- source => "puppet:///files/icinga/resource.cfg",
+ '/etc/icinga/resource.cfg':
+ source => 'puppet:///files/icinga/resource.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/timeperiods.cfg":
- source => "puppet:///files/nagios/timeperiods.cfg",
+ '/etc/icinga/timeperiods.cfg':
+ source => 'puppet:///files/nagios/timeperiods.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/init.d/icinga":
- source => "puppet:///files/icinga/icinga-init",
+ '/etc/init.d/icinga':
+ source => 'puppet:///files/icinga/icinga-init',
owner => 'root',
group => 'root',
mode => '0755';
@@ -216,39 +216,39 @@
# Must be loaded last
file {
- "/etc/icinga/conf.d":
+ '/etc/icinga/conf.d':
owner => 'root',
group => 'root',
mode => '0755',
ensure => directory;
- "/etc/nagios":
+ '/etc/nagios':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755';
- "/var/cache/icinga":
+ '/var/cache/icinga':
ensure => directory,
owner => 'icinga',
group => 'www-data',
mode => '0775';
- "/var/lib/nagios/rw":
+ '/var/lib/nagios/rw':
ensure => directory,
owner => 'icinga',
group => 'nagios',
mode => '0777';
- "/var/lib/icinga":
+ '/var/lib/icinga':
ensure => directory,
owner => 'icinga',
group => 'www-data',
mode => '0755';
# Script to purge resources for non-existent hosts
- "/usr/local/sbin/purge-nagios-resources.py":
- source =>
"puppet:///files/nagios/purge-nagios-resources.py",
+ '/usr/local/sbin/purge-nagios-resources.py':
+ source =>
'puppet:///files/nagios/purge-nagios-resources.py',
owner => 'root',
group => 'root',
mode => '0755';
@@ -256,20 +256,20 @@
# fix permissions on all individual service files
exec {
- "fix_nagios_perms":
- command => "/bin/chmod -R a+r /etc/nagios";
+ 'fix_nagios_perms':
+ command => '/bin/chmod -R a+r /etc/nagios';
- "fix_icinga_perms":
- command => "/bin/chmod -R a+r /etc/icinga";
+ 'fix_icinga_perms':
+ command => '/bin/chmod -R a+r /etc/icinga';
- "fix_icinga_temp_files":
- command => "/bin/chown -R icinga /var/lib/icinga";
+ 'fix_icinga_temp_files':
+ command => '/bin/chown -R icinga /var/lib/icinga';
- "fix_nagios_plugins_files":
- command => "/bin/chmod -R a+w /var/lib/nagios";
+ 'fix_nagios_plugins_files':
+ command => '/bin/chmod -R a+w /var/lib/nagios';
- "fix_icinga_command_file":
- command => "/bin/chmod a+rw
/var/lib/nagios/rw/nagios.cmd";
+ 'fix_icinga_command_file':
+ command => '/bin/chmod a+rw
/var/lib/nagios/rw/nagios.cmd';
}
}
@@ -278,242 +278,242 @@
require icinga::monitor::packages
file {
- "/usr/lib/nagios":
+ '/usr/lib/nagios':
owner => 'root',
group => 'root',
mode => '0755',
ensure => directory;
- "/usr/lib/nagios/plugins":
+ '/usr/lib/nagios/plugins':
owner => 'root',
group => 'root',
mode => '0755',
ensure => directory;
- "/usr/lib/nagios/plugins/eventhandlers":
+ '/usr/lib/nagios/plugins/eventhandlers':
owner => 'root',
group => 'root',
mode => '0755',
ensure => directory;
- "/usr/lib/nagios/plugins/eventhandlers/submit_check_result":
- source => "puppet:///files/icinga/submit_check_result",
+ '/usr/lib/nagios/plugins/eventhandlers/submit_check_result':
+ source => 'puppet:///files/icinga/submit_check_result',
owner => 'root',
group => 'root',
mode => '0755';
- "/var/lib/nagios/rm":
+ '/var/lib/nagios/rm':
owner => icinga,
group => nagios,
mode => '0775',
ensure => directory;
- "/etc/nagios-plugins":
+ '/etc/nagios-plugins':
owner => 'root',
group => 'root',
mode => '0755',
ensure => directory;
- "/etc/nagios-plugins/config":
+ '/etc/nagios-plugins/config':
owner => 'root',
group => 'root',
mode => '0755',
ensure => directory;
- "/etc/nagios-plugins/config/apt.cfg":
- source =>
"puppet:///files/icinga/plugin-config/apt.cfg",
+ '/etc/nagios-plugins/config/apt.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/apt.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/breeze.cfg":
- source =>
"puppet:///files/icinga/plugin-config/breeze.cfg",
+ '/etc/nagios-plugins/config/breeze.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/breeze.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/dhcp.cfg":
- source =>
"puppet:///files/icinga/plugin-config/dhcp.cfg",
+ '/etc/nagios-plugins/config/dhcp.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/dhcp.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/disk-smb.cfg":
- source =>
"puppet:///files/icinga/plugin-config/disk-smb.cfg",
+ '/etc/nagios-plugins/config/disk-smb.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/disk-smb.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/disk.cfg":
- source =>
"puppet:///files/icinga/plugin-config/disk.cfg",
+ '/etc/nagios-plugins/config/disk.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/disk.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/dns.cfg":
- source =>
"puppet:///files/icinga/plugin-config/dns.cfg",
+ '/etc/nagios-plugins/config/dns.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/dns.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/dummy.cfg":
- source =>
"puppet:///files/icinga/plugin-config/dummy.cfg",
+ '/etc/nagios-plugins/config/dummy.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/dummy.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/flexlm.cfg":
- source =>
"puppet:///files/icinga/plugin-config/flexlm.cfg",
+ '/etc/nagios-plugins/config/flexlm.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/flexlm.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/ftp.cfg":
- source =>
"puppet:///files/icinga/plugin-config/ftp.cfg",
+ '/etc/nagios-plugins/config/ftp.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/ftp.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/hppjd.cfg":
- source =>
"puppet:///files/icinga/plugin-config/hppjd.cfg",
+ '/etc/nagios-plugins/config/hppjd.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/hppjd.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/http.cfg":
- source =>
"puppet:///files/icinga/plugin-config/http.cfg",
+ '/etc/nagios-plugins/config/http.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/http.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/ifstatus.cfg":
- source =>
"puppet:///files/icinga/plugin-config/ifstatus.cfg",
+ '/etc/nagios-plugins/config/ifstatus.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/ifstatus.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/ldap.cfg":
- source =>
"puppet:///files/icinga/plugin-config/ldap.cfg",
+ '/etc/nagios-plugins/config/ldap.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/ldap.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/load.cfg":
- source =>
"puppet:///files/icinga/plugin-config/load.cfg",
+ '/etc/nagios-plugins/config/load.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/load.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/mail.cfg":
- source =>
"puppet:///files/icinga/plugin-config/mail.cfg",
+ '/etc/nagios-plugins/config/mail.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/mail.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/mrtg.cfg":
- source =>
"puppet:///files/icinga/plugin-config/mrtg.cfg",
+ '/etc/nagios-plugins/config/mrtg.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/mrtg.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/mysql.cfg":
- source =>
"puppet:///files/icinga/plugin-config/mysql.cfg",
+ '/etc/nagios-plugins/config/mysql.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/mysql.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/netware.cfg":
- source =>
"puppet:///files/icinga/plugin-config/netware.cfg",
+ '/etc/nagios-plugins/config/netware.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/netware.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/news.cfg":
- source =>
"puppet:///files/icinga/plugin-config/news.cfg",
+ '/etc/nagios-plugins/config/news.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/news.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/nt.cfg":
- source => "puppet:///files/icinga/plugin-config/nt.cfg",
+ '/etc/nagios-plugins/config/nt.cfg':
+ source => 'puppet:///files/icinga/plugin-config/nt.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/ntp.cfg":
- source =>
"puppet:///files/icinga/plugin-config/ntp.cfg",
+ '/etc/nagios-plugins/config/ntp.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/ntp.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/pgsql.cfg":
- source =>
"puppet:///files/icinga/plugin-config/pgsql.cfg",
+ '/etc/nagios-plugins/config/pgsql.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/pgsql.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/ping.cfg":
- source =>
"puppet:///files/icinga/plugin-config/ping.cfg",
+ '/etc/nagios-plugins/config/ping.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/ping.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/procs.cfg":
- source =>
"puppet:///files/icinga/plugin-config/procs.cfg",
+ '/etc/nagios-plugins/config/procs.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/procs.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/radius.cfg":
- source =>
"puppet:///files/icinga/plugin-config/radius.cfg",
+ '/etc/nagios-plugins/config/radius.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/radius.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/real.cfg":
- source =>
"puppet:///files/icinga/plugin-config/real.cfg",
+ '/etc/nagios-plugins/config/real.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/real.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/rpc-nfs.cfg":
- source =>
"puppet:///files/icinga/plugin-config/rpc-nfs.cfg",
+ '/etc/nagios-plugins/config/rpc-nfs.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/rpc-nfs.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/snmp.cfg":
- source =>
"puppet:///files/icinga/plugin-config/snmp.cfg",
+ '/etc/nagios-plugins/config/snmp.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/snmp.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/ssh.cfg":
- source =>
"puppet:///files/icinga/plugin-config/ssh.cfg",
+ '/etc/nagios-plugins/config/ssh.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/ssh.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/tcp_udp.cfg":
- source =>
"puppet:///files/icinga/plugin-config/tcp_udp.cfg",
+ '/etc/nagios-plugins/config/tcp_udp.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/tcp_udp.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/telnet.cfg":
- source =>
"puppet:///files/icinga/plugin-config/telnet.cfg",
+ '/etc/nagios-plugins/config/telnet.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/telnet.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/users.cfg":
- source =>
"puppet:///files/icinga/plugin-config/users.cfg",
+ '/etc/nagios-plugins/config/users.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/users.cfg',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/nagios-plugins/config/vsz.cfg":
- source =>
"puppet:///files/icinga/plugin-config/vsz.cfg",
+ '/etc/nagios-plugins/config/vsz.cfg':
+ source =>
'puppet:///files/icinga/plugin-config/vsz.cfg',
owner => 'root',
group => 'root',
mode => '0644';
@@ -521,53 +521,53 @@
# WMF custom service checks
file {
- "/usr/lib/nagios/plugins/check_mysql-replication.pl":
- source =>
"puppet:///files/icinga/check_mysql-replication.pl",
+ '/usr/lib/nagios/plugins/check_mysql-replication.pl':
+ source =>
'puppet:///files/icinga/check_mysql-replication.pl',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_cert":
+ '/usr/lib/nagios/plugins/check_cert':
owner => 'root',
group => 'root',
mode => '0755',
- source => "puppet:///files/icinga/check_cert";
- "/usr/lib/nagios/plugins/check_all_memcached.php":
- source =>
"puppet:///files/icinga/check_all_memcached.php",
+ source => 'puppet:///files/icinga/check_cert';
+ '/usr/lib/nagios/plugins/check_all_memcached.php':
+ source =>
'puppet:///files/icinga/check_all_memcached.php',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_bad_apaches":
- source => "puppet:///files/icinga/check_bad_apaches",
+ '/usr/lib/nagios/plugins/check_bad_apaches':
+ source => 'puppet:///files/icinga/check_bad_apaches',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_longqueries":
- source => "puppet:///files/icinga/check_longqueries",
+ '/usr/lib/nagios/plugins/check_longqueries':
+ source => 'puppet:///files/icinga/check_longqueries',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_MySQL.php":
- source => "puppet:///files/icinga/check_MySQL.php",
+ '/usr/lib/nagios/plugins/check_MySQL.php':
+ source => 'puppet:///files/icinga/check_MySQL.php',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_solr":
- source => "puppet:///files/icinga/check_solr",
+ '/usr/lib/nagios/plugins/check_solr':
+ source => 'puppet:///files/icinga/check_solr',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check-ssl-cert":
- source => "puppet:///files/icinga/check-ssl-cert",
+ '/usr/lib/nagios/plugins/check-ssl-cert':
+ source => 'puppet:///files/icinga/check-ssl-cert',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_stomp.pl":
- source => "puppet:///files/icinga/check_stomp.pl",
+ '/usr/lib/nagios/plugins/check_stomp.pl':
+ source => 'puppet:///files/icinga/check_stomp.pl',
owner => 'root',
group => 'root',
mode => '0755';
- "/usr/lib/nagios/plugins/check_nrpe":
- source => "puppet:///files/icinga/check_nrpe",
+ '/usr/lib/nagios/plugins/check_nrpe':
+ source => 'puppet:///files/icinga/check_nrpe',
owner => 'root',
group => 'root',
mode => '0755';
@@ -576,7 +576,7 @@
# some default configuration files conflict and should be removed
file {
- "/etc/nagios-plugins/config/mailq.cfg":
+ '/etc/nagios-plugins/config/mailq.cfg':
ensure => absent;
}
@@ -590,64 +590,64 @@
class iptables-purges {
- require "iptables::tables"
- iptables_purge_service{ "deny_pub_snmptrap": service =>
"snmptrap" }
- iptables_purge_service{ "deny_pub_nsca": service => "nsca" }
+ require 'iptables::tables'
+ iptables_purge_service{ 'deny_pub_snmptrap': service =>
'snmptrap' }
+ iptables_purge_service{ 'deny_pub_nsca': service => 'nsca' }
}
class iptables-accepts {
- require "icinga::monitor::firewall::iptables-purges"
+ require 'icinga::monitor::firewall::iptables-purges'
- iptables_add_service{ "lo_all": interface => "lo", service =>
"all", jump => "ACCEPT" }
- iptables_add_service{ "localhost_all": source => "127.0.0.1",
service => "all", jump => "ACCEPT" }
- iptables_add_service{ "private_pmtpa_nolabs": source =>
"10.0.0.0/14", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "private_esams": source =>
"10.21.0.0/24", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "private_eqiad1": source =>
"10.64.0.0/17", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "private_eqiad2": source =>
"10.65.0.0/20", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "private_virt": source => "10.4.16.0/24",
service => "all", jump => "ACCEPT" }
- iptables_add_service{ "public_152": source =>
"208.80.152.0/24", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "public_153": source =>
"208.80.153.128/26", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "public_154": source =>
"208.80.154.0/24", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "public_fundraising": source =>
"208.80.155.0/27", service => "all", jump => "ACCEPT" }
- iptables_add_service{ "public_esams": source =>
"91.198.174.0/25", service => "all", jump => "ACCEPT" }
+ iptables_add_service{ 'lo_all': interface => 'lo', service =>
'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'localhost_all': source => '127.0.0.1',
service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'private_pmtpa_nolabs': source =>
'10.0.0.0/14', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'private_esams': source =>
'10.21.0.0/24', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'private_eqiad1': source =>
'10.64.0.0/17', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'private_eqiad2': source =>
'10.65.0.0/20', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'private_virt': source => '10.4.16.0/24',
service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'public_152': source =>
'208.80.152.0/24', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'public_153': source =>
'208.80.153.128/26', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'public_154': source =>
'208.80.154.0/24', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'public_fundraising': source =>
'208.80.155.0/27', service => 'all', jump => 'ACCEPT' }
+ iptables_add_service{ 'public_esams': source =>
'91.198.174.0/25', service => 'all', jump => 'ACCEPT' }
}
class iptables-drops {
- require "icinga::monitor::firewall::iptables-accepts"
- iptables_add_service{ "deny_pub_nsca": service => "nsca", jump
=> "DROP" }
- iptables_add_service{ "deny_pub_snmptrap": service =>
"snmptrap", jump => "DROP" }
- iptables_add_service{ "TEMP_deny_smtp": service => "smtp", jump
=> "DROP" }
+ require 'icinga::monitor::firewall::iptables-accepts'
+ iptables_add_service{ 'deny_pub_nsca': service => 'nsca', jump
=> 'DROP' }
+ iptables_add_service{ 'deny_pub_snmptrap': service =>
'snmptrap', jump => 'DROP' }
+ iptables_add_service{ 'TEMP_deny_smtp': service => 'smtp', jump
=> 'DROP' }
}
class iptables {
- require "icinga::monitor::firewall::iptables-drops"
- iptables_add_exec{ "${hostname}_nsca": service => "nsca" }
- iptables_add_exec{ "${hostname}_snmptrap": service =>
"snmptrap" }
+ require 'icinga::monitor::firewall::iptables-drops'
+ iptables_add_exec{ "${hostname}_nsca": service => 'nsca' }
+ iptables_add_exec{ "${hostname}_snmptrap": service =>
'snmptrap' }
}
- require "icinga::monitor::firewall::iptables"
+ require 'icinga::monitor::firewall::iptables'
}
class icinga::monitor::jobqueue {
include icinga::monitor::packages
include applicationserver::packages
- file {"/usr/lib/nagios/plugins/check_job_queue":
- source => "puppet:///files/nagios/check_job_queue",
+ file {'/usr/lib/nagios/plugins/check_job_queue':
+ source => 'puppet:///files/nagios/check_job_queue',
owner => 'root',
group => 'root',
mode => '0755';
}
- monitor_service { "check_job_queue":
- description => "check_job_queue",
- check_command => "check_job_queue",
+ monitor_service { 'check_job_queue':
+ description => 'check_job_queue',
+ check_command => 'check_job_queue',
normal_check_interval => 15,
retry_check_interval => 5,
- critical => "false"
+ critical => false
}
}
@@ -658,19 +658,19 @@
require icinga::monitor::packages
file {
- "/etc/icinga/puppet_hosts.cfg":
+ '/etc/icinga/puppet_hosts.cfg':
content => generate('/usr/local/bin/naggen',
'--stdout', '--type', 'host'),
backup => false,
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/puppet_services.cfg":
+ '/etc/icinga/puppet_services.cfg':
content => generate('/usr/local/bin/naggen',
'--stdout', '--type', 'service'),
backup => false,
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/icinga/puppet_hostextinfo.cfg":
+ '/etc/icinga/puppet_hostextinfo.cfg':
content => generate('/usr/local/bin/naggen',
'--stdout', '--type', 'hostextinfo'),
backup => false,
owner => 'root',
@@ -692,7 +692,7 @@
Monitor_host <| |> {
notify => Service[icinga],
}
- Monitor_service <| tag != "nrpe" |> {
+ Monitor_service <| tag != 'nrpe' |> {
notify => Service[icinga],
}
@@ -704,7 +704,7 @@
# package contains daemon and client script
class icinga::nsca {
- package { "nsca":
+ package { 'nsca':
ensure => latest;
}
@@ -713,17 +713,17 @@
# NSCA - daemon config
class icinga::monitor::nsca::daemon {
- system_role { "icinga::nsca::daemon": description => "Nagios Service
Checks Acceptor Daemon" }
+ system_role { 'icinga::nsca::daemon': description => 'Nagios Service
Checks Acceptor Daemon' }
require icinga::nsca
- file { "/etc/nsca.cfg":
- source => "puppet:///private/icinga/nsca.cfg",
+ file { '/etc/nsca.cfg':
+ source => 'puppet:///private/icinga/nsca.cfg',
owner => 'root',
mode => '0400';
}
- service { "nsca":
+ service { 'nsca':
ensure => running;
}
}
@@ -738,7 +738,7 @@
}
# Stomp Perl module to monitor erzurumi (RT #703)
- package { "libnet-stomp-perl":
+ package { 'libnet-stomp-perl':
ensure => latest;
}
}
@@ -747,41 +747,41 @@
require icinga::monitor::apache
- service { "icinga":
+ service { 'icinga':
ensure => running,
hasstatus => false,
subscribe => [
File[$icinga::monitor::configuration::variables::puppet_files],
File[$icinga::monitor::configuration::variables::static_files],
- File["/etc/icinga/puppet_services.cfg"],
- File["/etc/icinga/puppet_hostextinfo.cfg"],
- File["/etc/icinga/puppet_hosts.cfg"]];
+ File['/etc/icinga/puppet_services.cfg'],
+ File['/etc/icinga/puppet_hostextinfo.cfg'],
+ File['/etc/icinga/puppet_hosts.cfg']];
}
}
class icinga::monitor::snmp {
- file { "/etc/snmp/snmptrapd.conf":
- source => "puppet:///files/snmp/snmptrapd.conf.icinga",
+ file { '/etc/snmp/snmptrapd.conf':
+ source => 'puppet:///files/snmp/snmptrapd.conf.icinga',
owner => 'root',
group => 'root',
mode => '0600';
- "/etc/snmp/snmptt.conf":
- source => "puppet:///files/snmp/snmptt.conf.icinga",
+ '/etc/snmp/snmptt.conf':
+ source => 'puppet:///files/snmp/snmptt.conf.icinga',
owner => 'root',
group => 'root',
mode => '0644';
- "/etc/init.d/snmptt":
- source => "puppet:///files/snmp/snmptt.init",
+ '/etc/init.d/snmptt':
+ source => 'puppet:///files/snmp/snmptt.init',
owner => 'root',
group => 'root',
mode => '0755';
- "/etc/init.d/snmptrapd":
- source => "puppet:///files/snmp/snmptrapd.init",
+ '/etc/init.d/snmptrapd':
+ source => 'puppet:///files/snmp/snmptrapd.init',
owner => 'root',
group => 'root',
mode => '0755';
- "/etc/init.d/snmpd":
- source => "puppet:///files/snmp/snmpd.init",
+ '/etc/init.d/snmpd':
+ source => 'puppet:///files/snmp/snmpd.init',
owner => 'root',
group => 'root',
mode => '0755';
@@ -802,27 +802,27 @@
ensure => running,
hasstatus => false,
hasrestart => true,
- subscribe => [ File["/etc/snmp/snmptt.conf"],
- File["/etc/init.d/snmptt"],
- File["/etc/snmp/snmptrapd.conf"]];
+ subscribe => [ File['/etc/snmp/snmptt.conf'],
+ File['/etc/init.d/snmptt'],
+ File['/etc/snmp/snmptrapd.conf']];
}
service { 'snmptrapd':
ensure => running,
hasstatus => false,
- subscribe => [ File["/etc/init.d/snmptrapd"],
- File["/etc/snmp/snmptrapd.conf"]];
+ subscribe => [ File['/etc/init.d/snmptrapd'],
+ File['/etc/snmp/snmptrapd.conf']];
}
service { 'snmpd':
ensure => running,
hasstatus => false,
- subscribe => File["/etc/init.d/snmpd"];
+ subscribe => File['/etc/init.d/snmpd'];
}
# FIXME: smptt crashes periodically on precise
- cron { "restart_snmptt":
- command => "service snmptt restart 2>&1",
+ cron { 'restart_snmptt':
+ command => 'service snmptt restart 2>&1',
user => root,
hour => [0, 4, 8, 12, 16, 20],
minute => 7,
@@ -835,16 +835,16 @@
include generic::mysql::packages::client,
ganglia::collector
- package { "ganglios":
+ package { 'ganglios':
ensure => latest;
}
- cron { "ganglios-cron":
- command => "test -w /var/log/ganglia/ganglia_parser.log &&
/usr/sbin/ganglia_parser",
+ cron { 'ganglios-cron':
+ command => 'test -w /var/log/ganglia/ganglia_parser.log &&
/usr/sbin/ganglia_parser',
user => icinga,
- minute => "*/2",
+ minute => '*/2',
ensure => present;
}
- file { "/var/lib/ganglia/xmlcache":
+ file { '/var/lib/ganglia/xmlcache':
ensure => directory,
mode => '0755',
owner => icinga;
@@ -853,5 +853,5 @@
# global monitoring groups - formerly misc/nagios.pp
-@monitor_group { "misc_eqiad": description => "eqiad misc servers" }
-@monitor_group { "misc_pmtpa": description => "pmtpa misc servers" }
+@monitor_group { 'misc_eqiad': description => 'eqiad misc servers' }
+@monitor_group { 'misc_pmtpa': description => 'pmtpa misc servers' }
--
To view, visit https://gerrit.wikimedia.org/r/54609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie60b011e0fea62cfe76bb356ede9a53127ffc470
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Lcarr <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
