From 6c0e2d23de5461ffe27f0b8bbf7161e3e488d0ec Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Fri, 15 Oct 2021 13:39:23 +0200 Subject: [PATCH] updates --- pandora_console/extras/mr/50.sql | 5 ++++- .../extras/pandoradb_migrate_6.0_to_7.0.mysql.sql | 5 ++++- pandora_console/pandoradb.sql | 9 ++++++--- pandora_server/conf/pandora_server.conf.new | 6 ++++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pandora_console/extras/mr/50.sql b/pandora_console/extras/mr/50.sql index b3fc7c7d77..f28fdaae07 100644 --- a/pandora_console/extras/mr/50.sql +++ b/pandora_console/extras/mr/50.sql @@ -63,6 +63,7 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( `id_model` bigint(20) unsigned NOT NULL, `protocol` int unsigned not null default 0, `cred_key` varchar(100), + `adv_key` varchar(100), `port` int(4) unsigned default 22, `status` int(4) NOT NULL default 5, `updated_at` bigint(20) NOT NULL default 0, @@ -74,7 +75,9 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( PRIMARY KEY (`id_agent`), FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`cred_key`) REFERENCES `tcredential_store`(`identifier`) ON UPDATE CASCADE ON DELETE SET NULL, - FOREIGN KEY (`id_template`) REFERENCES `tncm_template`(`id`) ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (`id_template`) REFERENCES `tncm_template`(`id`) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (`id_vendor`) REFERENCES `tncm_vendor`(`id`) ON UPDATE CASCADE ON DELETE SET NULL, + FOREIGN KEY (`id_model`) REFERENCES `tncm_model`(`id`) ON UPDATE CASCADE ON DELETE SET NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `tncm_agent_data` ( diff --git a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql index 2ea9c08f51..38f84f85fe 100644 --- a/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql +++ b/pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql @@ -4155,6 +4155,7 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( `id_model` bigint(20) unsigned NOT NULL, `protocol` int unsigned not null default 0, `cred_key` varchar(100), + `adv_key` varchar(100), `port` int(4) unsigned default 22, `status` int(4) NOT NULL default 5, `updated_at` bigint(20) NOT NULL default 0, @@ -4166,7 +4167,9 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( PRIMARY KEY (`id_agent`), FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`cred_key`) REFERENCES `tcredential_store`(`identifier`) ON UPDATE CASCADE ON DELETE SET NULL, - FOREIGN KEY (`id_template`) REFERENCES `tncm_template`(`id`) ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (`id_template`) REFERENCES `tncm_template`(`id`) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (`id_vendor`) REFERENCES `tncm_vendor`(`id`) ON UPDATE CASCADE ON DELETE SET NULL, + FOREIGN KEY (`id_model`) REFERENCES `tncm_model`(`id`) ON UPDATE CASCADE ON DELETE SET NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- ---------------------------------------------------------------------- diff --git a/pandora_console/pandoradb.sql b/pandora_console/pandoradb.sql index 8a1faa7b85..a0b5e6dba9 100644 --- a/pandora_console/pandoradb.sql +++ b/pandora_console/pandoradb.sql @@ -4087,10 +4087,11 @@ CREATE TABLE IF NOT EXISTS `tncm_template_scripts` ( -- ---------------------------------------------------------------------- CREATE TABLE IF NOT EXISTS `tncm_agent` ( `id_agent` int(10) unsigned NOT NULL, - `id_vendor` bigint(20) unsigned NOT NULL, - `id_model` bigint(20) unsigned NOT NULL, + `id_vendor` bigint(20) unsigned, + `id_model` bigint(20) unsigned, `protocol` int unsigned not null default 0, `cred_key` varchar(100), + `adv_key` varchar(100), `port` int(4) unsigned default 22, `status` int(4) NOT NULL default 5, `updated_at` bigint(20) NOT NULL default 0, @@ -4102,7 +4103,9 @@ CREATE TABLE IF NOT EXISTS `tncm_agent` ( PRIMARY KEY (`id_agent`), FOREIGN KEY (`id_agent`) REFERENCES `tagente`(`id_agente`) ON UPDATE CASCADE ON DELETE CASCADE, FOREIGN KEY (`cred_key`) REFERENCES `tcredential_store`(`identifier`) ON UPDATE CASCADE ON DELETE SET NULL, - FOREIGN KEY (`id_template`) REFERENCES `tncm_template`(`id`) ON UPDATE CASCADE ON DELETE CASCADE + FOREIGN KEY (`id_template`) REFERENCES `tncm_template`(`id`) ON UPDATE CASCADE ON DELETE CASCADE, + FOREIGN KEY (`id_vendor`) REFERENCES `tncm_vendor`(`id`) ON UPDATE CASCADE ON DELETE SET NULL, + FOREIGN KEY (`id_model`) REFERENCES `tncm_model`(`id`) ON UPDATE CASCADE ON DELETE SET NULL ) ENGINE=InnoDB DEFAULT CHARSET=utf8; -- ---------------------------------------------------------------------- diff --git a/pandora_server/conf/pandora_server.conf.new b/pandora_server/conf/pandora_server.conf.new index 91c86c0325..12b349cc49 100644 --- a/pandora_server/conf/pandora_server.conf.new +++ b/pandora_server/conf/pandora_server.conf.new @@ -687,6 +687,12 @@ syslog_max 65535 # Address # sync_address +# Network manager configuration server (PANDORA FMS ENTERPRISE ONLY). +#ncmserver 1 + +# Threads for NCM server (PANDORA FMS ENTERPRISE ONLY). +ncmserver_threads 1 + # Pandora FMS Daemon Watchdog execution interval in seconds (PANDORA FMS ENTERPRISE ONLY). ha_interval 30