4962 Commits

Author SHA1 Message Date
artica
283bb1f571 Auto-updated build strings. 2023-09-12 01:00:27 +02:00
daniel
fdaaf1a2e8 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-11 08:47:55 +02:00
artica
7af74d74b3 Auto-updated build strings. 2023-09-11 01:00:20 +02:00
artica
3a836c59dd Auto-updated build strings. 2023-09-10 01:00:20 +02:00
artica
2cc97b37fc Auto-updated build strings. 2023-09-09 01:00:23 +02:00
rafael
a78297c61b 12014 set agents to 150 2023-09-08 13:13:03 +02:00
daniel
ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
daniel
3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
artica
90d4bbf1be Auto-updated build strings. 2023-09-08 01:00:23 +02:00
alejandro.campos@artica.es
318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
Rafael Ameijeiras
0dc2a3492d Merge branch 'ent-11753-el-pandoradb-no-esta-borrando-los-datos-antiguos-de-netflow' into 'develop'
Fix pandoradb delete old netdlow data

See merge request artica/pandorafms!6394
2023-09-07 14:12:20 +00:00
Calvo
0811296f1b Added -w to 100 for expiring all data in time selected 2023-09-07 15:37:49 +02:00
Calvo
2638025652 Added -w to 100 for expiring all data in time selected 2023-09-07 15:20:36 +02:00
artica
b1518fb6a6 Auto-updated build strings. 2023-09-07 01:00:24 +02:00
alejandro.campos@artica.es
f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
daniel
fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
artica
cd4548d6ca Auto-updated build strings. 2023-09-06 01:00:23 +02:00
artica
c4d51a86b5 Auto-updated build strings. 2023-09-05 01:00:25 +02:00
daniel
1a1087e311 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
2023-09-04 08:16:48 +02:00
artica
d9e21b9471 Auto-updated build strings. 2023-09-04 01:00:18 +02:00
artica
153b2017d3 Auto-updated build strings. 2023-09-03 01:00:17 +02:00
artica
e3ad3f6590 Auto-updated build strings. 2023-09-02 01:00:23 +02:00
Calvo
d9bfa56e9a Fix pandoradb delete old netdlow data 2023-09-01 13:07:48 +02:00
artica
3e4aad7063 Auto-updated build strings. 2023-09-01 01:00:23 +02:00
artica
beeacf0cf3 Auto-updated build strings. 2023-08-31 01:00:10 +02:00
artica
d006028ce9 Updated version and build strings. 2023-08-30 09:18:04 +02:00
artica
d63a304906 Auto-updated build strings. 2023-08-30 01:00:23 +02:00
artica
ff37a940da Auto-updated build strings. 2023-08-29 01:00:21 +02:00
artica
85c2cc507f Auto-updated build strings. 2023-08-28 01:00:17 +02:00
artica
2215b3cf5c Auto-updated build strings. 2023-08-27 01:00:19 +02:00
artica
c21eac1fcd Auto-updated build strings. 2023-08-26 01:00:22 +02:00
daniel
ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
artica
de204a055e Auto-updated build strings. 2023-08-25 01:00:21 +02:00
daniel
a7baab0aba Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-24 12:07:32 +02:00
artica
89b679c4a4 Auto-updated build strings. 2023-08-24 01:00:18 +02:00
daniel
dca15b5637 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-23 18:54:01 +02:00
artica
4830cf21e6 Updated version and build strings. 2023-08-23 15:49:36 +02:00
Pablo Aragon
45c15acf8e 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:46:55 +02:00
Pablo Aragon
120298e6a3 11930-Remove in pandora_db.pl integrity & functions_agents.php 2023-08-23 14:00:35 +02:00
rafael
b0aa8f3fb2 adding autoinstall for tools and docs 2023-08-23 10:34:19 +02:00
rafael
d85e122791 Merge branch 'develop' into 11757-revisar-y-cerrar-scripts-de-generacion-de-carga-en-pandora_server-util-load 2023-08-23 08:32:31 +02:00
artica
71ddd71146 Auto-updated build strings. 2023-08-23 01:00:53 +02:00
daniel
5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
artica
d17ea9891b Auto-updated build strings. 2023-08-22 01:00:41 +02:00
artica
b977a2b0cc Updated version and build strings. 2023-08-21 16:13:08 +02:00
Daniel Maya
021c579b2b #11906 Fixed pandora_db 2023-08-21 12:59:35 +02:00
daniel
a63824d802 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/mr/66.sql
	pandora_console/godmode/users/user_management.php
2023-08-21 08:08:34 +02:00
artica
8ce9d3aa31 Auto-updated build strings. 2023-08-21 01:00:55 +02:00
artica
b031f4140c Auto-updated build strings. 2023-08-20 01:00:46 +02:00
artica
a6b55c1580 Auto-updated build strings. 2023-08-19 01:01:10 +02:00