Commit Graph

3536 Commits

Author SHA1 Message Date
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 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
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
artica b116f5b171 Auto-updated build strings. 2020-11-22 01:00:15 +01:00
artica 87640001dd Auto-updated build strings. 2020-11-21 01:00:20 +01:00
artica f4c5d2ef6d Auto-updated build strings. 2020-11-20 01:00:18 +01:00
artica e9259da802 Auto-updated build strings. 2020-11-19 01:00:19 +01:00
artica ce814ba580 Auto-updated build strings. 2020-11-18 01:00:20 +01:00
artica 9bfdfa87f6 Auto-updated build strings. 2020-11-17 01:00:35 +01:00
Daniel Maya 55c368f957 fixed last_compact in history db 2020-11-16 17:34:23 +01:00
artica 810db1eec4 Auto-updated build strings. 2020-11-16 01:00:30 +01:00
artica efa96ab947 Auto-updated build strings. 2020-11-15 01:00:31 +01:00
artica 26ab48073b Auto-updated build strings. 2020-11-14 01:00:30 +01:00
artica 6fcc1107ec Auto-updated build strings. 2020-11-13 01:00:33 +01:00
artica 834b102ad2 Auto-updated build strings. 2020-11-12 01:00:32 +01:00
artica 33fbdd1819 Auto-updated build strings. 2020-11-11 01:00:32 +01:00
artica 2046689b00 Auto-updated build strings. 2020-11-10 01:01:19 +01:00
artica 767397ceb6 Auto-updated build strings. 2020-11-09 01:00:33 +01:00
artica 4887dc3e3d Auto-updated build strings. 2020-11-08 01:00:36 +01:00
artica 5010cd7313 Auto-updated build strings. 2020-11-07 01:00:30 +01:00
artica 2cbe4643bc Auto-updated build strings. 2020-11-06 01:00:35 +01:00
Luis Calvo 64bd9bfc79 Fixed safe input on cli delete_group 2020-11-05 16:14:06 +01:00
Luis Calvo 6337fd3667 Fixed CLI update_group 2020-11-05 14:31:26 +01:00
artica 6662b4f286 Auto-updated build strings. 2020-11-05 01:00:35 +01:00
artica 081e46c9c2 Auto-updated build strings. 2020-11-04 01:00:47 +01:00
artica 58aa1d7a0e Auto-updated build strings. 2020-11-03 01:00:17 +01:00
artica d8fcfd0da4 Auto-updated build strings. 2020-11-02 01:00:16 +01:00
artica 4c298531a9 Auto-updated build strings. 2020-11-01 01:00:15 +01:00
artica 3e181c4b01 Auto-updated build strings. 2020-10-31 01:00:26 +01:00
artica 8c92e5420d Auto-updated build strings. 2020-10-30 01:00:21 +01:00
artica 860024a11a Auto-updated build strings. 2020-10-29 01:00:21 +01:00
artica 288b81dcc4 Auto-updated build strings. 2020-10-28 01:00:18 +01:00
artica 3b9558c7a0 Auto-updated build strings. 2020-10-27 01:00:21 +01:00
artica 76324679ec Auto-updated build strings. 2020-10-26 01:00:14 +01:00
artica 89fc211e6f Auto-updated build strings. 2020-10-25 01:00:15 +02:00
artica bd95c0a4f0 Auto-updated build strings. 2020-10-24 01:00:16 +02:00
artica 002509500c Auto-updated build strings. 2020-10-23 01:00:18 +02:00
artica 7bd7d190c5 Auto-updated build strings. 2020-10-21 01:02:12 +02:00
artica fbccb4ac6b Auto-updated build strings. 2020-10-20 01:00:17 +02:00
artica c560fa6125 Auto-updated build strings. 2020-10-18 01:00:15 +02:00
artica 880c20dcab Auto-updated build strings. 2020-10-17 01:00:17 +02:00
artica dc41879a2c Auto-updated build strings. 2020-10-16 01:00:21 +02:00
artica 3a890dc8b8 Updated version and build strings. 2020-10-15 10:19:42 +02:00
artica 6aaa4802e5 Auto-updated build strings. 2020-10-15 01:00:18 +02:00
Daniel Maya 7cd56b6f94 Ent 6466 borrado de eventos con pandora db 2020-10-14 11:48:34 +02:00
artica 4c67e17e84 Auto-updated build strings. 2020-10-14 01:00:19 +02:00
artica 2b06c5babc Auto-updated build strings. 2020-10-13 01:00:16 +02:00
artica 8146e5377e Auto-updated build strings. 2020-10-12 01:00:16 +02:00
artica 2c1ed80925 Auto-updated build strings. 2020-10-11 01:00:16 +02:00
artica d5b0966669 Auto-updated build strings. 2020-10-10 01:00:18 +02:00
artica 70cea5cdff Auto-updated build strings. 2020-10-09 01:00:21 +02:00
artica ed434135c2 Auto-updated build strings. 2020-10-08 01:00:17 +02:00
artica d677fedc0e Auto-updated build strings. 2020-10-07 01:00:18 +02:00
artica 63ed443b98 Auto-updated build strings. 2020-10-06 01:00:19 +02:00
artica b1d218d875 Auto-updated build strings. 2020-10-05 01:00:14 +02:00
artica 2965099f2f Auto-updated build strings. 2020-10-04 01:00:17 +02:00
artica 344cf25874 Auto-updated build strings. 2020-10-03 01:00:18 +02:00
Daniel Rodriguez 1cdb91a02d Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements

See merge request artica/pandorafms!3464
2020-10-02 13:07:59 +02:00
Daniel Rodriguez e9ec50c81f Merge branch 'ent-6315-pandora_db-genere-un-db-lock-cuando-se-este-ejecutando-ha' into 'develop'
pandora_db only runs on the master server.

See merge request artica/pandorafms!3477
2020-10-02 12:26:38 +02:00
artica 354ae84171 Auto-updated build strings. 2020-10-02 01:00:20 +02:00
fbsanchez 308598ba8d minor fix 2020-10-01 16:23:00 +02:00
fbsanchez d052c09f44 Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos 2020-10-01 13:36:13 +02:00