mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2728 from jviersel/master

Browse Source 
Added username support for libvirt over SSH
This commit is contained in:
Neil Lathwood
2016-01-17 17:20:42 +00:00
parent e74a45cdcc a1c5a9dbeb
commit 11363653e8
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS.md
View File

@@ -78,6 +78,7 @@ LibreNMS contributors:
- D. Britz <github@wrind.de> (flatterlight) - D. Britz <github@wrind.de> (flatterlight)
- Tobias Herrmann <tobias@fiveninedigital.ch> (Mightea) - Tobias Herrmann <tobias@fiveninedigital.ch> (Mightea)
- Nicolas Guillaumin <nicolas+github@guillaumin.me> (nguillaumin) - Nicolas Guillaumin <nicolas+github@guillaumin.me> (nguillaumin)
- Jurrian van Iersel <jurrian@vaniersel.net> (jviersel)
[1]: http://observium.org/ "Observium web site" [1]: http://observium.org/ "Observium web site"
Observium was written by: Observium was written by:

1
doc/Support/Configuration.md
View File

@@ -488,6 +488,7 @@ This array can be used to filter out syslog messages that you don't want to be s
```php ```php
$config['enable_libvirt'] = 1; $config['enable_libvirt'] = 1;
$config['libvirt_protocols'] = array("qemu+ssh","xen+ssh"); $config['libvirt_protocols'] = array("qemu+ssh","xen+ssh");
$config['libvirt_username'] = 'root';
``` ```
Enable this to switch on support for libvirt along with `libvirt_protocols` Enable this to switch on support for libvirt along with `libvirt_protocols`
to indicate how you connect to libvirt. You also need to: to indicate how you connect to libvirt. You also need to:

11
includes/discovery/libvirt-vminfo.inc.php
View File

@@ -9,18 +9,23 @@ if ($config['enable_libvirt'] == '1' && $device['os'] == 'linux') {
$ssh_ok = 0; $ssh_ok = 0;
$userHostname = $device['hostname'];
if (isset($config['libvirt_username'])) {
$userHostname = $config['libvirt_username'].'@'.$userHostname;
}
foreach ($config['libvirt_protocols'] as $method) { foreach ($config['libvirt_protocols'] as $method) {
if (strstr($method, 'qemu')) { if (strstr($method, 'qemu')) {
$uri = $method.'://'.$device['hostname'].'/system'; $uri = $method.'://'.$userHostname.'/system';
} }
else { else {
$uri = $method.'://'.$device['hostname']; $uri = $method.'://'.$userHostname;
} }
if (strstr($method, 'ssh') && !$ssh_ok) { if (strstr($method, 'ssh') && !$ssh_ok) {
// Check if we are using SSH if we can log in without password - without blocking the discovery // Check if we are using SSH if we can log in without password - without blocking the discovery
// Also automatically add the host key so discovery doesn't block on the yes/no question, and run echo so we don't get stuck in a remote shell ;-) // Also automatically add the host key so discovery doesn't block on the yes/no question, and run echo so we don't get stuck in a remote shell ;-)
exec('ssh -o "StrictHostKeyChecking no" -o "PreferredAuthentications publickey" -o "IdentitiesOnly yes" '.$device['hostname'].' echo -e', $out, $ret); exec('ssh -o "StrictHostKeyChecking no" -o "PreferredAuthentications publickey" -o "IdentitiesOnly yes" '.$userHostname.' echo -e', $out, $ret);
if ($ret != 255) { if ($ret != 255) {
$ssh_ok = 1; $ssh_ok = 1;
} }