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 #791 from paulgear/master

Browse Source 
Add proxy support for callback stats
This commit is contained in:
Daniel Preussker
2015-04-13 10:15:49 +00:00
parent b4bae93b9f cd70aecc97
commit a415c77882
3 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
callback.php
View File

@@ -16,7 +16,7 @@ $enabled = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'enabled'"
if ($enabled == 1) { if ($enabled == 1) {
if (dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'") == '') { if (dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'") == '') {
dbInsert(array('name'=>'uuid','value'=>guidv4(openssl_random_pseudo_bytes(16))),'callback'); dbInsert(array('name'=>'uuid','value'=>guidv4(openssl_random_pseudo_bytes(16))), 'callback');
} }
$uuid = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'"); $uuid = dbFetchCell("SELECT `value` FROM `callback` WHERE `name` = 'uuid'");
@@ -72,12 +72,13 @@ if ($enabled == 1) {
$submit = array('data'=>$data); $submit = array('data'=>$data);
$fields = ''; $fields = '';
foreach($submit as $key => $value) { foreach ($submit as $key => $value) {
$fields .= $key . '=' . $value . '&'; $fields .= $key . '=' . $value . '&';
} }
rtrim($fields, '&'); rtrim($fields, '&');
$post = curl_init(); $post = curl_init();
set_curl_proxy($post);
curl_setopt($post, CURLOPT_URL, $config['callback_post']); curl_setopt($post, CURLOPT_URL, $config['callback_post']);
curl_setopt($post, CURLOPT_POST, count($submit)); curl_setopt($post, CURLOPT_POST, count($submit));
curl_setopt($post, CURLOPT_POSTFIELDS, $fields); curl_setopt($post, CURLOPT_POSTFIELDS, $fields);
@@ -89,12 +90,13 @@ if ($enabled == 1) {
$fields = "uuid=$uuid"; $fields = "uuid=$uuid";
$clear = curl_init(); $clear = curl_init();
set_curl_proxy($clear);
curl_setopt($clear, CURLOPT_URL, $config['callback_clear']); curl_setopt($clear, CURLOPT_URL, $config['callback_clear']);
curl_setopt($clear, CURLOPT_POST, count($clear)); curl_setopt($clear, CURLOPT_POST, count($clear));
curl_setopt($clear, CURLOPT_POSTFIELDS, $fields); curl_setopt($clear, CURLOPT_POSTFIELDS, $fields);
curl_setopt($clear, CURLOPT_RETURNTRANSFER, 1); curl_setopt($clear, CURLOPT_RETURNTRANSFER, 1);
$result = curl_exec($clear); $result = curl_exec($clear);
dbDelete('callback','`name`="uuid"',array()); dbDelete('callback', '`name`="uuid"', array());
dbUpdate(array('value' => '0'), 'callback', '`name` = "enabled"', array()); dbUpdate(array('value' => '0'), 'callback', '`name` = "enabled"', array());
} }

3
config.php.default
View File

@@ -41,3 +41,6 @@ $config['auth_mechanism'] = "mysql"; # default, other options: ldap, http-auth
$config['poller-wrapper']['alerter'] = FALSE; $config['poller-wrapper']['alerter'] = FALSE;
# Uncomment the next line to disable daily updates # Uncomment the next line to disable daily updates
#$config['update'] = 0; #$config['update'] = 0;
# Uncomment to submit callback stats via proxy
#$config['callback_proxy'] = "hostname:port";

15
includes/functions.php
View File

@@ -1140,4 +1140,17 @@ function guidv4($data) {
return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4)); return vsprintf('%s%s-%s-%s-%s-%s%s%s', str_split(bin2hex($data), 4));
} }
?> function set_curl_proxy($post)
{
global $config;
if (isset($_ENV['https_proxy'])) {
$tmp = rtrim($_ENV['https_proxy'], "/");
$proxystr = str_replace(array("http://", "https://"), "", $tmp);
$config['callback_proxy'] = $proxystr;
echo "Setting proxy to ".$proxystr." (from https_proxy=".$_ENV['https_proxy'].")\n";
}
if (isset($config['callback_proxy'])) {
echo "Using ".$config['callback_proxy']." as proxy\n";
curl_setopt($post, CURLOPT_PROXY, $config['callback_proxy']);
}
}