Faidon Liambotis has submitted this change and it was merged.
Change subject: librenms: discovery fixes
......................................................................
librenms: discovery fixes
- Add snmp-mibs-downloader to fetch proprietary MIBs.
- Explicitly set the autodiscovery modules, and disable SNMP scan.
- Switch from poller.php to pollerwrapper.py, per the manual.
- Add html_dir config option to restore icons
Change-Id: Ibbcc781093e04b133f80f712a56a4b1b0071e002
---
M manifests/role/librenms.pp
M modules/librenms/manifests/init.pp
2 files changed, 11 insertions(+), 4 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/librenms.pp b/manifests/role/librenms.pp
index b2e5f06..225188e 100644
--- a/manifests/role/librenms.pp
+++ b/manifests/role/librenms.pp
@@ -19,11 +19,10 @@
$install_dir = '/srv/deployment/librenms/librenms'
$config = {
- 'project_name' => 'Wikimedia NMS',
- 'project_id' => 'librenms',
'title_image' =>
'url(//upload.wikimedia.org/wikipedia/commons/thumb/c/c4/Wikimedia_Foundation_RGB_logo_with_text.svg/100px-Wikimedia_Foundation_RGB_logo_with_text.svg.png)',
'install_dir' => $install_dir,
+ 'html_dir' => "${install_dir}/html",
'rrd_dir' => '/srv/librenms/rrd',
'log_file' => '/var/log/librenms.log',
@@ -34,6 +33,14 @@
'snmp' => {
'community' => [ $passwords::network::snmp_ro_community ],
+ },
+
+ 'nets' => $network::constants::external_networks,
+ 'autodiscovery' => {
+ 'xdp' => true,
+ 'ospf' => true,
+ 'bgp' => false,
+ 'snmpscan' => false,
},
'enable_inventory' => 1,
@@ -52,7 +59,6 @@
},
'auth_mechanism' => 'mysql',
- 'nets' => $network::constants::external_networks,
}
class { '::librenms':
diff --git a/modules/librenms/manifests/init.pp
b/modules/librenms/manifests/init.pp
index ffff8b0..07c3e11 100644
--- a/modules/librenms/manifests/init.pp
+++ b/modules/librenms/manifests/init.pp
@@ -68,6 +68,7 @@
'nmap',
'python-mysqldb',
'rrdtool',
+ 'snmp-mibs-downloader',
'whois',
]:
ensure => present,
@@ -91,7 +92,7 @@
cron { 'librenms-poller-all':
ensure => present,
user => 'librenms',
- command => "${install_dir}/poller.php -h all >> /dev/null 2>&1",
+ command => "/usr/bin/python ${install_dir}/poller-wrapper.py 16 >>
/dev/null 2>&1",
minute => '*/5',
require => User['librenms'],
}
--
To view, visit https://gerrit.wikimedia.org/r/106764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbcc781093e04b133f80f712a56a4b1b0071e002
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
