5955 Commits

Author SHA1 Message Date
Alejandro Campos
fa5af7efab Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-09-04 11:50:03 +00:00
Gorka Sanchez
9a03a5ff41 Merge branch 'ent-11970-16104-servicios-cuentan-elementos-no-inicializados-como-desconocidos-con-agentes-con-modulos' into 'develop'
Fix get agent status for agent with only noninit modules

See merge request artica/pandorafms!6374
2023-09-04 07:09:15 +00: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
artica
3e4aad7063 Auto-updated build strings. 2023-09-01 01:00:23 +02:00
Gorka Sanchez
34ddf9e06c Merge branch 'ent-11734-paradas-planificadas-periodicas-y-de-cron-no-deshabilitan-los-modulos' into 'develop'
Fix cron and periodically module planned downtimes

See merge request artica/pandorafms!6248
2023-08-31 10:33:18 +00: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
Calvo
4954f761d6 Fix get agent status for agent with only noninit modules 2023-08-29 15:42:15 +02:00
artica
ff37a940da Auto-updated build strings. 2023-08-29 01:00:21 +02:00
Calvo
ebca7ef9e6 Merge remote-tracking branch 'origin/develop' into ent-11734-paradas-planificadas-periodicas-y-de-cron-no-deshabilitan-los-modulos 2023-08-28 10:30:23 +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
Matias Didier
9e747e9952 Merge branch 'ent-11873-paradas-planificadas-de-modulos-ponen-en-modo-quiet-agente-en-vez-de-modulos' into 'develop'
Ent 11873 paradas planificadas de modulos ponen en modo quiet agente en vez de modulos

See merge request artica/pandorafms!6345
2023-08-24 08:43:28 +00: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
daniel
512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
artica
4830cf21e6 Updated version and build strings. 2023-08-23 15:49:36 +02:00
artica
71ddd71146 Auto-updated build strings. 2023-08-23 01:00:53 +02:00
Alejandro Campos
ad4a46d2b1 Merge branch 'develop' into 'ent-10348-15022-SNMP-Console-no-muestra-Traps-de-1-hora-de-plazo-con-timezone-de-Usuario-1'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-08-22 08:43:10 +00:00
daniel
5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00
Rafael Ameijeiras
8eab813101 Merge branch 'ent-11051-marcar-como-leidos-todos-los-mensajes-del-sistema' into 'develop'
Ent 11051 marcar como leidos todos los mensajes del sistema

See merge request artica/pandorafms!6202
2023-08-22 06:46:29 +00: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
8aed6c6177 ITSM pandora_enterprise#11471 2023-08-21 14:50:37 +02:00
miguel angel rasteu
e41ea004e2 #11051 Fix discovery task notification 2023-08-21 13:11:57 +02:00
Jorge Rincon
35a7c409bf #11873 Fixed Scheduled Downtime quiet mode for modules 2023-08-21 13:03:44 +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
Rafael Ameijeiras
c133c4a0c8 Merge branch 'ent-9575-14286-crear-un-macro-que-contenga-el-simbolo-de-la-unidad-de-un-modulo' into 'develop'
Ent 9575 14286 crear un macro que contenga el simbolo de la unidad de un modulo

Closes pandora_enterprise#9575

See merge request artica/pandorafms!6294
2023-08-21 05:57:46 +00: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
daniel
dba0bbebeb ITSM pandora_enterprise#11471 2023-08-18 13:46:27 +02:00
Daniel Rodriguez
9952fb64a0 Merge branch 'ent-11414-bug-al-usar-mas-de-una-macro-de-modulegraph-con-el-mismo-numero-de-horas-en-alertado' into 'develop'
Add module to graph hash

Closes pandora_enterprise#11414

See merge request artica/pandorafms!6333
2023-08-18 07:19:34 +00:00
daniel
b27867d504 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-18 08:28:06 +02:00
artica
e54fc904b3 Auto-updated build strings. 2023-08-18 01:00:57 +02:00
daniel
1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
artica
6e5f4ef20a Auto-updated build strings. 2023-08-17 01:00:37 +02:00
daniel
8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel
7baad52e79 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-16 08:18:05 +02:00
artica
2f4174c0d3 Auto-updated build strings. 2023-08-16 01:00:55 +02:00
artica
4b98cc97a9 Auto-updated build strings. 2023-08-15 01:00:54 +02:00
daniel
133eef456a Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-14 08:14:34 +02:00