Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop
This commit is contained in:
cesar991
commit
c301d99ce1
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-agent-unix
|
||||
Version: 6.1dev-160830
|
||||
Version: 6.1dev-160831
|
||||
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="6.1dev-160830"
|
||||
pandora_version="6.1dev-160831"
|
||||
|
||||
echo "Test if you has the tools for to make the packages."
|
||||
whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ my $Sem = undef;
|
|||
my $ThreadSem = undef;
|
||||
|
||||
use constant AGENT_VERSION => '6.1dev';
|
||||
use constant AGENT_BUILD => '160830';
|
||||
use constant AGENT_BUILD => '160831';
|
||||
|
||||
# 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 6.1dev
|
||||
%define release 160830
|
||||
%define release 160831
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_agent_unix
|
||||
%define version 6.1dev
|
||||
%define release 160830
|
||||
%define release 160831
|
||||
|
||||
Summary: Pandora FMS Linux agent, PERL version
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="6.1dev"
|
||||
PI_BUILD="160830"
|
||||
PI_BUILD="160831"
|
||||
OS_NAME=`uname -s`
|
||||
|
||||
FORCE=0
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ UpgradeApplicationID
|
|||
{}
|
||||
|
||||
Version
|
||||
{160830}
|
||||
{160831}
|
||||
|
||||
ViewReadme
|
||||
{Yes}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ using namespace Pandora;
|
|||
using namespace Pandora_Strutils;
|
||||
|
||||
#define PATH_SIZE _MAX_PATH+1
|
||||
#define PANDORA_VERSION ("6.1dev(Build 160830)")
|
||||
#define PANDORA_VERSION ("6.1dev(Build 160831)")
|
||||
|
||||
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", "(6.1dev(Build 160830))"
|
||||
VALUE "ProductVersion", "(6.1dev(Build 160831))"
|
||||
VALUE "FileVersion", "1.0.0.0"
|
||||
END
|
||||
END
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-console
|
||||
Version: 6.1dev-160830
|
||||
Version: 6.1dev-160831
|
||||
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="6.1dev-160830"
|
||||
pandora_version="6.1dev-160831"
|
||||
|
||||
package_pear=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -62,3 +62,9 @@ UPDATE `tlink` SET `link` = 'https://github.com/pandorafms/pandorafms/issues' WH
|
|||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE tevent_filter ADD COLUMN `date_from` date DEFAULT NULL;
|
||||
ALTER TABLE tevent_filter ADD COLUMN `date_to` date DEFAULT NULL;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tusuario`
|
||||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE tusuario ADD (`id_filter` int(10) unsigned NULL default NULL);
|
||||
ALTER TABLE tusuario ADD CONSTRAINT fk_id_filter FOREIGN KEY (id_filter) REFERENCES tevent_filter(id_filter) ON DELETE SET NULL;
|
||||
|
|
|
|||
|
|
@ -61,3 +61,9 @@ UPDATE tlink SET link = 'https://github.com/pandorafms/pandorafms/issues' WHERE
|
|||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE tevent_filter ADD COLUMN date_from date DEFAULT NULL;
|
||||
ALTER TABLE tevent_filter ADD COLUMN date_to date DEFAULT NULL;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tusuario`
|
||||
-- ---------------------------------------------------------------------
|
||||
ALTER TABLE tusuario ADD (id_filter int(10) unsigned NULL default NULL);
|
||||
ALTER TABLE tusuario ADD CONSTRAINT fk_id_filter FOREIGN KEY (id_filter) REFERENCES tevent_filter(id_filter) ON DELETE SET NULL;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
/**
|
||||
* Pandora build version and version
|
||||
*/
|
||||
$build_version = 'PC160830';
|
||||
$build_version = 'PC160831';
|
||||
$pandora_version = 'v6.1dev';
|
||||
|
||||
// Do not overwrite default timezone set if defined.
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
<div style='height: 10px'>
|
||||
<?php
|
||||
$version = '6.1dev';
|
||||
$build = '160830';
|
||||
$build = '160831';
|
||||
$banner = "v$version Build $build";
|
||||
|
||||
error_reporting(0);
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ if (! check_acl ($config["id_user"], 0, "ER")) {
|
|||
return;
|
||||
}
|
||||
|
||||
$is_filter = db_get_value('id_filter', 'tusuario', 'id_user', $config['id_user']);
|
||||
|
||||
$jump = ' ';
|
||||
|
||||
|
|
@ -863,6 +864,7 @@ html_print_input_hidden('ajax_file',
|
|||
ui_get_full_url("ajax.php", false, false, false));
|
||||
html_print_input_hidden('meta', (int)$meta);
|
||||
html_print_input_hidden('history', (int)$history);
|
||||
html_print_input_hidden('filterid', $is_filter);
|
||||
|
||||
ui_require_jquery_file('json');
|
||||
ui_include_time_picker();
|
||||
|
|
@ -898,7 +900,65 @@ $(document).ready( function() {
|
|||
$("#row_name").css('visibility', '');
|
||||
$("#submit-update_filter").css('visibility', '');
|
||||
}
|
||||
|
||||
|
||||
if ($("#hidden-id_name").val() == ''){
|
||||
if($("#hidden-filterid").val() != ''){
|
||||
$('#row_name').css('visibility', '');
|
||||
$("#submit-update_filter").css('visibility', '');
|
||||
jQuery.post ("<?php echo ui_get_full_url("ajax.php", false, false, false); ?>",
|
||||
{"page" : "operation/events/events_list",
|
||||
"get_filter_values" : 1,
|
||||
"id" : $('#hidden-filterid').val()
|
||||
},
|
||||
function (data) {
|
||||
jQuery.each (data, function (i, val) {
|
||||
if (i == 'id_name')
|
||||
$("#hidden-id_name").val(val);
|
||||
if (i == 'id_group')
|
||||
$("#id_group").val(val);
|
||||
if (i == 'event_type')
|
||||
$("#event_type").val(val);
|
||||
if (i == 'severity')
|
||||
$("#severity").val(val);
|
||||
if (i == 'status')
|
||||
$("#status").val(val);
|
||||
if (i == 'search')
|
||||
$("#text-search").val(val);
|
||||
if (i == 'text_agent')
|
||||
$("#text_id_agent").val(val);
|
||||
if (i == 'id_agent')
|
||||
$('input:hidden[name=id_agent]').val(val);
|
||||
if (i == 'id_agent_module')
|
||||
$('input:hidden[name=module_search_hidden]').val(val);
|
||||
if (i == 'pagination')
|
||||
$("#pagination").val(val);
|
||||
if (i == 'event_view_hr')
|
||||
$("#text-event_view_hr").val(val);
|
||||
if (i == 'id_user_ack')
|
||||
$("#id_user_ack").val(val);
|
||||
if (i == 'group_rep')
|
||||
$("#group_rep").val(val);
|
||||
if (i == 'tag_with')
|
||||
$("#hidden-tag_with").val(val);
|
||||
if (i == 'tag_without')
|
||||
$("#hidden-tag_without").val(val);
|
||||
if (i == 'filter_only_alert')
|
||||
$("#filter_only_alert").val(val);
|
||||
if (i == 'id_group_filter')
|
||||
$("#id_group_filter").val(val);
|
||||
});
|
||||
reorder_tags_inputs();
|
||||
// Update the info with the loaded filter
|
||||
$('#filter_loaded_span').html($('#filter_loaded_text').html() + ': ' + $("#hidden-id_name").val());
|
||||
|
||||
// Update the view with the loaded filter
|
||||
$('#submit-update').trigger('click');
|
||||
},
|
||||
"json"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
$("#submit-load_filter").click(function () {
|
||||
// If selected 'none' flush filter
|
||||
if ( $("#filter_id").val() == 0 ) {
|
||||
|
|
|
|||
|
|
@ -282,7 +282,7 @@ if (check_acl ($config['id_user'], 0, "ER")
|
|||
$sub["operation/events/event_statistics"]["id"] = 'Statistics';
|
||||
|
||||
//RSS
|
||||
require_once ('include/functions_api.php');
|
||||
include_once ('include/functions_api.php');
|
||||
if (isInACL($_SERVER['REMOTE_ADDR'])) {
|
||||
$pss = get_user_info($config['id_user']);
|
||||
$hashup = md5($config['id_user'].$pss['password']);
|
||||
|
|
|
|||
|
|
@ -101,6 +101,7 @@ if (isset ($_GET["modified"]) && !$view_mode) {
|
|||
$upd_info["comments"] = get_parameter_post ("comments", $user_info["comments"]);
|
||||
$upd_info["language"] = get_parameter_post ("language", $user_info["language"]);
|
||||
$upd_info["id_skin"] = get_parameter ("skin", $user_info["id_skin"]);
|
||||
$upd_info["id_filter"] = get_parameter ("event_filter",NULL);
|
||||
$upd_info["block_size"] = get_parameter ("block_size", $config["block_size"]);
|
||||
$upd_info["firstname"] = get_parameter ("newsletter_reminder", $user_info["first_name"]);
|
||||
$default_block_size = get_parameter ("default_block_size", 0);
|
||||
|
|
@ -357,8 +358,12 @@ if ($double_auth_enabled) {
|
|||
// Dialog
|
||||
$data[0] .= "<div id=\"dialog-double_auth\"><div id=\"dialog-double_auth-container\"></div></div>";
|
||||
|
||||
// Newsletter
|
||||
if (license_free()) {
|
||||
if (check_acl ($config['id_user'], 0, "ER")){
|
||||
$data[1] = __('Event filter');
|
||||
$data[1] .= $jump . html_print_select_from_sql ('SELECT id_filter, id_name FROM tevent_filter',
|
||||
'event_filter', $user_info["id_filter"], '', __('None'), NULL, true);
|
||||
}// Newsletter
|
||||
else if (license_free()) {
|
||||
$data[1] = __('Newsletter Subscribed') . ':';
|
||||
if ($user_info["middlename"]) {
|
||||
$data[1] .= $jump . '<span style="font-weight:initial;">' . __('Already subscribed to Pandora FMS newsletter') . "</span>";
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ $options['view']['text'] = '<a href="index.php?sec=reporting&sec2=operation/visu
|
|||
. html_print_image("images/operation.png", true, array ("title" => __('View'))) .'</a>';
|
||||
$options['view']['active'] = true;
|
||||
|
||||
if (! defined('METACONSOLE')) {
|
||||
if (!is_metaconsole()) {
|
||||
if (!$config['pure']) {
|
||||
$options['pure']['text'] = '<a href="index.php?sec=reporting&sec2=operation/visual_console/render_view&id='.$id_layout.'&refr='.$refr.'&pure=1">'
|
||||
. html_print_image('images/full_screen.png', true, array('title' => __('Full screen mode')))
|
||||
|
|
@ -147,7 +147,10 @@ else {
|
|||
|
||||
if ($config['pure']) {
|
||||
// Container of the visual map (ajax loaded)
|
||||
echo '<div id="vc-container"></div>';
|
||||
echo '<div id="vc-container">' .
|
||||
visual_map_print_visual_map ($id_layout, true, true,
|
||||
null, null, '', false, $graph_javascript)
|
||||
. '</div>';
|
||||
|
||||
// Floating menu - Start
|
||||
echo '<div id="vc-controls">';
|
||||
|
|
@ -215,54 +218,54 @@ ui_require_javascript_file('pandora_visual_console');
|
|||
var pure = <?php echo (int) $config['pure']; ?>;
|
||||
|
||||
if (pure) {
|
||||
var startCountDown = function (duration, cb) {
|
||||
$('div.vc-countdown').countdown('destroy');
|
||||
if (!duration) return;
|
||||
var t = new Date();
|
||||
t.setTime(t.getTime() + duration * 1000);
|
||||
$('div.vc-countdown').countdown({
|
||||
until: t,
|
||||
format: 'MS',
|
||||
layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
|
||||
alwaysExpire: true,
|
||||
onExpiry: function () {
|
||||
$('div.vc-countdown').countdown('destroy');
|
||||
cb();
|
||||
}
|
||||
});
|
||||
}
|
||||
//~ var startCountDown = function (duration, cb) {
|
||||
//~ $('div.vc-countdown').countdown('destroy');
|
||||
//~ if (!duration) return;
|
||||
//~ var t = new Date();
|
||||
//~ t.setTime(t.getTime() + duration * 1000);
|
||||
//~ $('div.vc-countdown').countdown({
|
||||
//~ until: t,
|
||||
//~ format: 'MS',
|
||||
//~ layout: '(%M%nn%M:%S%nn%S <?php echo __('Until refresh'); ?>) ',
|
||||
//~ alwaysExpire: true,
|
||||
//~ onExpiry: function () {
|
||||
//~ $('div.vc-countdown').countdown('destroy');
|
||||
//~ cb();
|
||||
//~ }
|
||||
//~ });
|
||||
//~ }
|
||||
|
||||
var fetchMap = function () {
|
||||
$.ajax({
|
||||
url: 'ajax.php',
|
||||
type: 'GET',
|
||||
dataType: 'html',
|
||||
data: {
|
||||
page: 'include/ajax/visual_console.ajax',
|
||||
render_map: true,
|
||||
keep_aspect_ratio: true,
|
||||
id_visual_console: <?php echo $id_layout; ?>,
|
||||
graph_javascript: <?php echo (int) $graph_javascript; ?>,
|
||||
width: $(window).width(),
|
||||
height: $(window).height()
|
||||
}
|
||||
})
|
||||
.done(function (data, textStatus, xhr) {
|
||||
$('div#vc-container').html(data);
|
||||
startCountDown(refr, fetchMap);
|
||||
});
|
||||
}
|
||||
//~ var fetchMap = function () {
|
||||
//~ $.ajax({
|
||||
//~ url: 'ajax.php',
|
||||
//~ type: 'GET',
|
||||
//~ dataType: 'html',
|
||||
//~ data: {
|
||||
//~ page: 'include/ajax/visual_console.ajax',
|
||||
//~ render_map: true,
|
||||
//~ keep_aspect_ratio: true,
|
||||
//~ id_visual_console: <?php echo $id_layout; ?>,
|
||||
//~ graph_javascript: <?php echo (int) $graph_javascript; ?>,
|
||||
//~ width: $(window).width(),
|
||||
//~ height: $(window).height()
|
||||
//~ }
|
||||
//~ })
|
||||
//~ .done(function (data, textStatus, xhr) {
|
||||
//~ $('div#vc-container').html(data);
|
||||
//~ startCountDown(refr, fetchMap);
|
||||
//~ });
|
||||
//~ }
|
||||
|
||||
// Auto hide controls
|
||||
var controls = document.getElementById('vc-controls');
|
||||
autoHideElement(controls, 1000);
|
||||
$('select#refr').change(function (event) {
|
||||
refr = Number.parseInt(event.target.value, 10);
|
||||
startCountDown(refr, fetchMap);
|
||||
});
|
||||
//~ // Auto hide controls
|
||||
//~ var controls = document.getElementById('vc-controls');
|
||||
//~ autoHideElement(controls, 1000);
|
||||
//~ $('select#refr').change(function (event) {
|
||||
//~ refr = Number.parseInt(event.target.value, 10);
|
||||
//~ startCountDown(refr, fetchMap);
|
||||
//~ });
|
||||
|
||||
// Start the map fetch
|
||||
fetchMap();
|
||||
//~ // Start the map fetch
|
||||
//~ fetchMap();
|
||||
}
|
||||
else {
|
||||
$('#refr').change(function () {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 6.1dev
|
||||
%define release 160830
|
||||
%define release 160831
|
||||
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name httpd
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_console
|
||||
%define version 6.1dev
|
||||
%define release 160830
|
||||
%define release 160831
|
||||
%define httpd_name httpd
|
||||
# User and Group under which Apache is running
|
||||
%define httpd_name apache2
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@ INSERT INTO tconfig (token, value) VALUES ('graph_res','5');
|
|||
INSERT INTO tconfig (token, value) VALUES ('step_compact','1');
|
||||
INSERT INTO tconfig (token, value) VALUES ('db_scheme_first_version','6.0orc');
|
||||
INSERT INTO tconfig (token, value) VALUES('db_scheme_version','6.1dev');
|
||||
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160830');
|
||||
INSERT INTO tconfig (token, value) VALUES('db_scheme_build','PD160831');
|
||||
INSERT INTO tconfig (token, value) VALUES ('show_unknown','0');
|
||||
INSERT INTO tconfig (token, value) VALUES ('show_lastalerts','1');
|
||||
INSERT INTO tconfig (token, value) VALUES ('style','pandora');
|
||||
|
|
|
|||
|
|
@ -1006,6 +1006,8 @@ CREATE TABLE IF NOT EXISTS `tusuario` (
|
|||
`metaconsole_assigned_server` int(10) unsigned NOT NULL default 0,
|
||||
`metaconsole_access_node` tinyint(1) unsigned NOT NULL default 0,
|
||||
`strict_acl` tinyint(1) unsigned NOT NULL DEFAULT 0,
|
||||
`id_filter` int(10) unsigned NULL default NULL,
|
||||
CONSTRAINT `fk_id_filter` FOREIGN KEY (`id_filter`) REFERENCES tevent_filter (`id_filter`) ON DELETE SET NULL,
|
||||
UNIQUE KEY `id_user` (`id_user`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
package: pandorafms-server
|
||||
Version: 6.1dev-160830
|
||||
Version: 6.1dev-160831
|
||||
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="6.1dev-160830"
|
||||
pandora_version="6.1dev-160831"
|
||||
|
||||
package_cpan=0
|
||||
package_pandora=1
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ our @EXPORT = qw(
|
|||
|
||||
# version: Defines actual version of Pandora Server for this module only
|
||||
my $pandora_version = "6.1dev";
|
||||
my $pandora_build = "160830";
|
||||
my $pandora_build = "160831";
|
||||
our $VERSION = $pandora_version." ".$pandora_build;
|
||||
|
||||
# Setup hash
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 6.1dev
|
||||
%define release 160830
|
||||
%define release 160831
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
%define name pandorafms_server
|
||||
%define version 6.1dev
|
||||
%define release 160830
|
||||
%define release 160831
|
||||
|
||||
Summary: Pandora FMS Server
|
||||
Name: %{name}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
# **********************************************************************
|
||||
|
||||
PI_VERSION="6.1dev"
|
||||
PI_BUILD="160830"
|
||||
PI_BUILD="160831"
|
||||
|
||||
MODE=$1
|
||||
if [ $# -gt 1 ]; then
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ use PandoraFMS::Tools;
|
|||
use PandoraFMS::DB;
|
||||
|
||||
# version: define current version
|
||||
my $version = "6.1dev PS160830";
|
||||
my $version = "6.1dev PS160831";
|
||||
|
||||
# Pandora server configuration
|
||||
my %conf;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ use Encode::Locale;
|
|||
Encode::Locale::decode_argv;
|
||||
|
||||
# version: define current version
|
||||
my $version = "6.1dev PS160830";
|
||||
my $version = "6.1dev PS160831";
|
||||
|
||||
# save program name for logging
|
||||
my $progname = basename($0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue