tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,979 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

3895 Commits

Author SHA1 Message Date
Daniel Barbero Martin a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
artica 595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
artica ace916bc8e Updated version and build strings. 2021-06-10 17:12:11 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
artica 5ad364cc4a Auto-updated build strings. 2021-06-10 01:00:20 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin e54fde338d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-09 08:22:04 +02:00
artica 2953870e4f Auto-updated build strings. 2021-06-09 01:00:20 +02:00
Daniel Barbero Martin df2f72cce3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-08 08:22:16 +02:00
artica a63a4efb71 Auto-updated build strings. 2021-06-08 01:00:20 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
artica bc6b4acd8b Auto-updated build strings. 2021-06-07 01:00:19 +02:00
artica 656105cdf0 Auto-updated build strings. 2021-06-06 01:00:14 +02:00
artica 2513693ada Auto-updated build strings. 2021-06-05 01:00:19 +02:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
artica 8976ec4b6e Auto-updated build strings. 2021-06-04 01:00:19 +02:00
Daniel Barbero Martin 030a4fed6a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-03 08:15:30 +02:00
artica e1ae9d7908 Auto-updated build strings. 2021-06-03 01:00:17 +02:00
Daniel Barbero Martin 18f414ce5b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-02 08:09:32 +02:00
artica 2a5b5591a3 Auto-updated build strings. 2021-06-02 01:00:45 +02:00
Daniel Barbero Martin ddc4b47d0b Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-01 08:34:32 +02:00
artica b0e3b0aa24 Auto-updated build strings. 2021-06-01 01:00:09 +02:00
Daniel Barbero Martin 33618af381 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-31 08:40:09 +02:00
artica ff3eb72420 Auto-updated build strings. 2021-05-31 01:00:34 +02:00
artica 20d3399d39 Auto-updated build strings. 2021-05-30 01:00:20 +02:00
artica ec8ffea249 Auto-updated build strings. 2021-05-29 01:00:10 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
artica 059b14dbf6 Auto-updated build strings. 2021-05-28 01:00:43 +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
artica 9103f671e2 Auto-updated build strings. 2021-05-27 01:00:43 +02:00
Daniel Barbero Martin d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
artica 22a9043378 Auto-updated build strings. 2021-05-26 01:00:45 +02:00
Daniel Barbero Martin 933f679d27 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-25 08:51:48 +02:00
artica f3d6dafad2 Auto-updated build strings. 2021-05-25 01:00:38 +02:00
Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
artica 3388bfa699 Auto-updated build strings. 2021-05-24 01:00:35 +02:00
artica 5366b40ac3 Auto-updated build strings. 2021-05-23 01:00:27 +02:00
artica 01e811254e Auto-updated build strings. 2021-05-22 01:00:37 +02:00
Daniel Barbero Martin 5bc6fa9394 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-21 08:35:49 +02:00
artica f86c1c50c6 Auto-updated build strings. 2021-05-21 01:01:12 +02:00
Daniel Barbero Martin 03e857ffc8 Wip command center 2021-05-20 17:36:01 +02:00
artica 63da7abe47 Auto-updated build strings. 2021-05-20 01:00:47 +02:00
Daniel Rodriguez 22fa755fc3 Merge branch 'ent-7527-problemas-pandora_revent' into 'develop' 
Fixed issues with https calls

Closes pandora_enterprise#7527

See merge request artica/pandorafms!4128
 2021-05-19 16:02:34 +00:00
José González e0ec645613 Fixed issue with last hash symbol 2021-05-19 15:22:24 +02:00
José González 45b5ab4589 Added separator control 2021-05-19 12:40:06 +02:00
artica f3eb560518 Auto-updated build strings. 2021-05-19 01:00:46 +02:00
José González 5342ae077c id_agent default value 2021-05-18 15:27:45 +02:00
José González 5cdc0b8a14 Code review 2021-05-18 10:52:39 +02:00
José González be6269fc89 Code review 2021-05-18 10:25:45 +02:00
artica 739bc7ebd9 Auto-updated build strings. 2021-05-18 01:00:45 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop' 
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
 2021-05-17 14:41:11 +00:00
Ramon Novoa 439bc2405c Add SSL support for database connections. 
Ref. pandora_enterprise#4759.
 2021-05-17 13:12:42 +02:00
artica d2fd310ea2 Auto-updated build strings. 2021-05-17 01:00:38 +02:00
artica 8c0461e2bf Auto-updated build strings. 2021-05-16 01:00:26 +02:00
artica bfc805d6a7 Auto-updated build strings. 2021-05-15 01:00:46 +02:00
artica 9b6ad55910 Auto-updated build strings. 2021-05-14 01:00:47 +02:00
José González 0633ac24b9 Fixed issues with https calls 2021-05-13 16:43:18 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
artica afa48e815d Auto-updated build strings. 2021-05-13 01:00:45 +02:00
Ramon Novoa 3cfb07a36f Merge remote-tracking branch 'origin/develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:18:30 +02:00
Ramon Novoa 83822395f6 Merge branch 'develop' into ent-7308-version-del-agente-satelite-y-servidor-en-linea-de-comando 2021-05-12 10:01:52 +02:00
artica 671c1ca0a3 Auto-updated build strings. 2021-05-12 01:00:48 +02:00
artica 6bdd983755 Auto-updated build strings. 2021-05-11 01:00:46 +02:00
Ramon Novoa 6939ec4d44 Unify the format of product version messages. 2021-05-10 17:58:17 +02:00
artica dfba1da200 Auto-updated build strings. 2021-05-10 01:00:34 +02:00
artica fb1ea7bd1d Auto-updated build strings. 2021-05-09 01:00:25 +02:00
artica 68f4f6f135 Auto-updated build strings. 2021-05-08 01:00:43 +02:00
artica 454e6120e4 Auto-updated build strings. 2021-05-07 01:00:44 +02:00
artica 6c87f65367 Auto-updated build strings. 2021-05-06 01:00:44 +02:00
artica 20466ec0d1 Auto-updated build strings. 2021-05-05 01:00:40 +02:00
artica f0f7244d84 Auto-updated build strings. 2021-05-04 01:00:33 +02:00
artica 5461a4391c Auto-updated build strings. 2021-05-03 01:00:36 +02:00
artica 2494aad730 Auto-updated build strings. 2021-05-02 01:00:30 +02:00
artica 13483e6952 Auto-updated build strings. 2021-05-01 01:00:31 +02:00
artica c95b629776 Auto-updated build strings. 2021-04-30 01:00:41 +02:00
artica 8407c5353f Auto-updated build strings. 2021-04-29 01:00:46 +02:00
artica 778d126989 Auto-updated build strings. 2021-04-28 01:00:41 +02:00
artica 8a5f5992ac Auto-updated build strings. 2021-04-27 01:00:39 +02:00
artica 72b9748be9 Auto-updated build strings. 2021-04-26 01:00:14 +02:00
artica fa2748ac5d Auto-updated build strings. 2021-04-25 01:00:22 +02:00
artica 351570213f Auto-updated build strings. 2021-04-24 01:00:38 +02:00
artica f3f44ebbdd Auto-updated build strings. 2021-04-23 01:00:18 +02:00
artica c7521d27fa Auto-updated build strings. 2021-04-22 01:00:16 +02:00
artica d4d7494e27 Auto-updated build strings. 2021-04-21 01:00:16 +02:00
artica 20fe99ef29 Auto-updated build strings. 2021-04-20 01:00:15 +02:00
artica 3737d61793 Updated version and build strings. 2021-04-19 16:09:29 +02:00
artica 08abb25fc4 Auto-updated build strings. 2021-04-19 01:00:13 +02:00
artica 1030ef052a Auto-updated build strings. 2021-04-18 01:00:13 +02:00
artica 9ec945fa3c Auto-updated build strings. 2021-04-17 01:00:15 +02:00
artica f585e44692 Auto-updated build strings. 2021-04-16 01:00:41 +02:00
artica fe9109e585 Auto-updated build strings. 2021-04-15 01:00:43 +02:00
Daniel Rodriguez daf44e6a42 Merge branch 'ent-fix-improve-cli-profile' into 'develop' 
Fixed and improved profile related CLIs.

See merge request artica/pandorafms!4029
 2021-04-14 09:56:07 +00: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
Junichi Satoh 56ff245675 Fixed the order of arguments in 'create_profile' as the same as comment in pandora_manage.pl and documentation, and fixed 'profile_name' was not encoded. 
Plus, added new cli, 'update_profile'.
 2021-04-14 11:07:13 +09:00
artica 46291eed66 Auto-updated build strings. 2021-04-14 01:00:15 +02:00
Daniel Rodriguez dd41c1c0f7 Merge branch 'ent-2177-lead-error-en-plugin-de-servidor-snmp_remote-pl-catrian' into 'develop' 
hrStorageAllocationUnits fixed ref. snmp_remote.pl

See merge request artica/pandorafms!3913
 2021-04-13 13:24:03 +00:00
artica c33f2182ff Auto-updated build strings. 2021-04-13 01:00:16 +02:00
artica 4a071237b4 Auto-updated build strings. 2021-04-12 01:00:26 +02:00
artica 3627be1f85 Auto-updated build strings. 2021-04-11 01:00:32 +02:00
artica ea81d04e5f Auto-updated build strings. 2021-04-10 01:00:37 +02:00
artica 70c6e7196f Auto-updated build strings. 2021-04-09 01:00:40 +02:00
artica 2e27cebad2 Auto-updated build strings. 2021-04-08 01:00:37 +02:00
Calvo 34b361e21a Fixed CLI update_agent adding duplicate agent address references 2021-04-07 17:38:38 +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
artica 8734494b7f Auto-updated build strings. 2021-04-07 01:00:38 +02:00
Daniel Rodriguez 3ae93da065 Merge branch 'ent-4475-validar-alertas-api-cli' into 'develop' 
Ent 4475 validar alertas api cli

See merge request artica/pandorafms!3820
 2021-04-06 17:21:56 +00:00
Luis 6dac9039d4 Ent 4475 validar alertas api cli 2021-04-06 17:21:56 +00:00
artica 247343c0b6 Auto-updated build strings. 2021-04-06 01:02:48 +02:00
artica 31a8fd6c55 Auto-updated build strings. 2021-04-05 01:00:42 +02:00
artica 4811e45bf2 Auto-updated build strings. 2021-04-04 01:00:37 +02:00
artica 95e437252b Auto-updated build strings. 2021-04-03 01:00:36 +02:00
artica 2f4eaacb6a Auto-updated build strings. 2021-04-02 01:00:33 +02:00
artica 10ea68f33f Auto-updated build strings. 2021-04-01 01:00:11 +02:00
artica 321fc8aa05 Auto-updated build strings. 2021-03-31 01:00:44 +02:00
artica 8b92c0ffc1 Auto-updated build strings. 2021-03-30 01:00:51 +02:00
artica 96d63e2029 Updated version and build strings. 2021-03-29 14:57:41 +02:00
artica 3e8214850f Auto-updated build strings. 2021-03-29 01:00:18 +02:00
artica cf78261d0b Auto-updated build strings. 2021-03-28 01:00:14 +01:00
artica e46845e864 Auto-updated build strings. 2021-03-27 01:00:19 +01:00
artica c10c1b09cf Auto-updated build strings. 2021-03-26 01:00:18 +01:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
artica 1934c04388 Auto-updated build strings. 2021-03-25 01:00:21 +01:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
artica 00375710c2 Auto-updated build strings. 2021-03-24 01:00:25 +01:00
artica b1bfd70feb Auto-updated build strings. 2021-03-23 01:00:17 +01:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
artica 49e7ba7312 Auto-updated build strings. 2021-03-22 01:00:10 +01:00
artica 2dcc0cf9ee Auto-updated build strings. 2021-03-21 01:00:09 +01:00
artica db007bc0cf Auto-updated build strings. 2021-03-20 01:00:09 +01:00
artica 3a384dae0a Auto-updated build strings. 2021-03-19 01:00:13 +01:00
Daniel Rodriguez 3eaff54b73 Merge branch 'ent-6232-nt-incluir-metricas-en-el-wizard-de-interfaces-snmp' into 'develop' 
Ent 6232 nt incluir metricas en el wizard de interfaces snmp

