tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP NCM

Browse Source
This commit is contained in:
fbsanchez 2021-10-11 20:42:43 +02:00
parent ef42348807
commit d2f5a04583
5 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pandora_console/extras/mr/50.sql
View File

@ -53,6 +53,7 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` (
`updated_at` bigint(20) NOT NULL default 0, `updated_at` bigint(20) NOT NULL default 0,
`config_backup_id` bigint(20) UNSIGNED DEFAULT NULL, `config_backup_id` bigint(20) UNSIGNED DEFAULT NULL,
`id_template` bigint(20) unsigned, `id_template` bigint(20) unsigned,
`execute_type` int(2) UNSIGNED NOT NULL default 0,
`execute` int(2) UNSIGNED NOT NULL default 0, `execute` int(2) UNSIGNED NOT NULL default 0,
PRIMARY KEY (`id_agent`), PRIMARY KEY (`id_agent`),
FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE,

1
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -4139,6 +4139,7 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` (
`updated_at` bigint(20) NOT NULL default 0, `updated_at` bigint(20) NOT NULL default 0,
`config_backup_id` bigint(20) UNSIGNED DEFAULT NULL, `config_backup_id` bigint(20) UNSIGNED DEFAULT NULL,
`id_template` bigint(20) unsigned, `id_template` bigint(20) unsigned,
`execute_type` int(2) UNSIGNED NOT NULL default 0,
`execute` int(2) UNSIGNED NOT NULL default 0, `execute` int(2) UNSIGNED NOT NULL default 0,
PRIMARY KEY (`id_agent`), PRIMARY KEY (`id_agent`),
FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE,

1
pandora_console/pandoradb.sql
View File

@ -4075,6 +4075,7 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` (
`updated_at` bigint(20) NOT NULL default 0, `updated_at` bigint(20) NOT NULL default 0,
`config_backup_id` bigint(20) UNSIGNED DEFAULT NULL, `config_backup_id` bigint(20) UNSIGNED DEFAULT NULL,
`id_template` bigint(20) unsigned, `id_template` bigint(20) unsigned,
`execute_type` int(2) UNSIGNED NOT NULL default 0,
`execute` int(2) UNSIGNED NOT NULL default 0, `execute` int(2) UNSIGNED NOT NULL default 0,
PRIMARY KEY (`id_agent`), PRIMARY KEY (`id_agent`),
FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE,

9
pandora_server/lib/PandoraFMS/Config.pm
View File

@ -562,6 +562,9 @@ sub pandora_load_config {
$pa_config->{"alertserver_threads"} = 1; # 7.0 756 $pa_config->{"alertserver_threads"} = 1; # 7.0 756
$pa_config->{"alertserver_warn"} = 180; # 7.0 756 $pa_config->{"alertserver_warn"} = 180; # 7.0 756
$pa_config->{'ncmserver'} = 0; # 7.0 758
$pa_config->{'ncm_threads'} = 1; # 7.0 758
# Check for UID0 # Check for UID0
if ($pa_config->{"quiet"} != 0){ if ($pa_config->{"quiet"} != 0){
if ($> == 0){ if ($> == 0){
@ -1278,6 +1281,12 @@ sub pandora_load_config {
elsif ($parametro =~ m/^alertserver_warn\s+([0-9]*)/i) { elsif ($parametro =~ m/^alertserver_warn\s+([0-9]*)/i) {
$pa_config->{'alertserver_warn'}= clean_blank($1); $pa_config->{'alertserver_warn'}= clean_blank($1);
} }
elsif ($parametro =~ m/^ncmserver\s+([0-9]*)/i){
$pa_config->{'ncmserver'}= clean_blank($1);
}
elsif ($parametro =~ m/^ncm_threads\s+([0-9]*)/i) {
$pa_config->{'ncm_threads'}= clean_blank($1);
}
# Pandora HA extra # Pandora HA extra
elsif ($parametro =~ m/^ha_file\s(.*)/i) { elsif ($parametro =~ m/^ha_file\s(.*)/i) {

2
pandora_server/lib/PandoraFMS/Tools.pm
View File

@ -77,6 +77,7 @@ our @EXPORT = qw(
WUXSERVER WUXSERVER
PROVISIONINGSERVER PROVISIONINGSERVER
MIGRATIONSERVER MIGRATIONSERVER
NCMSERVER
METACONSOLE_LICENSE METACONSOLE_LICENSE
OFFLINE_LICENSE OFFLINE_LICENSE
DISCOVERY_HOSTDEVICES DISCOVERY_HOSTDEVICES
@ -191,6 +192,7 @@ use constant SYSLOGSERVER => 18;
use constant PROVISIONINGSERVER => 19; use constant PROVISIONINGSERVER => 19;
use constant MIGRATIONSERVER => 20; use constant MIGRATIONSERVER => 20;
use constant ALERTSERVER => 21; use constant ALERTSERVER => 21;
use constant NCMSERVER => 23;
# Module status # Module status
use constant MODULE_NORMAL => 0; use constant MODULE_NORMAL => 0;