From 8c40b6a1d0d392dc1396b5f709ed1f619f5b7cf5 Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 16 Dec 2016 12:26:35 +0100 Subject: [PATCH 01/12] fixed error Function does not exist --- pandora_console/include/db/mysql.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/include/db/mysql.php b/pandora_console/include/db/mysql.php index 86cf8387d4..23aa78e434 100644 --- a/pandora_console/include/db/mysql.php +++ b/pandora_console/include/db/mysql.php @@ -1191,7 +1191,7 @@ function mysql_db_get_type_field_table($table, $field) { if ($config["mysqli"] === true) { $result = mysqli_query($config['dbconnection'], 'SELECT parameters FROM ' . $table); - return mysqli_field_type($result, $field); + return mysqli_fetch_field_direct($result, $field); } else { $result = mysql_query('SELECT parameters FROM ' . $table); From 7056de80704e95e02ab4edb898183b89f01bfbab Mon Sep 17 00:00:00 2001 From: daniel Date: Fri, 16 Dec 2016 12:47:37 +0100 Subject: [PATCH 02/12] fixed minor error --- .../godmode/agentes/module_manager_editor_common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora_console/godmode/agentes/module_manager_editor_common.php b/pandora_console/godmode/agentes/module_manager_editor_common.php index 4ac306c7df..aac1c5d6a5 100644 --- a/pandora_console/godmode/agentes/module_manager_editor_common.php +++ b/pandora_console/godmode/agentes/module_manager_editor_common.php @@ -282,7 +282,7 @@ if (!modules_is_string_type($id_module_type) || $edit) { $table_simple->colspan[4][2] = 2; $table_simple->rowspan[4][2] = 3; } -$table_simple->data[4][0] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true); +$table_simple->data[5][0] = __('Critical status').' ' . ui_print_help_icon ('critical_status', true); if (!modules_is_string_type($id_module_type) || $edit) { $table_simple->data[5][1] .= ''.__('Min. ').''; $table_simple->data[5][1] .= html_print_input_text ('min_critical', $min_critical, '', 10, 255, true, From 4e81c4c21b10425c993b27c8228fdd3a4f369502 Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Fri, 16 Dec 2016 14:08:55 +0100 Subject: [PATCH 03/12] Added some things to agents/modules report. --- .../godmode/reporting/reporting_builder.item_editor.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index dd60622434..b6a129b6f8 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1022,7 +1022,7 @@ You can of course remove the warnings, that's why we include the source and do n } } } - html_print_select($agents, 'id_agents[]', $agents_id, $script = '', "", 0, false, true, true, '', false, "min-width: 180px"); + html_print_select($agents, 'id_agents2[]', $agents_id, $script = '', "", 0, false, true, true, '', false, "min-width: 180px"); ?> @@ -1875,6 +1875,7 @@ $(document).ready (function () { }, function (data, status) { $("#id_agents").html(''); + $("#id_agents2").html(''); jQuery.each (data, function (id, value) { // Remove keys_prefix from the index id = id.substring(1); @@ -1883,6 +1884,7 @@ $(document).ready (function () { .attr ("value", value["id_agente"]) .html (value["nombre"]); $("#id_agents").append (option); + $("#id_agents2").append (option); }); }, "json" @@ -1912,13 +1914,13 @@ $(document).ready (function () { } ); - $("#id_agents").change ( + $("#id_agents2").change ( function () { jQuery.post ("ajax.php", {"page" : "operation/agentes/ver_agente", "get_modules_group_json" : 1, "id_module_group" : $("#combo_modulegroup").val(), - "id_agents" : $("#id_agents").val() + "id_agents" : $("#id_agents2").val() }, function (data, status) { $("#module").html(''); From 5930edd610bcc2283c577510432f3b365710545b Mon Sep 17 00:00:00 2001 From: artica Date: Sat, 17 Dec 2016 00:01:14 +0100 Subject: [PATCH 04/12] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index a0b2110fbd..b8fe0829e8 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0dev-161216 +Version: 7.0dev-161217 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index 8bdae2ba54..aa856ee655 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0dev-161216" +pandora_version="7.0dev-161217" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 9abbb91ac1..03ccb79496 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0dev'; -use constant AGENT_BUILD => '161216'; +use constant AGENT_BUILD => '161217'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index b0b8396b17..363b58c90b 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0dev -%define release 161216 +%define release 161217 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 6370018f8c..8a683ba48e 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0dev -%define release 161216 +%define release 161217 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index 30b82601d7..ade625bf8e 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0dev" -PI_BUILD="161216" +PI_BUILD="161217" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 63b006699d..3daad7ef72 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{161216} +{161217} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index d1e9afd289..dbd02cbe63 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0dev(Build 161216)") +#define PANDORA_VERSION ("7.0dev(Build 161217)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 8ee1d619d4..838700e6b7 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0dev(Build 161216))" + VALUE "ProductVersion", "(7.0dev(Build 161217))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index 1fd64acf57..cdf7052064 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0dev-161216 +Version: 7.0dev-161217 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index bf8087bf48..314a21fe68 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0dev-161216" +pandora_version="7.0dev-161217" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 02beb41bb9..20595caf16 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC161216'; +$build_version = 'PC161217'; $pandora_version = 'v7.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index 2d198a606a..d16c0a3323 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Sun, 18 Dec 2016 00:01:11 +0100 Subject: [PATCH 05/12] Auto-updated build strings. --- pandora_agents/unix/DEBIAN/control | 2 +- pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +- pandora_agents/unix/pandora_agent | 2 +- pandora_agents/unix/pandora_agent.redhat.spec | 2 +- pandora_agents/unix/pandora_agent.spec | 2 +- pandora_agents/unix/pandora_agent_installer | 2 +- pandora_agents/win32/installer/pandora.mpi | 2 +- pandora_agents/win32/pandora.cc | 2 +- pandora_agents/win32/versioninfo.rc | 2 +- pandora_console/DEBIAN/control | 2 +- pandora_console/DEBIAN/make_deb_package.sh | 2 +- pandora_console/include/config_process.php | 2 +- pandora_console/install.php | 2 +- pandora_console/pandora_console.redhat.spec | 2 +- pandora_console/pandora_console.spec | 2 +- pandora_console/pandoradb.data.oracle.sql | 2 +- pandora_server/DEBIAN/control | 2 +- pandora_server/DEBIAN/make_deb_package.sh | 2 +- pandora_server/lib/PandoraFMS/Config.pm | 2 +- pandora_server/pandora_server.redhat.spec | 2 +- pandora_server/pandora_server.spec | 2 +- pandora_server/pandora_server_installer | 2 +- pandora_server/util/pandora_db.pl | 2 +- pandora_server/util/pandora_manage.pl | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control index b8fe0829e8..27a3453c03 100644 --- a/pandora_agents/unix/DEBIAN/control +++ b/pandora_agents/unix/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-agent-unix -Version: 7.0dev-161217 +Version: 7.0dev-161218 Architecture: all Priority: optional Section: admin diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh index aa856ee655..a6f28ba793 100644 --- a/pandora_agents/unix/DEBIAN/make_deb_package.sh +++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0dev-161217" +pandora_version="7.0dev-161218" echo "Test if you has the tools for to make the packages." whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent index 03ccb79496..4f537ad4d0 100644 --- a/pandora_agents/unix/pandora_agent +++ b/pandora_agents/unix/pandora_agent @@ -41,7 +41,7 @@ my $Sem = undef; my $ThreadSem = undef; use constant AGENT_VERSION => '7.0dev'; -use constant AGENT_BUILD => '161217'; +use constant AGENT_BUILD => '161218'; # Agent log default file size maximum and instances use constant DEFAULT_MAX_LOG_SIZE => 600000; diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec index 363b58c90b..d09cc1da57 100644 --- a/pandora_agents/unix/pandora_agent.redhat.spec +++ b/pandora_agents/unix/pandora_agent.redhat.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0dev -%define release 161217 +%define release 161218 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec index 8a683ba48e..cd74c18582 100644 --- a/pandora_agents/unix/pandora_agent.spec +++ b/pandora_agents/unix/pandora_agent.spec @@ -3,7 +3,7 @@ # %define name pandorafms_agent_unix %define version 7.0dev -%define release 161217 +%define release 161218 Summary: Pandora FMS Linux agent, PERL version Name: %{name} diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer index ade625bf8e..44d4a1c785 100644 --- a/pandora_agents/unix/pandora_agent_installer +++ b/pandora_agents/unix/pandora_agent_installer @@ -10,7 +10,7 @@ # ********************************************************************** PI_VERSION="7.0dev" -PI_BUILD="161217" +PI_BUILD="161218" OS_NAME=`uname -s` FORCE=0 diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi index 3daad7ef72..bc78846467 100644 --- a/pandora_agents/win32/installer/pandora.mpi +++ b/pandora_agents/win32/installer/pandora.mpi @@ -186,7 +186,7 @@ UpgradeApplicationID {} Version -{161217} +{161218} ViewReadme {Yes} diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc index dbd02cbe63..b60dbcdf24 100644 --- a/pandora_agents/win32/pandora.cc +++ b/pandora_agents/win32/pandora.cc @@ -30,7 +30,7 @@ using namespace Pandora; using namespace Pandora_Strutils; #define PATH_SIZE _MAX_PATH+1 -#define PANDORA_VERSION ("7.0dev(Build 161217)") +#define PANDORA_VERSION ("7.0dev(Build 161218)") string pandora_path; string pandora_dir; diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc index 838700e6b7..952dedd477 100644 --- a/pandora_agents/win32/versioninfo.rc +++ b/pandora_agents/win32/versioninfo.rc @@ -11,7 +11,7 @@ BEGIN VALUE "LegalCopyright", "Artica ST" VALUE "OriginalFilename", "PandoraAgent.exe" VALUE "ProductName", "Pandora FMS Windows Agent" - VALUE "ProductVersion", "(7.0dev(Build 161217))" + VALUE "ProductVersion", "(7.0dev(Build 161218))" VALUE "FileVersion", "1.0.0.0" END END diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control index cdf7052064..8361645d9f 100644 --- a/pandora_console/DEBIAN/control +++ b/pandora_console/DEBIAN/control @@ -1,5 +1,5 @@ package: pandorafms-console -Version: 7.0dev-161217 +Version: 7.0dev-161218 Architecture: all Priority: optional Section: admin diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh index 314a21fe68..54c58d3809 100644 --- a/pandora_console/DEBIAN/make_deb_package.sh +++ b/pandora_console/DEBIAN/make_deb_package.sh @@ -14,7 +14,7 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -pandora_version="7.0dev-161217" +pandora_version="7.0dev-161218" package_pear=0 package_pandora=1 diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 20595caf16..5a52257c84 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -22,7 +22,7 @@ /** * Pandora build version and version */ -$build_version = 'PC161217'; +$build_version = 'PC161218'; $pandora_version = 'v7.0dev'; // Do not overwrite default timezone set if defined. diff --git a/pandora_console/install.php b/pandora_console/install.php index d16c0a3323..17ec91a838 100644 --- a/pandora_console/install.php +++ b/pandora_console/install.php @@ -71,7 +71,7 @@
Date: Mon, 19 Dec 2016 09:40:11 +0100 Subject: [PATCH 06/12] fixed minor error SLA dinamic (cherry picked from commit 0200fa82631722a5c3a2dca62a6c0af2f3058ecb) --- .../reporting_builder.item_editor.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index b6a129b6f8..7957b141e7 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -238,24 +238,6 @@ switch ($action) { break; case 'SLA': - case 'SLA_weekly': - case 'SLA_monthly': - $description = $item['description']; - $only_display_wrong = $item['only_display_wrong']; - $monday = $item['monday']; - $tuesday = $item['tuesday']; - $wednesday = $item['wednesday']; - $thursday = $item['thursday']; - $friday = $item['friday']; - $saturday = $item['saturday']; - $sunday = $item['sunday']; - $time_from = $item['time_from']; - $time_to = $item['time_to']; - $show_graph = $item['show_graph']; - // 'top_n' filed will be reused for SLA sort option - $sla_sorted_by = $item['top_n']; - break; - case 'SLA_weekly': case 'SLA_monthly': case 'SLA_hourly': @@ -274,6 +256,7 @@ switch ($action) { $show_graph = $item['show_graph']; // 'top_n' filed will be reused for SLA sort option $sla_sorted_by = $item['top_n']; + $period = $item['period']; break; case 'SLA_services': From 617d8812365e02db72e0f1433c7ac66c9d93a4ae Mon Sep 17 00:00:00 2001 From: cesar991 Date: Mon, 19 Dec 2016 11:51:43 +0100 Subject: [PATCH 07/12] Test to check the views of pandora --- tests/console/Views.py | 315 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 315 insertions(+) create mode 100644 tests/console/Views.py diff --git a/tests/console/Views.py b/tests/console/Views.py new file mode 100644 index 0000000000..d8ee1b45b3 --- /dev/null +++ b/tests/console/Views.py @@ -0,0 +1,315 @@ +# -*- coding: utf-8 -*- +from include.common_classes_60 import PandoraWebDriverTestCase +from include.common_functions_60 import login, is_element_present, click_menu_element, detect_and_pass_all_wizards, logout, gen_random_string, is_enterprise +from selenium import webdriver +from selenium.webdriver.common.by import By +from selenium.webdriver.common.keys import Keys +from selenium.webdriver.support.ui import Select +from selenium.common.exceptions import NoSuchElementException +from selenium.common.exceptions import NoAlertPresentException +from selenium.webdriver.remote.webelement import WebElement +import unittest2, time, re + +class viewAppear(PandoraWebDriverTestCase): + + test_name = u'test menu' + tickets_associated = [] + + + def test_views_appear(self): + + u""" + This test do login and check one by one that all views appear. + """ + + driver = self.driver + self.login() + detect_and_pass_all_wizards(driver) + + click_menu_element(driver,"Tactical view") + time.sleep(2) + self.assertEqual("Status report" in driver.page_source,True) + click_menu_element(driver,"Group view") + time.sleep(2) + self.assertEqual("Summary of the status groups" in driver.page_source,True) + time.sleep(2) + click_menu_element(driver,"Tree view") + time.sleep(2) + self.assertEqual("Tree search" in driver.page_source,True) + time.sleep(2) + click_menu_element(driver,"Agent detail") + time.sleep(2) + self.assertEqual("Description" in driver.page_source,True) + click_menu_element(driver,"Monitor detail") + time.sleep(2) + self.assertEqual("Monitor status" in driver.page_source,True) + click_menu_element(driver,"Alert details") + time.sleep(2) + self.assertEqual("Alert control filter" in driver.page_source,True) + click_menu_element(driver,"Agent/Alert view") + time.sleep(2) + self.assertEqual("Agents / Alert templates" in driver.page_source,True) + click_menu_element(driver,"Agent/Module view") + click_menu_element(driver,"Module groups") + click_menu_element(driver,"Real-time graphs") + time.sleep(2) + self.assertEqual("Clear graph" in driver.page_source,True) + click_menu_element(driver,"Inventory") + click_menu_element(driver,"Log viewer") + time.sleep(2) + self.assertEqual("Export to CSV" in driver.page_source,True) + click_menu_element(driver,"SNMP console") + click_menu_element(driver,"SNMP browser") + time.sleep(2) + self.assertEqual("Starting OID" in driver.page_source,True) + click_menu_element(driver,"SNMP trap editor") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"MIB uploader") + time.sleep(2) + self.assertEqual("Index of attachment/mibs" in driver.page_source,True) + click_menu_element(driver,"SNMP filters") + click_menu_element(driver,"SNMP trap generator") + time.sleep(2) + self.assertEqual("Host address" in driver.page_source,True) + click_menu_element(driver,"Network map") + time.sleep(2) + self.assertEqual("There are no network maps defined yet" in driver.page_source,True) + click_menu_element(driver,"Network console") + click_menu_element(driver,"Services") + click_menu_element(driver,"Visual console") + click_menu_element(driver,"Custom reports") + time.sleep(2) + self.assertEqual("Create report" in driver.page_source,True) + click_menu_element(driver,"Custom graphs") + time.sleep(2) + self.assertEqual("Total items" in driver.page_source,True) + click_menu_element(driver,"Main dashboard") + click_menu_element(driver,"Copy dashboard") + time.sleep(2) + self.assertEqual("Replicate Dashboard" in driver.page_source,True) + click_menu_element(driver,"Custom SQL") + time.sleep(2) + self.assertEqual("Create custom SQL" in driver.page_source,True) + click_menu_element(driver,"View events") + time.sleep(2) + self.assertEqual("Event control filter" in driver.page_source,True) + click_menu_element(driver,"Statistics") + click_menu_element(driver,"Edit my user") + time.sleep(2) + self.assertEqual("Password confirmation" in driver.page_source,True) + click_menu_element(driver,"WebChat") + time.sleep(2) + self.assertEqual("Send message" in driver.page_source,True) + click_menu_element(driver,"List of Incidents") + click_menu_element(driver,"Statistics") + click_menu_element(driver,"Message list") + time.sleep(2) + self.assertEqual("Create message" in driver.page_source,True) + click_menu_element(driver,"New message") + click_menu_element(driver,"Connected users") + time.sleep(2) + click_menu_element(driver,"Export data") + time.sleep(2) + self.assertEqual("Source agent" in driver.page_source,True) + click_menu_element(driver,"Scheduled downtime") + time.sleep(2) + self.assertEqual("Execution type" in driver.page_source,True) + click_menu_element(driver,"Recon view") + time.sleep(2) + self.assertEqual("Task name" in driver.page_source,True) + click_menu_element(driver,"File repository") + click_menu_element(driver,"IPAM") + time.sleep(2) + self.assertEqual("IPAM" in driver.page_source,True) + click_menu_element(driver,"Manage agents") + time.sleep(2) + self.assertEqual("Create agent" in driver.page_source,True) + click_menu_element(driver,"Custom fields") + time.sleep(2) + self.assertEqual("Create field" in driver.page_source,True) + click_menu_element(driver,"Component groups") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Module categories") + time.sleep(2) + self.assertEqual("Create category" in driver.page_source,True) + click_menu_element(driver,"Module types") + click_menu_element(driver,"Module groups") + click_menu_element(driver,"Insert Data") + click_menu_element(driver,"Resource exporting") + time.sleep(2) + self.assertEqual("Export" in driver.page_source,True) + click_menu_element(driver,"Resource registration") + time.sleep(2) + self.assertEqual("Upload" in driver.page_source,True) + click_menu_element(driver,"Manage agent groups") + time.sleep(2) + self.assertEqual("Create group" in driver.page_source,True) + click_menu_element(driver,"Module tags") + time.sleep(2) + self.assertEqual("Create tag" in driver.page_source,True) + click_menu_element(driver,"Enterprise ACL Setup") + time.sleep(2) + self.assertEqual("Add" in driver.page_source,True) + click_menu_element(driver,"Manage users") + time.sleep(2) + self.assertEqual("Create user" in driver.page_source,True) + click_menu_element(driver,"Profile management") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Connected users") + time.sleep(2) + click_menu_element(driver,"Network components") + time.sleep(2) + self.assertEqual("Free Search" in driver.page_source,True) + click_menu_element(driver,"Local components") + time.sleep(2) + self.assertEqual("Search" in driver.page_source,True) + click_menu_element(driver,"Module templates") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Inventory modules") + click_menu_element(driver,"Manage policies") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Collections") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Duplicate config") + time.sleep(2) + self.assertEqual("Replicate configuration" in driver.page_source,True) + click_menu_element(driver,"Agent operations") + time.sleep(2) + self.assertEqual("In order to perform massive operations" in driver.page_source,True) + click_menu_element(driver,"Module operations") + click_menu_element(driver,"Plugin operations") + click_menu_element(driver,"User operations") + time.sleep(2) + click_menu_element(driver,"Alert operations") + click_menu_element(driver,"Policies operations") + click_menu_element(driver,"SNMP operations") + click_menu_element(driver,"Satellite Operations") + click_menu_element(driver,"List of Alerts") + time.sleep(2) + self.assertEqual("Alert control filter" in driver.page_source,True) + click_menu_element(driver,"Templates") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Actions") + click_menu_element(driver,"Commands") + click_menu_element(driver,"List of special days") + click_menu_element(driver,"Event alerts") + click_menu_element(driver,"SNMP alerts") + time.sleep(2) + self.assertEqual("Maintenance" in driver.page_source,True) + click_menu_element(driver,"Event filters") + time.sleep(2) + self.assertEqual("Create new filter" in driver.page_source,True) + click_menu_element(driver,"Custom events") + time.sleep(2) + self.assertEqual("Update" in driver.page_source,True) + click_menu_element(driver,"Event responses") + time.sleep(2) + self.assertEqual("Create response" in driver.page_source,True) + click_menu_element(driver,"Manage servers") + time.sleep(2) + self.assertEqual("Saga" in driver.page_source,True) + click_menu_element(driver,"Recon task") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Plugins") + time.sleep(2) + self.assertEqual("Name" in driver.page_source,True) + click_menu_element(driver,"Recon script") + click_menu_element(driver,"Export targets") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Register Plugin") + time.sleep(2) + self.assertEqual("Upload" in driver.page_source,True) + click_menu_element(driver,"Cron jobs") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"General Setup") + time.sleep(2) + self.assertEqual("Pandora FMS Language settings" in driver.page_source,True) + click_menu_element(driver,"Password policy") + click_menu_element(driver,"Enterprise") + click_menu_element(driver,"Historical database") + click_menu_element(driver,"Log Collector") + time.sleep(2) + click_menu_element(driver,"Authentication") + click_menu_element(driver,"Performance") + click_menu_element(driver,"Visual styles") + time.sleep(2) + self.assertEqual("Behaviour configuration" in driver.page_source,True) + click_menu_element(driver,"eHorus") + time.sleep(2) + self.assertEqual("Enable eHorus" in driver.page_source,True) + click_menu_element(driver,"Edit OS") + click_menu_element(driver,"Licence") + time.sleep(2) + self.assertEqual("Request new licence" in driver.page_source,True) + click_menu_element(driver,"Skins") + click_menu_element(driver,"Translate string") + time.sleep(2) + self.assertEqual("Search" in driver.page_source,True) + click_menu_element(driver,"System audit log") + time.sleep(2) + self.assertEqual("User" in driver.page_source,True) + click_menu_element(driver,"Links") + time.sleep(2) + self.assertEqual("Link name" in driver.page_source,True) + click_menu_element(driver,"Diagnostic info") + click_menu_element(driver,"Site news") + time.sleep(2) + self.assertEqual("Subject" in driver.page_source,True) + click_menu_element(driver,"File manager") + time.sleep(2) + self.assertEqual("Index of images" in driver.page_source,True) + click_menu_element(driver,"DB information") + time.sleep(2) + self.assertEqual("Module data received" in driver.page_source,True) + click_menu_element(driver,"Database purge") + click_menu_element(driver,"Database debug") + time.sleep(2) + click_menu_element(driver,"Database audit") + click_menu_element(driver,"Database events") + click_menu_element(driver,"DB Status") + time.sleep(2) + self.assertEqual("DB settings" in driver.page_source,True) + click_menu_element(driver,"DB interface") + time.sleep(2) + self.assertEqual("Run SQL query" in driver.page_source,True) + click_menu_element(driver,"API checker") + time.sleep(2) + self.assertEqual("IP" in driver.page_source,True) + click_menu_element(driver,"System Info") + time.sleep(2) + self.assertEqual("Generate file" in driver.page_source,True) + click_menu_element(driver,"Extension uploader") + click_menu_element(driver,"File repository manager") + time.sleep(2) + self.assertEqual("Groups" in driver.page_source,True) + click_menu_element(driver,"System logfiles") + click_menu_element(driver,"Backup") + time.sleep(2) + self.assertEqual("Description" in driver.page_source,True) + click_menu_element(driver,"CSV import") + time.sleep(2) + self.assertEqual("Upload file" in driver.page_source,True) + click_menu_element(driver,"CSV import group") + time.sleep(2) + self.assertEqual("Upload file" in driver.page_source,True) + click_menu_element(driver,"IPAM") + time.sleep(2) + self.assertEqual("Create" in driver.page_source,True) + click_menu_element(driver,"Update Manager offline") + click_menu_element(driver,"Update Manager online") + time.sleep(2) + self.assertEqual("The last version of package installed is:" in driver.page_source,True) + click_menu_element(driver,"Update Manager options") + +if __name__ == "__main__": + unittest2.main() From 0c8f5ad8e3ad415918a9504202f4f8709cf76332 Mon Sep 17 00:00:00 2001 From: cesar991 Date: Mon, 19 Dec 2016 12:25:09 +0100 Subject: [PATCH 08/12] Add @is_enterprise in Views.py --- tests/console/Views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/console/Views.py b/tests/console/Views.py index d8ee1b45b3..67596de677 100644 --- a/tests/console/Views.py +++ b/tests/console/Views.py @@ -15,7 +15,7 @@ class viewAppear(PandoraWebDriverTestCase): test_name = u'test menu' tickets_associated = [] - + @is_enterprise def test_views_appear(self): u""" From 94191afe7de4cab5693552d1f917999ba07e3e5f Mon Sep 17 00:00:00 2001 From: m-lopez-f Date: Mon, 19 Dec 2016 12:44:07 +0100 Subject: [PATCH 09/12] Remove debug trace --- .../godmode/reporting/reporting_builder.item_editor.php | 1 - 1 file changed, 1 deletion(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 7957b141e7..2aa673b8f2 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1349,7 +1349,6 @@ You can of course remove the warnings, that's why we include the source and do n Date: Mon, 19 Dec 2016 13:06:07 +0100 Subject: [PATCH 10/12] Fixed agents/modules report. Ticket #4183 --- .../godmode/reporting/reporting_builder.item_editor.php | 1 + pandora_console/godmode/reporting/reporting_builder.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php index 7957b141e7..af70e2928c 100755 --- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php +++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php @@ -1859,6 +1859,7 @@ $(document).ready (function () { function (data, status) { $("#id_agents").html(''); $("#id_agents2").html(''); + $("#module").html(''); jQuery.each (data, function (id, value) { // Remove keys_prefix from the index id = id.substring(1); diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php index fcf18d73c2..c46d310ff9 100755 --- a/pandora_console/godmode/reporting/reporting_builder.php +++ b/pandora_console/godmode/reporting/reporting_builder.php @@ -950,7 +950,7 @@ switch ($action) { $good_format = true; break; case 'agent_module': - $es['id_agents'] = get_parameter('id_agents'); + $es['id_agents'] = get_parameter('id_agents2'); $es['module'] = get_parameter('module', ""); $values['external_source'] = json_encode($es); $good_format = true; From c949a7eef5569c40f241b217ebad41d8066343bc Mon Sep 17 00:00:00 2001 From: fbsanchez Date: Mon, 19 Dec 2016 13:31:06 +0100 Subject: [PATCH 11/12] Text and images for Transactional System --- .../general/firts_task/transactional_list.php | 4 ++- pandora_console/images/transactional_map.png | Bin 0 -> 556 bytes .../images/transactional_map_white.png | Bin 0 -> 443 bytes pandora_console/include/constants.php | 29 +++++++++--------- pandora_console/include/functions_servers.php | 5 +++ 5 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 pandora_console/images/transactional_map.png create mode 100644 pandora_console/images/transactional_map_white.png diff --git a/pandora_console/general/firts_task/transactional_list.php b/pandora_console/general/firts_task/transactional_list.php index ebe60fb7b7..f8fca1cdc1 100644 --- a/pandora_console/general/firts_task/transactional_list.php +++ b/pandora_console/general/firts_task/transactional_list.php @@ -26,7 +26,9 @@ ui_require_css_file ('firts_task');

-

+

diff --git a/pandora_console/images/transactional_map.png b/pandora_console/images/transactional_map.png new file mode 100644 index 0000000000000000000000000000000000000000..077db9940ac75d63b5b550222e13130873acd96d GIT binary patch literal 556 zcmV+{0@MA8P)`%{dyoJ01!Z^ zQb5uFKztrU4?qARs}KO<1a!guNbCd#d;lPTup(xdn-mljem;Eo@CMv0kdvTn2N2B! z#Q8`%=ff0$R2U$s#_kG$0AfUQcL0#82Vw;vRy=s{;0I)RCN#|kPz+Mkk1Kd!_MgWR zunxF11px7UEQajIX$ug)$0i35Ktv-(Ebg8F#0kJq5X2V>AAkx9G1CsFLIHTx;PAwI zs7DmgeGWGf8fJ+=D?#p^k0fUZ3S&^5Bd2MQ?gv0T5vXATvQ0p$5yWJ`7c03h9i?yj#X6`_za8&M~I18oa{fjl3OSxU`(j{iVyU5Q9A zpuu?;e+}jaK|4SuW7)g9&Lqj%d!A*=@KPA=uuIW<_+|q-%0cN&OuHQDn!N+;W*0|m zo|sYl&kICiizJKfDKmcJ=T!2j>Bf3+7)B`A2fsv7M z15AzuO(RH=1C)ILpSAm;ZZrVm`M4C#hlVFy6E;Qfp*|MCk`%$3nV<|spu-h`bODkg z1t3)jjkyFSpaPJi??VGwp4dcU0JZKt5 __('Enterprise Transactional server'))); + $server["type"] = "enterprise transactional"; + $id_modulo = 0; + break; default: $server["img"] = ''; $server["type"] = "unknown"; From cf8cdd8ae6a2f3e1df5ef02737b38be94ecf148c Mon Sep 17 00:00:00 2001 From: Arturo Gonzalez Date: Mon, 19 Dec 2016 16:35:46 +0100 Subject: [PATCH 12/12] Fixed gauge graphs warning and critical ranges. Ticket #4281 --- pandora_console/include/graphs/pandora.d3.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js index 41c3397939..b0d2ea58fc 100644 --- a/pandora_console/include/graphs/pandora.d3.js +++ b/pandora_console/include/graphs/pandora.d3.js @@ -859,7 +859,7 @@ function sunburst (recipient, data, width, height) { function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,min_critical,max_critical,font_size, height, font) { var gauges; - + var config = { size: height, @@ -880,7 +880,7 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,mi //var range = config.max - config.min; var range = config.max - config.min; - if (value != false) { + if (value !== false) { if ( min_warning > 0 ) { config.yellowZones = [{ from: min_warning, to: max_warning }]; } @@ -888,6 +888,7 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,mi config.redZones = [{ from: min_critical, to: max_critical }]; } } + gauges = new Gauge(name, config, font); gauges.render(); gauges.redraw(value); @@ -927,8 +928,7 @@ function createGauge(name, etiqueta, value, min, max, min_warning,max_warning,mi config = false; } -function createGauges(data, width, height, font_size, no_data_image, font) -{ +function createGauges(data, width, height, font_size, no_data_image, font) { var nombre,label,minimun_warning,maximun_warning,minimun_critical,maximun_critical, mininum,maxinum,valor; @@ -948,8 +948,10 @@ function createGauges(data, width, height, font_size, no_data_image, font) maximun_warning = Math.round(parseFloat( data[key].max_warning ),2); minimun_critical = Math.round(parseFloat( data[key].min_critical ),2); maximun_critical = Math.round(parseFloat( data[key].max_critical ),2); + mininum = Math.round(parseFloat(data[key].min),2); maxinum = Math.round(parseFloat(data[key].max),2); + valor = Math.round(parseFloat(data[key].value),2); if (maxinum == 0) maxinum = 100;