See merge request artica/pandorafms!3935
 2021-03-18 16:02:56 +00:00
artica 572f8c9908 Auto-updated build strings. 2021-03-18 01:00:22 +01:00
artica 610d41290e Auto-updated build strings. 2021-03-17 01:00:20 +01:00
fbsanchez c67e5f9846 hrStorageAllocationUnits fixed ref. snmp_remote.pl 2021-03-16 10:14:28 +01:00
Daniel Rodriguez cb6bb195b5 Merge branch 'ent-5700-traza-ejecucion-pandora-db-tgraph-source' into 'develop' 
Added log on deleting tgraph_source data in pandora_db

See merge request artica/pandorafms!3721
 2021-03-16 09:13:00 +00:00
artica df269f52c1 Auto-updated build strings. 2021-03-16 01:00:18 +01:00
artica fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica 0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica 5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
artica d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
alejandro.campos@artica.es 2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
artica 74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez 96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
artica e34a1c47c8 Auto-updated build strings. 2021-03-10 01:01:06 +01:00
artica f9d5767027 Auto-updated build strings. 2021-03-09 01:00:17 +01:00
artica 2bd9515152 Auto-updated build strings. 2021-03-08 01:00:14 +01:00
artica 438c388423 Auto-updated build strings. 2021-03-07 01:00:17 +01:00
artica 80c568bbdd Auto-updated build strings. 2021-03-06 01:00:19 +01:00
artica eb912405a6 Auto-updated build strings. 2021-03-05 01:00:53 +01:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
artica 4d1cab6b67 Auto-updated build strings. 2021-03-04 01:00:19 +01:00
artica 442d0d440a Auto-updated build strings. 2021-03-03 01:00:23 +01:00
fbsanchez c5b2b90476 Merge remote-tracking branch 'origin/develop' into ent-6232-nt-incluir-ifspeed-como-custom-macro-en-ifoperstatus 
Conflicts:
	pandora_console/extras/mr/45.sql
 2021-03-02 09:48:33 +01:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
artica 19ab53cfb8 Auto-updated build strings. 2021-03-02 01:00:21 +01:00
artica 0587500074 Auto-updated build strings. 2021-03-01 01:00:09 +01:00
artica 0cf47e4b00 Auto-updated build strings. 2021-02-28 01:00:06 +01:00
artica 814a39235e Auto-updated build strings. 2021-02-27 01:00:19 +01:00
artica dc04a2b2b5 Auto-updated build strings. 2021-02-26 01:00:19 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
artica 078ab1657f Auto-updated build strings. 2021-02-25 01:00:25 +01:00
artica 508b953496 Auto-updated build strings. 2021-02-24 01:00:21 +01:00
artica a5b1128014 Auto-updated build strings. 2021-02-23 01:00:16 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
artica cd9694f034 Auto-updated build strings. 2021-02-22 01:00:09 +01:00
artica c70643203f Auto-updated build strings. 2021-02-21 01:00:14 +01:00
artica 396f67d57b Auto-updated build strings. 2021-02-20 01:00:21 +01:00
artica 0f4f9cd461 Auto-updated build strings. 2021-02-19 01:00:21 +01:00
artica 4c1eaf929b Auto-updated build strings. 2021-02-18 01:00:24 +01:00
artica a33a94eb89 Auto-updated build strings. 2021-02-17 01:00:18 +01:00
fbsanchez 74ee4971d0 Added inUsage and outUsage, added units 2021-02-16 12:14:56 +01:00
artica c2ec312e72 Auto-updated build strings. 2021-02-16 01:00:18 +01:00
fbsanchez aca9814e0f uniqid pandora_snmp_bandwidth 2021-02-15 19:10:49 +01:00
fbsanchez 09b5400023 MR info + bandwidth analysis in wizards 2021-02-15 18:56:42 +01:00
artica 2a7ba5fbe0 Auto-updated build strings. 2021-02-15 01:00:15 +01:00
artica 2ef0a1b395 Auto-updated build strings. 2021-02-14 01:00:15 +01:00
artica 3c29314dc7 Auto-updated build strings. 2021-02-13 01:00:18 +01:00
fbsanchez 24ed77b5a1 Pandora bandwidth server plugin 2021-02-12 15:25:41 +01:00
artica 768494e796 Auto-updated build strings. 2021-02-12 01:00:20 +01:00
artica 16f2a60490 Auto-updated build strings. 2021-02-11 01:00:22 +01:00
artica 40852de906 Auto-updated build strings. 2021-02-10 01:00:22 +01:00
artica e0d1cdd667 Auto-updated build strings. 2021-02-09 01:00:25 +01:00
artica c828ca2061 Auto-updated build strings. 2021-02-08 01:00:16 +01:00
artica fe8a54aa48 Auto-updated build strings. 2021-02-07 01:00:17 +01:00
artica 0362e4a1a0 Auto-updated build strings. 2021-02-06 01:00:17 +01:00
artica fffea9fd99 Auto-updated build strings. 2021-02-05 01:00:20 +01:00
artica 778b3762a2 Auto-updated build strings. 2021-02-04 01:00:25 +01:00
artica 7ed515afd1 Auto-updated build strings. 2021-02-03 01:00:20 +01:00
artica ff7516cd23 Auto-updated build strings. 2021-02-02 01:00:19 +01:00
fbsanchez f4768b44fc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-02-01 15:38:19 +01:00
fbsanchez 712079c30e RC1 #4755 2021-02-01 15:00:54 +01:00
artica 466ebb8b6b Auto-updated build strings. 2021-02-01 01:00:15 +01:00
artica 705e1e4623 Auto-updated build strings. 2021-01-31 01:00:11 +01:00
artica 6871aaf358 Auto-updated build strings. 2021-01-30 01:00:19 +01:00
fbsanchez 279bd5456d Disabled compactdb while running in historical database 2021-01-29 10:25:14 +01:00
artica 750670ecf9 Auto-updated build strings. 2021-01-29 01:00:20 +01:00
artica ff80c974da Auto-updated build strings. 2021-01-28 01:00:18 +01:00
artica 096bcd1ed3 Auto-updated build strings. 2021-01-27 01:00:19 +01:00
artica 7d69ad114d Auto-updated build strings. 2021-01-26 01:00:11 +01:00
artica 831d22bac1 Updated version and build strings. 2021-01-25 11:52:43 +01:00
Daniel Rodriguez d4050ad0ce Merge branch 'ent-6855-Casca-netscan-custom-en-la-open' into 'develop' 
several fixes in netscan custom

See merge request artica/pandorafms!3736
 2021-01-25 09:50:27 +01:00
artica 82664be930 Auto-updated build strings. 2021-01-25 01:00:14 +01:00
artica 4be65955cb Auto-updated build strings. 2021-01-24 01:00:16 +01:00
artica e03f02a093 Auto-updated build strings. 2021-01-23 01:00:18 +01:00
artica a700318815 Auto-updated build strings. 2021-01-22 01:00:18 +01:00
artica 3992841ac5 Auto-updated build strings. 2021-01-21 01:00:18 +01:00
Jose Gonzalez a5d39365f8 Added feature for fix discovery tasks with server down 2021-01-20 17:56:39 +01:00
artica 6dca4bb4ba Auto-updated build strings. 2021-01-20 01:00:17 +01:00
artica 548f960b83 Auto-updated build strings. 2021-01-19 01:00:18 +01:00
alejandro-campos 9c924db8dc Merge branch 'develop' into ent-6855-Casca-netscan-custom-en-la-open 2021-01-18 10:29:06 +01:00
artica f0ff1c72d4 Auto-updated build strings. 2021-01-18 01:00:15 +01:00
artica 0cde312850 Auto-updated build strings. 2021-01-17 01:00:14 +01:00
artica 6710cfd957 Auto-updated build strings. 2021-01-16 01:00:19 +01:00
artica 5a837c9aaa Auto-updated build strings. 2021-01-15 01:00:17 +01:00
artica 884a7cabf7 Auto-updated build strings. 2021-01-14 01:00:19 +01:00
artica 53957348be Auto-updated build strings. 2021-01-13 01:00:18 +01:00
artica a56a0e7023 Auto-updated build strings. 2021-01-12 01:00:17 +01:00
Daniel Rodriguez d4c161ae58 Merge branch 'ent-6707-Bug-pandora_db-con-compactacion-en-historico' into 'develop' 
Ent 6707 bug pandora db con compactacion en historico

See merge request artica/pandorafms!3615
 2021-01-11 09:30:56 +01:00
artica 732ba9d030 Auto-updated build strings. 2021-01-11 01:00:14 +01:00
artica ec6a6db6c0 Auto-updated build strings. 2021-01-10 01:00:15 +01:00
artica b13fc73b6c Auto-updated build strings. 2021-01-09 01:00:16 +01:00
artica 2b17ab4496 Auto-updated build strings. 2021-01-08 01:00:18 +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
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
artica 1ff2800178 Auto-updated build strings. 2021-01-07 01:00:32 +01:00
artica b21eca13d5 Auto-updated build strings. 2021-01-06 01:00:36 +01:00
Daniel Rodriguez 705beeac52 Merge branch 'ent-6902-Warning-pandora-db' into 'develop' 
added additional check for token

See merge request artica/pandorafms!3757
 2021-01-05 17:43:21 +01:00
alejandro.campos@artica.es 84d768853a added additional check for token 2021-01-05 15:50:28 +01:00
Daniel Rodriguez 40921b96f9 Merge branch 'ent-6791-sesiones-se-borran-con-pandora_db' into 'develop' 
Avoid erase ALL sessions from tsessions_php (pandora_db)

See merge request artica/pandorafms!3663
 2021-01-05 13:43:42 +01:00
artica 93473de7c6 Auto-updated build strings. 2021-01-05 01:00:16 +01:00
artica a2033961a7 Auto-updated build strings. 2021-01-04 01:00:14 +01:00
artica dfec568055 Auto-updated build strings. 2021-01-03 01:00:13 +01:00
artica 740e2f6abe Auto-updated build strings. 2021-01-02 01:00:13 +01:00
artica dca12930fe Auto-updated build strings. 2021-01-01 01:00:15 +01:00
artica 35e5ab60d6 Auto-updated build strings. 2020-12-31 01:00:13 +01:00
artica de7fe26e65 Auto-updated build strings. 2020-12-30 01:00:14 +01:00
artica 1b80a157e0 Auto-updated build strings. 2020-12-29 01:00:13 +01:00
artica 66afea7289 Auto-updated build strings. 2020-12-28 01:00:14 +01:00
artica 7915ee970a Auto-updated build strings. 2020-12-27 01:00:13 +01:00
artica 223457100a Auto-updated build strings. 2020-12-26 01:00:14 +01:00
artica 57c1433764 Auto-updated build strings. 2020-12-25 01:00:15 +01:00
artica 91b3aca7cf Auto-updated build strings. 2020-12-24 01:00:19 +01:00
Daniel Rodriguez b0f862b4c7 Merge branch 'ent-1175-copyright-actualizados' into 'develop' 
Updated copyrights

Closes pandora_enterprise#1175

See merge request artica/pandorafms!3668
 2020-12-23 17:19:46 +01:00
Daniel Rodriguez ccf806755b Merge branch 'ent-6854-Warning-feo-arrancar-servidor' into 'develop' 
Added fix

Closes pandora_enterprise#6854

See merge request artica/pandorafms!3726
 2020-12-23 16:04:53 +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
artica 71371a10a9 Auto-updated build strings. 2020-12-23 01:00:15 +01:00
artica 1d72913310 Auto-updated build strings. 2020-12-22 01:00:16 +01:00
artica da07c5d7da Auto-updated build strings. 2020-12-21 01:00:14 +01:00
artica 42f7183c7b Auto-updated build strings. 2020-12-20 01:00:15 +01:00
artica 37fda15ad4 Auto-updated build strings. 2020-12-19 01:00:18 +01:00
fbsanchez bc3616e6c5 visual console mobile wip 2020-12-18 13:40:00 +01:00
alejandro-campos f03b4e59f8 several fixes in netscan custom 2020-12-18 11:40:22 +01:00
artica 87ce193c10 Auto-updated build strings. 2020-12-18 01:00:19 +01:00
artica 2692da94f5 Auto-updated build strings. 2020-12-17 01:00:17 +01:00
artica b5d52a5afe Auto-updated build strings. 2020-12-16 01:00:16 +01:00
Jose Gonzalez 397254e4d8 Added fix 2020-12-15 10:45:37 +01:00
artica fcb7d36146 Auto-updated build strings. 2020-12-15 01:00:07 +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
Luis Calvo c4eb3dd088 Added log on deleting tgraph_source data in pandora_db 2020-12-14 10:52:12 +01:00
artica f2eee8fde8 Auto-updated build strings. 2020-12-14 01:00:14 +01:00
artica d684d3cfeb Auto-updated build strings. 2020-12-13 01:00:14 +01:00
artica 37478e3b49 Auto-updated build strings. 2020-12-12 01:00:16 +01:00
artica c613828777 Auto-updated build strings. 2020-12-11 01:00:15 +01:00
artica 463013b06a Auto-updated build strings. 2020-12-10 01:00:06 +01:00
artica 17ea6b85c0 Updated version and build strings. 2020-12-09 16:44:12 +01:00
artica 3a530d9a33 Auto-updated build strings. 2020-12-09 01:00:13 +01:00
artica 12dca46e6f Auto-updated build strings. 2020-12-08 01:00:14 +01:00
artica 85c8dfe52f Auto-updated build strings. 2020-12-07 01:00:13 +01:00
artica f016803dbf Auto-updated build strings. 2020-12-06 01:00:13 +01:00
artica 223f3685b3 Auto-updated build strings. 2020-12-05 01:00:17 +01:00
artica acce2cc2b0 Auto-updated build strings. 2020-12-04 01:00:18 +01:00
artica fbc14f9d95 Auto-updated build strings. 2020-12-03 01:00:16 +01:00
artica 913dc554eb Auto-updated build strings. 2020-12-02 01:00:17 +01:00
Daniel Rodriguez e2bffd30c1 Merge branch 'ent-6692-error-CLI-update-group' into 'develop' 
Fixed CLI update_group

See merge request artica/pandorafms!3596
 2020-12-01 11:57:07 +01:00
artica e0266b53ba Auto-updated build strings. 2020-12-01 01:00:46 +01:00
artica 863b5f3dc8 Auto-updated build strings. 2020-11-30 01:00:15 +01:00
artica 9041fc31e8 Auto-updated build strings. 2020-11-29 01:00:15 +01:00
artica 66978ba49b Auto-updated build strings. 2020-11-28 01:00:18 +01:00
Jose Gonzalez 649442f794 Updated copyrights 2020-11-27 13:52:35 +01:00
artica 935ce27a30 Auto-updated build strings. 2020-11-27 01:00:20 +01:00
fbsanchez 7e61465955 Avoid erase ALL sessions from tsessions_php (pandora_db) 2020-11-26 18:27:11 +01:00
Daniel Rodriguez 7cfa10dcbd Merge branch 'ent-6691-cli-delete-group-doesnt-delete-group-name-blankspaces' into 'develop' 
Fixed safe input on cli delete_group

See merge request artica/pandorafms!3597
 2020-11-26 11:48:35 +01:00
artica f98f75345c Auto-updated build strings. 2020-11-26 01:00:19 +01:00
artica b6e142a442 Auto-updated build strings. 2020-11-25 01:00:20 +01:00
artica 1ce0a8cba8 Auto-updated build strings. 2020-11-24 01:00:19 +01:00
fbsanchez a767b6c133 Fixes in history db settings and improved pandora_db tool 2020-11-23 20:16:11 +01:00
artica 7f8324266d Auto-updated build strings. 2020-11-23 01:00:16 +01:00