Ottomata has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/325936 )
Change subject: role eventlogging::consumer::files -> eventlogging::analytics::files ...................................................................... role eventlogging::consumer::files -> eventlogging::analytics::files Also comment out duplicate declarations in deprecated eventlogging role. These should now be taken care of by the included role::eventlogging::analytics::server Bug: T152621 Change-Id: I93a663ba59f9be8a29fab61526c370b159bc9c50 --- M manifests/site.pp M modules/role/manifests/eventlogging.pp M modules/role/manifests/eventlogging/analytics/files.pp 3 files changed, 30 insertions(+), 30 deletions(-) Approvals: Ottomata: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/site.pp b/manifests/site.pp index 7e82263..489db04 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1103,7 +1103,7 @@ eventlogging::forwarder, eventlogging::processor, eventlogging::consumer::mysql, - eventlogging::consumer::files, + eventlogging::analytics::files, logging::mediawiki::errors) include standard diff --git a/modules/role/manifests/eventlogging.pp b/modules/role/manifests/eventlogging.pp index 2e44a2f..87446ea 100644 --- a/modules/role/manifests/eventlogging.pp +++ b/modules/role/manifests/eventlogging.pp @@ -28,10 +28,10 @@ # EventLogging for analytics processing is deployed # as the eventlogging/analytics scap target. - eventlogging::deployment::target { 'analytics': } - class { 'eventlogging::server': - eventlogging_path => '/srv/deployment/eventlogging/analytics' - } + # eventlogging::deployment::target { 'analytics': } + # class { 'eventlogging::server': + # eventlogging_path => '/srv/deployment/eventlogging/analytics' + # } # Get the Kafka configuration $kafka_config = kafka_config('analytics') @@ -49,29 +49,29 @@ $kafka_mixed_uri = "${kafka_consumer_scheme}/${kafka_brokers_string}?topic=eventlogging-valid-mixed" $kafka_client_side_raw_uri = "${kafka_consumer_scheme}/${kafka_brokers_string}?topic=eventlogging-client-side" - # This check was written for eventlog1001, so only include it there., - if $::hostname == 'eventlog1001' { - - # Alert when / gets low. (eventlog1001 has a 9.1G /) - nrpe::monitor_service { 'eventlogging_root_disk_space': - description => 'Eventlogging / disk space', - nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 1024M -c 512M -p /', - contact_group => 'analytics', - } - - # Alert when /srv gets low. (eventlog1001 has a 456G /srv) - # Currently, /srv/log/eventlogging grows at about 500kB / s. - # Which is almost 2G / hour. 100G gives us about 2 days to respond, - # 50G gives us about 1 day. Logrotate should keep enough disk space free. - nrpe::monitor_service { 'eventlogging_srv_disk_space': - description => 'Eventlogging /srv disk space', - nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 100000M -c 50000M -p /srv', - contact_group => 'analytics', - } - } - - # make sure any defined eventlogging services are running - class { '::eventlogging::monitoring::jobs': } + # # This check was written for eventlog1001, so only include it there., + # if $::hostname == 'eventlog1001' { + # + # # Alert when / gets low. (eventlog1001 has a 9.1G /) + # nrpe::monitor_service { 'eventlogging_root_disk_space': + # description => 'Eventlogging / disk space', + # nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 1024M -c 512M -p /', + # contact_group => 'analytics', + # } + # + # # Alert when /srv gets low. (eventlog1001 has a 456G /srv) + # # Currently, /srv/log/eventlogging grows at about 500kB / s. + # # Which is almost 2G / hour. 100G gives us about 2 days to respond, + # # 50G gives us about 1 day. Logrotate should keep enough disk space free. + # nrpe::monitor_service { 'eventlogging_srv_disk_space': + # description => 'Eventlogging /srv disk space', + # nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 100000M -c 50000M -p /srv', + # contact_group => 'analytics', + # } + # } + # + # # make sure any defined eventlogging services are running + # class { '::eventlogging::monitoring::jobs': } } diff --git a/modules/role/manifests/eventlogging/analytics/files.pp b/modules/role/manifests/eventlogging/analytics/files.pp index b9b0310..9dabee9 100644 --- a/modules/role/manifests/eventlogging/analytics/files.pp +++ b/modules/role/manifests/eventlogging/analytics/files.pp @@ -1,7 +1,7 @@ # == Class role::eventlogging::analytics::files # Consumes streams of events and writes them to log files. # -class role::eventlogging::analytisc::files { +class role::eventlogging::analytics::files { include role::eventlogging::analytics::server # Log all raw log records and decoded events to flat files in @@ -32,7 +32,7 @@ logrotate::conf { 'eventlogging-files': ensure => 'present', - content => template('eventlogging/analytics/files_logrotate.erb'), + content => template('role/eventlogging/analytics/files_logrotate.erb'), require => [ File[$out_dir], File["${out_dir}/archive"] -- To view, visit https://gerrit.wikimedia.org/r/325936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93a663ba59f9be8a29fab61526c370b159bc9c50 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits