Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
This commit is contained in:
Daniel Barbero Martin
commit
319a329aec
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 7.0NG.753-210409
|
||||
Version: 7.0NG.753-210412
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.753-210409"
|
||||
pandora_version="7.0NG.753-210412"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -1015,7 +1015,7 @@ my $Sem = undef;
|
|||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '7.0NG.753';
|
||||
use constant AGENT_BUILD => '210409';
|
||||
use constant AGENT_BUILD => '210412';
|
||||
|
||||
# Agent log default file size maximum and instances
|
||||
use constant DEFAULT_MAX_LOG_SIZE => 600000;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.753"
|
||||
PI_BUILD="210409"
|
||||
PI_BUILD="210412"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{210409}
|
||||
{210412}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("7.0NG.753(Build 210409)")
|
||||
#define PANDORA_VERSION ("7.0NG.753(Build 210412)")
|
||||
|
||||
string pandora_path;
|
||||
string pandora_dir;
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ BEGIN
|
|||
VALUE "LegalCopyright", "Artica ST"
|
||||
VALUE "OriginalFilename", "PandoraAgent.exe"
|
||||
VALUE "ProductName", "Pandora FMS Windows Agent"
|
||||
VALUE "ProductVersion", "(7.0NG.753(Build 210409))"
|
||||
VALUE "ProductVersion", "(7.0NG.753(Build 210412))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 7.0NG.753-210409
|
||||
Version: 7.0NG.753-210412
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.753-210409"
|
||||
pandora_version="7.0NG.753-210412"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ if (isset($config['console_log_enabled']) === true
|
|||
ini_set('error_log', $config['homedir'].'/log/console.log');
|
||||
} else {
|
||||
ini_set('log_errors', 0);
|
||||
ini_set('error_log', 0);
|
||||
ini_set('error_log', null);
|
||||
}
|
||||
|
||||
// Sometimes input is badly retrieved from caller...
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ $id_os = 0;
|
|||
$server_name = 0;
|
||||
$description = '';
|
||||
|
||||
echo '<div id="form_agents" class="invisible">';
|
||||
echo '<div id="form_agents" style="display:none">';
|
||||
|
||||
$table = new StdClass();
|
||||
$table->width = '100%';
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC210409';
|
||||
$build_version = 'PC210412';
|
||||
$pandora_version = 'v7.0NG.753';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
|
|
|||
|
|
@ -1530,6 +1530,11 @@ function graphic_combined_module(
|
|||
}
|
||||
|
||||
$long_index = '';
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$background_color = '#222';
|
||||
$params['legend_color'] = '#fff';
|
||||
}
|
||||
|
||||
switch ($params_combined['stacked']) {
|
||||
default:
|
||||
case CUSTOM_GRAPH_STACKED_LINE:
|
||||
|
|
|
|||
|
|
@ -905,7 +905,12 @@ function html_print_select(
|
|||
);
|
||||
$output .= '"/>';
|
||||
} else {
|
||||
ui_require_css_file('select2.min');
|
||||
$select2 = 'select2.min';
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$select2 = 'select2_dark.min';
|
||||
}
|
||||
|
||||
ui_require_css_file($select2);
|
||||
ui_require_javascript_file('select2.min');
|
||||
}
|
||||
|
||||
|
|
@ -5089,9 +5094,14 @@ function html_print_autocomplete_users_from_integria(
|
|||
) {
|
||||
global $config;
|
||||
|
||||
$user_icon = 'images/user_green.png';
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$user_icon = 'images/header_user.png';
|
||||
}
|
||||
|
||||
ob_start();
|
||||
|
||||
$attrs = ['style' => 'background: url(images/user_green.png) no-repeat right;'];
|
||||
$attrs = ['style' => 'background: url('.$user_icon.') no-repeat right;'];
|
||||
|
||||
if ($required) {
|
||||
$attrs['required'] = 'required';
|
||||
|
|
@ -5284,9 +5294,17 @@ function html_print_select_search(
|
|||
$required=false,
|
||||
$dropdownAutoWidth=false
|
||||
) {
|
||||
global $config;
|
||||
|
||||
$output = '';
|
||||
|
||||
ui_require_css_file('select2.min');
|
||||
$select2_css = 'select2.min';
|
||||
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$select2_css = 'select2_dark.min';
|
||||
}
|
||||
|
||||
ui_require_css_file($select2_css);
|
||||
ui_require_javascript_file('select2.min');
|
||||
|
||||
if ($name === null) {
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ function integriaims_tabs($active_tab, $view=false)
|
|||
}
|
||||
|
||||
if ($view) {
|
||||
$create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/pencil.png', true, ['title' => __('Edit ticket')]).'</a>';
|
||||
$view_tab['text'] = '<a href="'.$url_tabs.'dashboard_detail_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/operation.png', true, ['title' => __('View ticket')]).'</a>';
|
||||
$create_tab['text'] = '<a href="'.$url_tabs.'configure_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/pencil.png', true, ['title' => __('Edit ticket'), 'class' => 'invert_filter']).'</a>';
|
||||
$view_tab['text'] = '<a href="'.$url_tabs.'dashboard_detail_integriaims_incident&incident_id='.$view.'">'.html_print_image('images/operation.png', true, ['title' => __('View ticket'), 'class' => 'invert_filter']).'</a>';
|
||||
// When the current page is the View page.
|
||||
if (!$active_tab) {
|
||||
$view_tab['active'] = true;
|
||||
|
|
|
|||
|
|
@ -5644,7 +5644,7 @@ function reporting_value($report, $content, $type, $pdf=false)
|
|||
);
|
||||
}
|
||||
|
||||
$label = (isset($content['name'])) ? $content['name'] : '';
|
||||
$label = (isset($content['style']['label'])) ? $content['style']['label'] : '';
|
||||
if ($label != '') {
|
||||
$label = reporting_label_macro(
|
||||
$items_label,
|
||||
|
|
@ -9170,6 +9170,7 @@ function reporting_simple_graph(
|
|||
$return['agent_name'] = $agent_alias;
|
||||
$return['module_name'] = $module_name;
|
||||
$return['description'] = $description;
|
||||
$return['label'] = $label;
|
||||
$return['date'] = reporting_get_date_text(
|
||||
$report,
|
||||
$content
|
||||
|
|
@ -9211,7 +9212,8 @@ function reporting_simple_graph(
|
|||
$params = [
|
||||
'agent_module_id' => $content['id_agent_module'],
|
||||
'period' => $content['period'],
|
||||
'title' => $label,
|
||||
'title' => $title,
|
||||
'label' => $label,
|
||||
'pure' => false,
|
||||
'date' => $report['datetime'],
|
||||
'only_image' => $only_image,
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
|
|||
$output .= '</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="black pdd_t_10px" style="color: #000">'.$text_message.'</td>
|
||||
<td class="black pdd_t_10px invert_filter" style="color: #000">'.$text_message.'</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>';
|
||||
|
|
|
|||
|
|
@ -218,6 +218,9 @@ function vbar_graph(
|
|||
|
||||
if (isset($options['x']['font']['color']) === false) {
|
||||
$options['x']['font']['color'] = '#545454';
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$options['x']['font']['color'] = '#fff';
|
||||
}
|
||||
}
|
||||
|
||||
// Show ticks.
|
||||
|
|
@ -295,6 +298,10 @@ function vbar_graph(
|
|||
|
||||
if (isset($options['y']['font']['color']) === false) {
|
||||
$options['y']['font']['color'] = '#545454';
|
||||
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$options['y']['font']['color'] = '#fff';
|
||||
}
|
||||
}
|
||||
|
||||
// Show ticks.
|
||||
|
|
@ -692,6 +699,7 @@ function hbar_graph(
|
|||
$val_max=null,
|
||||
$base64=false
|
||||
) {
|
||||
global $config;
|
||||
if ($water_mark !== false) {
|
||||
setup_watermark($water_mark, $water_mark_file, $water_mark_url);
|
||||
}
|
||||
|
|
@ -717,6 +725,10 @@ function hbar_graph(
|
|||
return generator_chart_to_pdf('hbar', $params);
|
||||
}
|
||||
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$tick_color = '#fff';
|
||||
}
|
||||
|
||||
return flot_hcolumn_chart(
|
||||
$chart_data,
|
||||
$width,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -114,7 +114,7 @@ function pandoraFlotPie(
|
|||
|
||||
// Reset styles
|
||||
function resetInteractivity() {
|
||||
legends.css("color", "#3F3F3D");
|
||||
legends.css("color", "#fff");
|
||||
}
|
||||
|
||||
if (water_mark) {
|
||||
|
|
@ -241,6 +241,10 @@ function pandoraFlotPieCustom(
|
|||
} else if (background_color == "black") {
|
||||
$(".legend>table").css("background-color", "black");
|
||||
$(".legend>table").css("color", "#aaa");
|
||||
} else if (background_color == "black_theme") {
|
||||
$(".legend>table").css("background-color", "#222");
|
||||
$(".legend>div").css("background-color", "#222");
|
||||
$(".legend>table").css("color", "#fff !important");
|
||||
}
|
||||
|
||||
$(".legend").hover(function() {
|
||||
|
|
@ -258,7 +262,11 @@ function pandoraFlotPieCustom(
|
|||
if (!obj) return;
|
||||
|
||||
var index = obj.seriesIndex;
|
||||
legends.css("color", "#3F3F3D");
|
||||
if (background_color == "black_theme") {
|
||||
legends.css("color", "#fff");
|
||||
} else {
|
||||
legends.css("color", "#3F3F3D");
|
||||
}
|
||||
legends.eq(index).css("color", "");
|
||||
}
|
||||
|
||||
|
|
@ -285,6 +293,7 @@ function pandoraFlotPieCustom(
|
|||
function resetInteractivity() {
|
||||
legends.each(function() {
|
||||
// fix the widths so they don't jump around
|
||||
console.log($(this));
|
||||
$(this).css("color", "#3F3F3D");
|
||||
});
|
||||
}
|
||||
|
|
@ -349,6 +358,11 @@ function pandoraFlotHBars(
|
|||
labels_total.push([i, labels[i]]);
|
||||
}
|
||||
|
||||
var ycolor = "rgb(84, 84, 84)";
|
||||
|
||||
if (background_color == "#222") {
|
||||
var ycolor = "#fff";
|
||||
}
|
||||
var options = {
|
||||
series: {
|
||||
bars: {
|
||||
|
|
@ -377,7 +391,7 @@ function pandoraFlotHBars(
|
|||
yaxis: {
|
||||
font: {
|
||||
size: font_size + 2,
|
||||
color: "rgb(84, 84, 84)",
|
||||
color: ycolor,
|
||||
family: font + "Font"
|
||||
},
|
||||
ticks: yFormatter
|
||||
|
|
@ -563,6 +577,7 @@ function showTooltip(x, y, color, contents) {
|
|||
"font-size": "9px",
|
||||
"border-radius": "5px",
|
||||
"background-color": "#fff",
|
||||
color: "#111",
|
||||
"font-family": "Verdana, Arial, Helvetica, Tahoma, sans-serif",
|
||||
opacity: 0.9
|
||||
})
|
||||
|
|
@ -2363,7 +2378,7 @@ function pandoraFlotArea(
|
|||
$("#legend_" + graph_id).height()
|
||||
);
|
||||
|
||||
$("#timestamp_" + graph_id).css("color", legend_color);
|
||||
$("#timestamp_" + graph_id).css("color", "#000");
|
||||
$("#timestamp_" + graph_id).css("font-size", font_size + 2 + "px");
|
||||
$("#timestamp_" + graph_id).css("font-family", font + "Font");
|
||||
|
||||
|
|
|
|||
|
|
@ -201,6 +201,11 @@ function d3_bullet_chart(
|
|||
$id_bullet = uniqid();
|
||||
$font = array_shift(explode('.', array_pop(explode('/', $font))));
|
||||
|
||||
$invert_color = '';
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$invert_color = 'filter: invert(100%);';
|
||||
}
|
||||
|
||||
$output .= '<div id="bullet_graph_'.$id_bullet.'" class="bullet" style="overflow: hidden; width: '.$width.'px; margin-left: auto; margin-right: auto;"></div>
|
||||
<style>
|
||||
.bullet_graph {
|
||||
|
|
@ -216,14 +221,14 @@ function d3_bullet_chart(
|
|||
.bullet .marker.s1 { stroke: #f3b200; stroke-width: 2px; }
|
||||
.bullet .marker.s2 { stroke: steelblue; stroke-width: 2px; }
|
||||
.bullet .tick line { stroke: #666; stroke-width: .5px; }
|
||||
.bullet .range.s0 { fill: #ddd; }
|
||||
.bullet .range.s0 { fill: #fff; }
|
||||
.bullet .range.s1 { fill: #ddd; }
|
||||
.bullet .range.s2 { fill: #ccc; }
|
||||
.bullet .measure.s0 { fill: steelblue; }
|
||||
.bullet .measure.s1 { fill: steelblue; }
|
||||
.bullet .title { font-size: 7pt; font-weight: bold; text-align:left; }
|
||||
.bullet .subtitle { fill: #999; font-size: 7pt;}
|
||||
.bullet g text { font-size:'.$font_size.'pt;}
|
||||
.bullet .subtitle { fill: #999; font-size: 7pt;}
|
||||
.bullet g text { font-size:'.$font_size.'pt; '.$invert_color.' }
|
||||
|
||||
</style>
|
||||
<script language="javascript" type="text/javascript">
|
||||
|
|
@ -276,7 +281,7 @@ function d3_bullet_chart(
|
|||
.attr("transform", "translate(-10, 15)");
|
||||
|
||||
title.append("text")
|
||||
.attr("class", "'.$font.'")
|
||||
.attr("class", "'.$font.' invert_filter")
|
||||
.text(function(d) { return d.title; });
|
||||
|
||||
title.append("text")
|
||||
|
|
@ -293,9 +298,9 @@ function d3_bullet_chart(
|
|||
else if (label >= 100000)
|
||||
text = text.substring(0,3) + "K";
|
||||
else if (label >= 1000)
|
||||
text = text.substring(0,2) + "K";
|
||||
text = text.substring(0,2) + "K";
|
||||
$(this).text(text);
|
||||
});
|
||||
});
|
||||
</script>';
|
||||
|
||||
return $output;
|
||||
|
|
|
|||
|
|
@ -145,6 +145,13 @@ function flot_area_graph(
|
|||
break;
|
||||
}
|
||||
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$background_style = '#222';
|
||||
$params['grid_color'] = '#fff';
|
||||
$params['backgroundColor'] = '#222';
|
||||
$params['legend_color'] = '#fff';
|
||||
}
|
||||
|
||||
// Parent layer.
|
||||
if (strpos($params['width'], '%') === false) {
|
||||
$width = 'width: '.$params['width'].'px;';
|
||||
|
|
@ -244,7 +251,7 @@ function flot_area_graph(
|
|||
style='font-size:".$params['font_size']."pt;
|
||||
display:none; position:absolute;
|
||||
background:#fff; border: solid 1px #aaa;
|
||||
padding: 2px; z-index:1000;
|
||||
padding: 2px; z-index:1000; color: #000;
|
||||
'></div>";
|
||||
$return .= "<div id='$graph_id' class='";
|
||||
|
||||
|
|
@ -478,6 +485,10 @@ function flot_custom_pie_chart(
|
|||
$legend_position
|
||||
) {
|
||||
global $config;
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$background_color = 'black_theme';
|
||||
}
|
||||
|
||||
// TODO
|
||||
// include_javascript_dependencies_flot_graph();
|
||||
$total_modules = $graph_values['total_modules'];
|
||||
|
|
@ -670,6 +681,15 @@ function flot_vcolumn_chart(array $options)
|
|||
|
||||
// Add id to options.
|
||||
$options['graphId'] = $graphId;
|
||||
|
||||
// If pandora_black theme its enabled then change grid colors.
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$options['grid']['backgroundColor']['colors'][0] = 'transparent';
|
||||
$options['grid']['backgroundColor']['colors'][1] = 'transparent';
|
||||
$options['y']['color'] = 'transparent';
|
||||
$options['x']['color'] = 'transparent';
|
||||
}
|
||||
|
||||
$settings = base64_encode(json_encode($options));
|
||||
|
||||
// Javascript code.
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ div.integria_details_description textarea {
|
|||
width: 100%;
|
||||
background-color: #fbfbfb;
|
||||
resize: vertical;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.integriaims_details_box {
|
||||
|
|
|
|||
|
|
@ -3352,6 +3352,7 @@ div#stat-win-module-graph div.nodata_container {
|
|||
.menu_graph,
|
||||
.timestamp_graph {
|
||||
position: absolute;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.menu_graph {
|
||||
|
|
@ -8492,3 +8493,6 @@ div.stat-win-spinner img {
|
|||
.lign_right {
|
||||
text-align: right;
|
||||
}
|
||||
.font_11pt {
|
||||
font-size: 11pt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -231,7 +231,7 @@ div#foot {
|
|||
}
|
||||
|
||||
/* Overwrite inline styles */
|
||||
.textodialogo td {
|
||||
.textodialogo td .white_important {
|
||||
color: #fff !important;
|
||||
}
|
||||
|
||||
|
|
@ -659,13 +659,14 @@ form ul.form_flex {
|
|||
padding: 10px 0px 10px 0px;
|
||||
}
|
||||
|
||||
.bullet {
|
||||
background-color: #ddd;
|
||||
.bullet .range.s0 {
|
||||
background-color: #222;
|
||||
fill: #222 !important;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.legendLabel {
|
||||
color: black;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.incident_table {
|
||||
|
|
@ -755,14 +756,14 @@ form ul.form_flex {
|
|||
|
||||
#container_servicemap_legend {
|
||||
position: absolute;
|
||||
background: #fff;
|
||||
background: #222;
|
||||
margin-top: 10px;
|
||||
right: 2px;
|
||||
border: 1px solid #e2e2e2;
|
||||
border-radius: 5px;
|
||||
padding: 10px;
|
||||
opacity: 0.9;
|
||||
color: #111;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.notification-subtitle_black {
|
||||
|
|
@ -856,3 +857,38 @@ div#dashboard-controls {
|
|||
border-radius: 15px;
|
||||
padding: 10px;
|
||||
}
|
||||
.serviceap_show_bg {
|
||||
overflow: hidden;
|
||||
border: 1px solid #e2e2e2;
|
||||
background-color: #111;
|
||||
}
|
||||
|
||||
.title_service_unstack,
|
||||
.title,
|
||||
.title_service_stack {
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
text-anchor: middle;
|
||||
fill: #fff;
|
||||
font-family: Verdana;
|
||||
}
|
||||
|
||||
.tickLabel {
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.integria_details_shadow {
|
||||
background-color: #222;
|
||||
border-bottom: 1px solid #e2e2e2;
|
||||
border-left: 1px solid #e2e2e2;
|
||||
border-top-left-radius: 5px;
|
||||
border-right: 1px solid #e2e2e2;
|
||||
border-top-right-radius: 5px;
|
||||
}
|
||||
|
||||
div.integria_details_description textarea {
|
||||
width: 100%;
|
||||
background-color: #111;
|
||||
color: #fff;
|
||||
resize: vertical;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ if (isset($config['console_log_enabled']) && $config['console_log_enabled'] == 1
|
|||
ini_set('error_log', $config['homedir'].'/log/console.log');
|
||||
} else {
|
||||
ini_set('log_errors', 0);
|
||||
ini_set('error_log', 0);
|
||||
ini_set('error_log', null);
|
||||
}
|
||||
|
||||
if (isset($config['error'])) {
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@
|
|||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '7.0NG.753';
|
||||
$build = '210409';
|
||||
$build = '210412';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ foreach ($logs as $log) {
|
|||
ob_start();
|
||||
|
||||
if (!empty($table->data)) {
|
||||
echo '<div id="log_sources_status w100p">';
|
||||
echo '<div id="log_sources_status" class="w100p">';
|
||||
html_print_table($table);
|
||||
echo '</div>';
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -205,7 +205,12 @@ $table->data[0][0] .= '<div class="label_select_parent">'.html_print_input_text(
|
|||
'w100p'
|
||||
).'</div>';
|
||||
|
||||
$table->data[0][2] = html_print_image('images/integria_logo_gray.png', true, ['style' => 'width: 70%; float: right;'], false);
|
||||
$integria_logo = 'images/integria_logo_gray.png';
|
||||
if ($config['style'] === 'pandora_black') {
|
||||
$integria_logo = 'images/integria_logo.png';
|
||||
}
|
||||
|
||||
$table->data[0][2] = html_print_image($integria_logo, true, ['style' => 'width: 70%; float: right;'], false);
|
||||
|
||||
$table->data[1][0] = '<div class="label_select"><p class="input_label">'.__('Type').': </p>';
|
||||
$table->data[1][0] .= '<div class="label_select_parent">'.html_print_select(
|
||||
|
|
|
|||
|
|
@ -376,11 +376,11 @@ $details_box .= '
|
|||
<div class="integriaims_details_titles">'.__('Priority').'</div>
|
||||
<div class="integriaims_details_titles">'.__('Type').'</div>';
|
||||
$details_box .= '
|
||||
<div>'.html_print_image('images/heart.png', true).'</div>
|
||||
<div>'.html_print_image('images/builder.png', true).'</div>
|
||||
<div>'.html_print_image('images/user_green.png', true).'</div>
|
||||
<div>'.html_print_image('images/heart.png', true, ['class' => 'invert_filter']).'</div>
|
||||
<div>'.html_print_image('images/builder.png', true, ['class' => 'invert_filter']).'</div>
|
||||
<div>'.html_print_image('images/user_green.png', true, ['class' => 'invert_filter']).'</div>
|
||||
<div>'.ui_print_integria_incident_priority($priority, $priority_text).'</div>
|
||||
<div>'.html_print_image('images/incidents.png', true).'</div>';
|
||||
<div>'.html_print_image('images/incidents.png', true, ['class' => 'invert_filter']).'</div>';
|
||||
$details_box .= '
|
||||
<div>'.$status_text.'</div>
|
||||
<div>'.$resolution_text.'</div>
|
||||
|
|
@ -410,9 +410,9 @@ $people_box .= '</div>';
|
|||
// Dates box.
|
||||
$dates_box = '<div class="integriaims_details_box integriaims_details_box_three">';
|
||||
$dates_box .= '
|
||||
<div>'.html_print_image('images/tick.png', true).'</div>
|
||||
<div>'.html_print_image('images/update.png', true, ['width' => '21']).'</div>
|
||||
<div>'.html_print_image('images/mul.png', true).'</div>';
|
||||
<div>'.html_print_image('images/tick.png', true, ['class' => 'invert_filter']).'</div>
|
||||
<div>'.html_print_image('images/update.png', true, ['width' => '21', 'class' => 'invert_filter']).'</div>
|
||||
<div>'.html_print_image('images/mul.png', true, ['class' => 'invert_filter']).'</div>';
|
||||
$dates_box .= '
|
||||
<div class="integriaims_details_titles">'.__('Created at').':</div>
|
||||
<div class="integriaims_details_titles">'.__('Updated at').':</div>
|
||||
|
|
|
|||
|
|
@ -59,6 +59,7 @@ if (!$users || !$searchUsers) {
|
|||
[
|
||||
'alt' => __('User'),
|
||||
'title' => __('Standard User'),
|
||||
'class' => 'invert_filter',
|
||||
]
|
||||
).' ';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 7.0NG.753-210409
|
||||
Version: 7.0NG.753-210412
|
||||
Architecture: all
|
||||
Priority: optional
|
||||
Section: admin
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
|
||||
pandora_version="7.0NG.753-210409"
|
||||
pandora_version="7.0NG.753-210412"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ our @EXPORT = qw(
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.753";
|
||||
my $pandora_build = "210409";
|
||||
my $pandora_build = "210412";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "7.0NG.753";
|
||||
my $pandora_build = "210409";
|
||||
my $pandora_build = "210412";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
our %EXPORT_TAGS = ( 'all' => [ qw() ] );
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 7.0NG.753
|
||||
%define release 210409
|
||||
%define release 210412
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="7.0NG.753"
|
||||
PI_BUILD="210409"
|
||||
PI_BUILD="210412"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use PandoraFMS::Config;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.753 PS210409";
|
||||
my $version = "7.0NG.753 PS210412";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "7.0NG.753 PS210409";
|
||||
my $version = "7.0NG.753 PS210412";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue