[MediaWiki-commits] [Gerrit] operations/puppet[production]: icinga: Linting fixes

[Juniorsys (Code Review)]

Juniorsys has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/334286 )

Change subject: icinga: Linting fixes
......................................................................

icinga: Linting fixes

Use full names for class names, as relative names are not allowed in
future Puppet versions

Add trailing commas to abide by the Coding Style guidelines

Bug: T93645
Change-Id: I90a1f30ce6b5f9eb9db317dfbbc8dc6650b158a6
---
M modules/icinga/manifests/event_handlers/raid.pp
M modules/icinga/manifests/init.pp
M modules/icinga/manifests/naggen.pp
M modules/icinga/manifests/plugins.pp
M modules/icinga/manifests/web.pp
5 files changed, 15 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/334286/1

diff --git a/modules/icinga/manifests/event_handlers/raid.pp 
b/modules/icinga/manifests/event_handlers/raid.pp
index 7222490..ed0c82f 100644
--- a/modules/icinga/manifests/event_handlers/raid.pp
+++ b/modules/icinga/manifests/event_handlers/raid.pp
@@ -2,7 +2,7 @@
 #
 # Sets up icinga RAID event handler
 class icinga::event_handlers::raid {
-    include passwords::phabricator
+    include ::passwords::phabricator
 
     class { '::phabricator::bot':
         username => 'ops-monitoring-bot',
diff --git a/modules/icinga/manifests/init.pp b/modules/icinga/manifests/init.pp
index 160327d..9d141ee 100644
--- a/modules/icinga/manifests/init.pp
+++ b/modules/icinga/manifests/init.pp
@@ -14,7 +14,7 @@
 ) {
     # Setup icinga user
     # FIXME: This should be done by the package
-    include icinga::group
+    include ::icinga::group
 
     group { 'icinga':
         ensure => present,
@@ -73,22 +73,22 @@
         notify  => Service['icinga'],
     }
 
-    class { 'nagios_common::contactgroups':
+    class { '::nagios_common::contactgroups':
         source  => 'puppet:///modules/nagios_common/contactgroups.cfg',
         require => Package['icinga'],
         notify  => Service['icinga'],
     }
 
-    class { 'nagios_common::contacts':
+    class { '::nagios_common::contacts':
         content => secret('nagios/contacts.cfg'),
         require => Package['icinga'],
         notify  => Service['icinga'],
     }
 
     class { [
-      'nagios_common::user_macros',
-      'nagios_common::timeperiods',
-      'nagios_common::notification_commands',
+      '::nagios_common::user_macros',
+      '::nagios_common::timeperiods',
+      '::nagios_common::notification_commands',
     ] :
         require => Package['icinga'],
         notify  => Service['icinga'],
@@ -101,7 +101,7 @@
     }
 
     # Setup all plugins!
-    class { 'icinga::plugins':
+    class { '::icinga::plugins':
         require => Package['icinga'],
         notify  => Service['icinga'],
     }
diff --git a/modules/icinga/manifests/naggen.pp 
b/modules/icinga/manifests/naggen.pp
index 74fb45c..1897c01 100644
--- a/modules/icinga/manifests/naggen.pp
+++ b/modules/icinga/manifests/naggen.pp
@@ -3,7 +3,7 @@
 # Runs naggen2 to generate hosts, service and hostext config
 # from exported puppet resources
 class icinga::naggen {
-    include icinga
+    include ::icinga
     $dbarg = $::use_puppetdb ? {
         true    => '--puppetdb',
         default => '--activerecord',
diff --git a/modules/icinga/manifests/plugins.pp 
b/modules/icinga/manifests/plugins.pp
index e8b4b9a..2571321 100644
--- a/modules/icinga/manifests/plugins.pp
+++ b/modules/icinga/manifests/plugins.pp
@@ -118,12 +118,12 @@
     }
 
     class { [
-        'nagios_common::commands',
-        'nagios_common::check::redis',
+        '::nagios_common::commands',
+        '::nagios_common::check::redis',
     ] :
     }
 
-    include passwords::nagios::mysql
+    include ::passwords::nagios::mysql
 
     $nagios_mysql_check_pass = $passwords::nagios::mysql::mysql_check_pass
 
@@ -184,5 +184,5 @@
     }
 
     # Include check_elasticsearch from elasticsearch module
-    include elasticsearch::nagios::plugin
+    include ::elasticsearch::nagios::plugin
 }
diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index cf0197c..d034617 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -3,7 +3,7 @@
 # Sets up an apache instance for icinga web interface,
 # protected with ldap authentication
 class icinga::web {
-    include icinga
+    include ::icinga
 
     # Apparently required for the web interface
     package { 'icinga-doc':
@@ -26,7 +26,7 @@
 
     require_package('php5-gd')
 
-    include passwords::ldap::wmf_cluster
+    include ::passwords::ldap::wmf_cluster
     $proxypass = $passwords::ldap::wmf_cluster::proxypass
 
     file { '/usr/share/icinga/htdocs/images/logos/ubuntu.png':

-- 
To view, visit https://gerrit.wikimedia.org/r/334286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I90a1f30ce6b5f9eb9db317dfbbc8dc6650b158a6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits