Merge branch 'ent-9002-Eliminar-monitorizacion-transaccional-Servidor-transaccional' into 'develop'
Ent 9002 eliminar monitorizacion transaccional servidor transaccional See merge request artica/pandorafms!5264
This commit is contained in:
Rafael Ameijeiras
commit
48cd23426c
|
|
@ -1667,3 +1667,13 @@ godmode/um_client/vendor/sebastian
|
|||
godmode/um_client/vendor
|
||||
update_manager_client/resources/styles/pandora.css
|
||||
enterprise/meta/general/upload_head_image.php
|
||||
general/first_task/transactional_list.php
|
||||
enterprise/include/ajax/transactional.ajax.php
|
||||
enterprise/include/class/Transactionalmap.class.php
|
||||
enterprise/include/help/es/help_transactional_map_phases.php
|
||||
enterprise/include/javascript/transactional/TransactionalController.js
|
||||
enterprise/include/functions_transactional.php
|
||||
enterprise/operation/agentes/manage_transmap.php
|
||||
enterprise/operation/agentes/manage_transmap_creation.php
|
||||
enterprise/operation/agentes/manage_transmap_creation_phases_data.php
|
||||
enterprise/operation/agentes/transactional_map.php
|
||||
|
|
|
|||
|
|
@ -1,5 +1,8 @@
|
|||
START TRANSACTION;
|
||||
|
||||
DROP TABLE IF EXISTS `tphase`;
|
||||
DROP TABLE IF EXISTS `ttransaction`;
|
||||
|
||||
ALTER TABLE `tagent_custom_fields` ADD `is_link_enabled` TINYINT(1) NOT NULL DEFAULT 0;
|
||||
|
||||
ALTER TABLE `tevent_filter` ADD COLUMN `owner_user` TEXT;
|
||||
|
|
|
|||
|
|
@ -1,46 +0,0 @@
|
|||
<?php
|
||||
|
||||
// Pandora FMS - http://pandorafms.com
|
||||
// ==================================================
|
||||
// Copyright (c) 2005-2021 Artica Soluciones Tecnologicas
|
||||
// Please see http://pandorafms.org for full contribution list
|
||||
// This program is free software; you can redistribute it and/or
|
||||
// modify it under the terms of the GNU General Public License
|
||||
// as published by the Free Software Foundation; version 2
|
||||
// This program is distributed in the hope that it will be useful,
|
||||
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
// GNU General Public License for more details.
|
||||
global $config;
|
||||
global $networkmaps_write;
|
||||
global $networkmaps_manage;
|
||||
check_login();
|
||||
ui_require_css_file('first_task');
|
||||
?>
|
||||
<?php
|
||||
ui_print_info_message(['no_close' => true, 'message' => __('There are no transactions defined yet.') ]);
|
||||
|
||||
if ($networkmaps_write || $networkmaps_manage) {
|
||||
?>
|
||||
|
||||
<div class="new_task">
|
||||
<div class="image_task">
|
||||
<?php echo html_print_image('images/first_task/icono_grande_topology.png', true, ['title' => __('Transactions')]); ?>
|
||||
</div>
|
||||
<div class="text_task">
|
||||
<h3> <?php echo __('Create Transactions'); ?></h3><p id="description_task">
|
||||
<?php
|
||||
echo __(
|
||||
'The new transactional server allows you to execute tasks dependent on the others following a user-defined design. This means that it is possible to coordinate several executions to check a target at a given time.
|
||||
|
||||
Transaction graphs represent the different processes within our infrastructure that we use to deliver our service.'
|
||||
);
|
||||
?>
|
||||
</p>
|
||||
<form action="index.php?sec=network&sec2=enterprise/operation/agentes/manage_transmap_creation&create_transaction=1" method="post">
|
||||
<input type="submit" class="button_task" value="<?php echo __('Create Transactions'); ?>" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
|
|
@ -1349,9 +1349,6 @@ function servers_get_server_string_name(int $server)
|
|||
case SERVER_TYPE_ENTERPRISE_SATELLITE:
|
||||
return __('Satellite server');
|
||||
|
||||
case SERVER_TYPE_ENTERPRISE_TRANSACTIONAL:
|
||||
return __('Transactional server');
|
||||
|
||||
case SERVER_TYPE_ALERT:
|
||||
return __('Alert server');
|
||||
|
||||
|
|
|
|||
|
|
@ -166,8 +166,6 @@ if ($access_console_node === true) {
|
|||
$sub['operation/agentes/pandora_networkmap']['text'] = __('Network map');
|
||||
$sub['operation/agentes/pandora_networkmap']['id'] = 'Network map';
|
||||
$sub['operation/agentes/pandora_networkmap']['refr'] = 0;
|
||||
|
||||
enterprise_hook('transmap_console');
|
||||
}
|
||||
|
||||
enterprise_hook('services_menu');
|
||||
|
|
|
|||
|
|
@ -3413,37 +3413,8 @@ CREATE TABLE IF NOT EXISTS `tmetaconsole_agent` (
|
|||
) ENGINE=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `ttransaction`
|
||||
-- Table `treset_pass`
|
||||
-- ---------------------------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `ttransaction` (
|
||||
`transaction_id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`agent_id` INT UNSIGNED NOT NULL,
|
||||
`group_id` INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
`description` TEXT,
|
||||
`name` VARCHAR(250) NOT NULL,
|
||||
`loop_interval` INT UNSIGNED NOT NULL DEFAULT 40,
|
||||
`ready` INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
`running` INT UNSIGNED NOT NULL DEFAULT 0,
|
||||
PRIMARY KEY (`transaction_id`)
|
||||
) engine=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
-- ---------------------------------------------------------------------
|
||||
-- Table `tphase`
|
||||
-- ---------------------------------------------------------------------
|
||||
CREATE TABLE IF NOT EXISTS `tphase`(
|
||||
`phase_id` INT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`transaction_id` INT UNSIGNED NOT NULL,
|
||||
`agent_id` INT UNSIGNED NOT NULL,
|
||||
`name` VARCHAR(250) NOT NULL,
|
||||
`idx` INT UNSIGNED NOT NULL,
|
||||
`dependencies` TEXT,
|
||||
`enables` TEXT,
|
||||
`launch` TEXT,
|
||||
`retries` INT UNSIGNED DEFAULT null,
|
||||
`timeout` INT UNSIGNED DEFAULT null,
|
||||
PRIMARY KEY (`phase_id`,`transaction_id`)
|
||||
) engine=InnoDB DEFAULT CHARSET=UTF8MB4;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `treset_pass` (
|
||||
`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
|
||||
`id_user` VARCHAR(255) NOT NULL DEFAULT '',
|
||||
|
|
|
|||
|
|
@ -429,14 +429,6 @@ snmpserver 1
|
|||
|
||||
snmp_threads 4
|
||||
|
||||
# Pandora FMS TransactionalServer (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
transactionalserver 0
|
||||
|
||||
# Threshold for the Transactional Server (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
transactional_threshold 2
|
||||
|
||||
# Block size for block producer/consumer servers, that is, the number of modules
|
||||
# per block (20 by default) (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
|
|
|
|||
|
|
@ -533,14 +533,6 @@ snmpserver 1
|
|||
|
||||
snmp_threads 4
|
||||
|
||||
# Pandora FMS TransactionalServer (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
transactionalserver 0
|
||||
|
||||
# Threshold for the Transactional Server (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
transactional_threshold 2
|
||||
|
||||
# Block size for block producer/consumer servers, that is, the number of modules
|
||||
# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
|
|
|
|||
|
|
@ -430,14 +430,6 @@ snmpserver 1
|
|||
|
||||
snmp_threads 4
|
||||
|
||||
# Pandora FMS TransactionalServer (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
transactionalserver 0
|
||||
|
||||
# Threshold for the Transactional Server (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
transactional_threshold 2
|
||||
|
||||
# Block size for block producer/consumer servers, that is, the number of modules
|
||||
# per block (15 by default) (PANDORA FMS ENTERPRISE ONLY).
|
||||
|
||||
|
|
|
|||
|
|
@ -256,8 +256,6 @@ sub pandora_load_config {
|
|||
$pa_config->{"inventoryserver"} = 1; # default
|
||||
$pa_config->{"webserver"} = 1; # 3.0
|
||||
$pa_config->{"web_timeout"} = 60; # 6.0SP5
|
||||
$pa_config->{"transactionalserver"} = 0; # Default 0, introduced on 6.1
|
||||
$pa_config->{"transactional_threshold"} = 2; # Default 2, introduced on 6.1
|
||||
$pa_config->{"transactional_pool"} = $pa_config->{"incomingdir"} . "/" . "trans"; # Default, introduced on 6.1
|
||||
$pa_config->{'snmp_logfile'} = "/var/log/pandora_snmptrap.log";
|
||||
$pa_config->{"network_threads"} = 3; # Fixed default
|
||||
|
|
@ -776,12 +774,6 @@ sub pandora_load_config {
|
|||
elsif ($parametro =~ m/^web_timeout\s+([0-9]*)/i) {
|
||||
$pa_config->{'web_timeout'}= clean_blank($1);
|
||||
}
|
||||
elsif ($parametro =~ m/^transactionalserver\s+([0-9]*)/i) {
|
||||
$pa_config->{'transactionalserver'}= clean_blank($1);
|
||||
}
|
||||
elsif ($parametro =~ m/^transactional_threshold\s+([0-9]*\.{0,1}[0-9]*)/i) {
|
||||
$pa_config->{'transactional_threshold'}= clean_blank($1);
|
||||
}
|
||||
if ($parametro =~ m/^transactional_pool\s(.*)/i) {
|
||||
$tbuf= clean_blank($1);
|
||||
if ($tbuf =~ m/^\.(.*)/){
|
||||
|
|
|
|||
|
|
@ -299,7 +299,6 @@ our @ServerTypes = qw (
|
|||
icmpserver
|
||||
snmpserver
|
||||
satelliteserver
|
||||
transactionalserver
|
||||
mfserver
|
||||
syncserver
|
||||
wuxserver
|
||||
|
|
|
|||
|
|
@ -72,7 +72,6 @@ our @EXPORT = qw(
|
|||
SNMPSERVER
|
||||
SATELLITESERVER
|
||||
MFSERVER
|
||||
TRANSACTIONALSERVER
|
||||
SYNCSERVER
|
||||
SYSLOGSERVER
|
||||
WUXSERVER
|
||||
|
|
@ -2837,7 +2836,6 @@ sub get_server_name {
|
|||
return "ICMPSERVER" if ($server_type eq ICMPSERVER);
|
||||
return "SNMPSERVER" if ($server_type eq SNMPSERVER);
|
||||
return "SATELLITESERVER" if ($server_type eq SATELLITESERVER);
|
||||
return "TRANSACTIONALSERVER" if ($server_type eq TRANSACTIONALSERVER);
|
||||
return "MFSERVER" if ($server_type eq MFSERVER);
|
||||
return "SYNCSERVER" if ($server_type eq SYNCSERVER);
|
||||
return "WUXSERVER" if ($server_type eq WUXSERVER);
|
||||
|
|
|
|||
Loading…
Reference in New Issue