Commit Graph

624 Commits

Author SHA1 Message Date
Daniel Rodriguez aa2eb08edb Merge branch 'ent-fix-snmp-interfaces-wizard' into 'develop'
Fixed SNMP interfaces wizard against 32bit counter devices.

See merge request artica/pandorafms!4348
2021-10-18 08:33:17 +00:00
Daniel Rodriguez 69216e1bcf Merge branch 'ent-8056-12473-Funcion-get-magic-quotes-gpc-hace-fallar-snmp-browser-para-PHP-7-4-o-superior' into 'develop'
removed deprecated get_magic_quotes_gpc function and dependent code

See merge request artica/pandorafms!4439
2021-10-06 10:30:58 +00:00
alejandro.campos@artica.es c08806374e removed deprecated get_magic_quotes_gpc function and dependent code 2021-10-04 17:37:06 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola
Conflicts:
	pandora_console/install.php
2021-09-29 13:47:10 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Daniel Rodriguez b02ecc7cae Merge branch 'ent-7473-11796-mala-representacion-de-percentil-en-graficas-personalizadas' into 'develop'
fixed error with percentiles in graphs

See merge request artica/pandorafms!4312
2021-09-21 13:18:18 +00:00
Jose Gonzalez 1bba211086 Fix issue with redeclaration of functions_metaconsole.php 2021-08-18 15:07:34 +02:00
Junichi Satoh cadaca669f Fixed SNMP interfaces wizard against 32bit counter devices. 2021-08-10 12:08:28 +09:00
marcos 2494db3ff0 fixed error with percentiles in graphs 2021-07-20 10:18:08 +02:00
fbsanchez 0cec3afba0 Deactivated nodes if not unified 2021-07-19 13:47:43 +02:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez 36f6ad4ee2 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios
Conflicts:
	pandora_console/include/styles/meta_dashboards.css
2021-06-28 10:37:49 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
2021-06-14 17:37:01 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs.
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
Daniel Rodriguez 44ea35bb69 Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop'
Email test working with data in text fields

See merge request artica/pandorafms!4090
2021-05-26 13:30:36 +00:00
Daniel Barbero Martin a0982cd260 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/godmode/users/profile_list.php
2021-05-18 08:39:06 +02:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Calvo 6ad371e4ab Email test working with data in text fields 2021-04-29 16:04:51 +02:00
Daniel Barbero Martin c28ea4cc9a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 08:40:58 +02:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop'
SAML login in mobile console

See merge request artica/pandorafms!3733
2021-04-14 07:39:29 +00:00
Daniel Barbero Martin aa31ed8f58 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-13 08:34:05 +02:00
Daniel Barbero Martin fcf449439b WIP command center 2021-04-07 12:43:04 +02:00
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-04-07 10:28:44 +02:00
Daniel Barbero Martin 01f801cb4f fixed minor error 2021-03-30 17:49:15 +02:00
fbsanchez a3e571ff50 Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect
Conflicts:
	pandora_console/godmode/users/user_list.php
2021-03-26 13:52:01 +01:00
Daniel Rodriguez 2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
2021-03-10 15:56:15 +00:00
Jose Gonzalez f0dd360786 Fixed merge 2021-03-09 12:56:59 +01:00
alejandro.campos@artica.es 0a8c478c47 visual fixes in agent view graphs 2021-03-08 17:48:59 +01:00
Daniel Rodriguez da15dfc69c Merge branch 'ent-5347-Mensaje-de-aviso-de-información-actualizada-erróneo-al-cambiar-el-idioma' into 'develop'
Ent 5347 mensaje de aviso de información actualizada erróneo al cambiar el idioma

See merge request artica/pandorafms!3698
2021-03-01 10:41:39 +00:00
fbsanchez 40e97f6cf6 Removed warnings 2021-02-09 10:25:08 +01:00
fbsanchez e711239c69 Added port, limited base OID (default) removed timeout (browser) capturing error to message 2021-02-08 17:42:41 +01:00
fbsanchez 5a38d31a6d Wizard (interfaces) backend performance improved 2021-02-04 13:11:47 +01:00
fbsanchez 0ddc1929fa multiple fixes 2021-02-02 11:25:26 +01:00
Jose Gonzalez 93a4d92a72 Modified line for solve linter error 2021-01-18 14:56:36 +01:00
alejandro-campos 366d02f203 Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3 2021-01-14 09:22:06 +01:00
fbsanchez 3eb4af5fd7 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil
Conflicts:
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
2021-01-07 10:59:02 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
2020-12-23 06:48:22 +01:00
fbsanchez 025288d9fe Fixes on VC navigation (mobile) 2020-12-21 18:10:46 +01:00
daniel 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados'
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
2020-12-14 11:10:35 +01:00
Daniel Maya 7ec1978f41 Fixed update_user 2020-12-09 11:48:32 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
fbsanchez 8bcbe0ab77 Fixed agent details in MC 2020-11-16 19:16:25 +01:00
Daniel Rodriguez 83233b6192 Merge branch 'ent-6485-bug-en-la-recursion-de-grupos-del-item-agents-modules-de-informes' into 'develop'
groups_get_children and propagate update

See merge request artica/pandorafms!3545
2020-10-29 12:36:49 +01:00