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

Email Transport: embed graphs by default (#14270)

Browse Source 
* Email embed graphs

* Allow attachment for non-html
Add setting to webui
Correct $auth setting

* Cleanups, throw RrdGraphException instead of returning an error image.
Generate the error image later, giving more control.
Reduce code duplication a little

* Style and lint fixes
Change to flags

* Add baseline for lint errors I don't know how to resolve

* oopsie, changed the code after generating the baseline

* Tiny cleanups.  Make set DeviceCache primary, it is free.

* Docs.

* email_html note

* Allow control of graph embed at the email transport level to override the global config.

* Allow control of graph embed at the email transport level to override the global config.

* Add INLINE_BASE64 to make it easier to create inline image tags
This commit is contained in:
Tony Murray
2022-09-05 20:41:55 -05:00
committed by GitHub
parent ec8629fb63
commit 302a989d4e
15 changed files with 351 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
includes/html/functions.inc.php
View File

@@ -11,7 +11,6 @@
*/
use LibreNMS\Config;
use LibreNMS\Util\Debug;
use LibreNMS\Util\Number;
use LibreNMS\Util\Rewrite;
@@ -439,44 +438,7 @@ function generate_port_image($args)
*/
function graph_error($text, $color = [128, 0, 0])
{
global $vars;
$type = Config::get('webui.graph_type');
if (! Debug::isEnabled()) {
header('Content-type: ' . get_image_type($type));
}
$width = (int) ($vars['width'] ?? 150);
$height = (int) ($vars['height'] ?? 60);
if ($type === 'svg') {
$rgb = implode(', ', $color);
echo <<<SVG
<svg xmlns="http://www.w3.org/2000/svg"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
viewBox="0 0 $width $height"
preserveAspectRatio="xMinYMin">
<foreignObject x="0" y="0" width="$width" height="$height" transform="translate(0,0)">
<xhtml:div style="display:table; width:{$width}px; height:{$height}px; overflow:hidden;">
<xhtml:div style="display:table-cell; vertical-align:middle;">
<xhtml:div style="color:rgb($rgb); text-align:center; font-family:sans-serif; font-size:0.6em;">$text</xhtml:div>
</xhtml:div>
</xhtml:div>
</foreignObject>
</svg>
SVG;
} else {
$img = imagecreate($width, $height);
imagecolorallocatealpha($img, 255, 255, 255, 127); // transparent background
$px = ((imagesx($img) - 7.5 * strlen($text)) / 2);
$font = $width < 200 ? 3 : 5;
imagestring($img, $font, $px, ($height / 2 - 8), $text, imagecolorallocate($img, ...$color));
// Output the image
imagepng($img);
imagedestroy($img);
}
echo \LibreNMS\Util\Graph::error($text, null, 300, null, $color);
}
/**
@@ -1035,7 +997,7 @@ function eventlog_severity($eventlog_severity)
*/
function get_image_type(string $type)
{
return $type === 'svg' ? 'image/svg+xml' : 'image/png';
return \LibreNMS\Util\Graph::imageType($type);
}
function get_oxidized_nodes_list()