22535 Commits

Author SHA1 Message Date
Alejandro Fraguas
e174f8dda9 Merge branch 'ent-4544-bug-custom-graph-csv-export' into 'develop'
Fixed CSV custom graphs export

See merge request artica/pandorafms!2694
2019-10-03 12:59:30 +02:00
Alejandro Fraguas
a40592b041 Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
Fixed bug in list graphs view

See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
artica
21d363b21e Auto-updated build strings. 2019-10-03 00:01:09 +02:00
Tatiana Llorente
5a2ca8e65f Added all string types - #4678 2019-10-02 17:37:14 +02:00
Kike
f34d30dd39 Fixed loop on network map migration process 2019-10-02 12:38:13 +02:00
fbsanchez
8bb1e4ed2d is_numeric review, with fallback to looks_like_number 2019-10-02 11:33:43 +02:00
artica
8e204605e5 Auto-updated build strings. 2019-10-02 00:01:07 +02:00
Marcos Alconada
f1d20d56e7 Update functions_ui.php 2019-10-01 16:26:22 +02:00
marcos.alconada
a44e1feeb4 fixed error comments events 2019-10-01 16:24:02 +02:00
manuel
454750aefe Fixed bugs in metaconsole reports 2019-10-01 12:46:09 +02:00
Jose Gonzalez
f55b2ce80f Improved truncate system and solved issue 2019-10-01 11:22:25 +02:00
artica
c600f74ee2 Auto-updated build strings. 2019-10-01 00:01:06 +02:00
Jose Gonzalez
5294e2f627 Now the supervisor control all servers and not only one 2019-09-30 15:40:40 +02:00
manuel
d566da6fb1 Fixed bug in meta serialize data 2019-09-30 15:33:44 +02:00
Luis Calvo
0aa73b1a60 Added current gis location to agent gis view list 2019-09-30 14:58:44 +02:00
Tatiana Llorente
9875b7c701 Added link to go to agent view (node) from metaconsole in events view - #4720 2019-09-30 13:31:15 +02:00
Jose Gonzalez
d878958502 Added notify when Console and Server have version mismatch 2019-09-30 12:48:46 +02:00
artica
b072bb5314 Auto-updated build strings. 2019-09-30 00:01:06 +02:00
artica
7ae5a8e5be Auto-updated build strings. 2019-09-29 00:01:06 +02:00
artica
15752c10ef Auto-updated build strings. 2019-09-28 00:01:08 +02:00
Luis Calvo
1eb0b27da3 Fixed module update bug 2019-09-27 16:09:11 +02:00
Kike
dfea704154 Show instructions on mouse over 2019-09-27 14:48:45 +02:00
marcos.alconada
4c93ca3d60 fixed minor error 2019-09-27 12:07:40 +02:00
Daniel Rodriguez
03b34d9af8 Merge branch 'ent-4461-Problema-logo-integria' into 'develop'
fixed integria logo redirection in integria setup

See merge request artica/pandorafms!2768
2019-09-27 09:20:26 +02:00
alejandro-campos
5e0b7fc2b7 fixed integria logo redirection in integria setup 2019-09-27 09:07:09 +02:00
artica
dc3dd1cffa Auto-updated build strings. 2019-09-27 00:01:09 +02:00
marcos.alconada
cc18d5d1ed Fixed Error 2019-09-26 17:51:26 +02:00
Jose Gonzalez
5fdf65c440 Modified the mode of creation of agents with API 2019-09-26 17:33:51 +02:00
daniel
e7fefd5fae Merge branch 'ramita-qa-daniel-mrs' into 'develop'
fixed minor error

See merge request artica/pandorafms!2763
2019-09-26 16:50:17 +02:00
Daniel Barbero Martin
2ee725b204 fixed minor error 2019-09-26 16:43:31 +02:00
artica
574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
Daniel Rodriguez
c9cfbf0bf2 Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
Ent 4461 configuracion integracion integria

See merge request artica/pandorafms!2732
2019-09-26 14:34:50 +02:00
alejandro-campos
2ec562fcc0 changed help in setup integria 2019-09-26 13:36:14 +02:00
alejandro-campos
96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Tatiana Llorente
a15350b7cb deleted calls to a function that does not exist logoff_db() - #4639 2019-09-26 12:36:08 +02:00
Luis
84611c7d29 Merge branch 'develop' into 'ent-4669-fallo-escritura-notificacion-serialize-precision'
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
2019-09-26 11:44:56 +02:00
alejandro-campos
0fdf3874d4 Add ACL in integria ticket dashboard 2019-09-26 11:05:27 +02:00
alejandro-campos
93b176269c remove acl check in integria ticket dashboard 2019-09-26 10:38:12 +02:00
Luis Calvo
8284dfc44f Removed item agent/modules from templates 2019-09-26 10:32:36 +02:00
alejandro-campos
ca184faaa0 minor visual fix in integria ticket creation 2019-09-26 10:10:55 +02:00
alejandro-campos
ad01cd0303 Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria 2019-09-26 09:48:13 +02:00
alejandro-campos
91f90d07d6 minor fixes in integria integration 2019-09-26 09:44:58 +02:00
Kike
63f4f894eb Deleted unnecessary "if" statement 2019-09-26 09:41:08 +02:00
artica
0dd0c4c36d Auto-updated build strings. 2019-09-26 00:01:08 +02:00
Tatiana Llorente
5436df5575 Changed the word incident for ticket - #4461 2019-09-25 16:13:37 +02:00
marcos.alconada
93941f334a the itil type is removed in the report types 2019-09-25 16:12:57 +02:00
Alejandro Fraguas
970cbbb4be Merge branch 'ent-4164-8143-No-funciona-module_interval-en-modulos-de-agente-broker' into 'develop'
module_interval in broker (linux agents)

See merge request artica/pandorafms!2709
2019-09-25 15:34:48 +02:00
Tatiana Llorente
188fce7174 Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
Conflicts:
	pandora_console/extras/mr/32.sql
2019-09-25 10:52:58 +02:00
Tatiana Llorente
84ae4a8391 Merge remote-tracking branch 'origin/develop' into ent-4461-Configuracion-integracion-integria
Conflicts:
	pandora_console/extras/mr/32.sql
2019-09-25 10:50:31 +02:00
Daniel Rodriguez
e03e83d565 Merge branch 'ent-4260-Fallo-de-label-de-percentile-en-custom-graph' into 'develop'
fixed error percentil label

See merge request artica/pandorafms!2734
2019-09-25 10:27:13 +02:00