Calvo
0435a6998d
Merge remote-tracking branch 'origin/develop' into ent-9670-mejoras-automonitorizacion
2023-09-14 13:48:30 +02:00
daniel
af968b5e13
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
2023-09-14 08:08:05 +02:00
artica
018938cb8e
Auto-updated build strings.
2023-09-14 01:00:27 +02:00
daniel
dee6f70703
Merge remote-tracking branch 'origin/develop' into ent-12033-vista-tactica-vista-de-servidores-no-muestra-modulos-de-red
2023-09-13 13:48:10 +02:00
artica
a46a43fd89
Auto-updated build strings.
2023-09-13 01:00:30 +02:00
daniel
802f0bf83b
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
2023-09-12 12:37:31 +02:00
daniel
9d70802083
Fix counters tactical view pandora_enterprise#12033
2023-09-12 10:49:02 +02:00
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
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
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
felix.suarez
85462b3aae
Add alert modules, queue and status
2023-09-04 08:46:24 -06:00
daniel
a059f18b4b
ITSM pandora_enterprise#11471
2023-09-04 16:36:58 +02:00
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
artica
841f9fbee0
Auto-updated build strings.
2023-08-14 01:00:35 +02:00
Félix Suárez
50d4f5a999
Add module to graph hash
2023-08-13 13:04:33 -06:00
artica
0c7de59b80
Auto-updated build strings.
2023-08-13 01:00:47 +02:00
artica
d01416a771
Auto-updated build strings.
2023-08-12 01:00:15 +02:00
daniel
f0d78a44d1
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
2023-08-11 14:32:54 +02:00
daniel
dbf98689c2
ITSM pandora_enterprise#11471
2023-08-11 14:30:18 +02:00
artica
30ef320d06
Updated version and build strings.
2023-08-11 11:53:42 +02:00
artica
8be7d85405
Auto-updated build strings.
2023-08-11 01:00:53 +02:00
artica
9affc955e4
Auto-updated build strings.
2023-08-10 01:00:39 +02:00
Rafael Ameijeiras
bfd505a538
Merge branch 'ent-11682-no-se-configuran-las-listas-de-dias-especiales' into 'develop'
...
Ent 11682 No se configuran las listas de dias especiales
See merge request artica/pandorafms!6220
2023-08-09 07:27:27 +00:00
artica
449d9fe3cb
Auto-updated build strings.
2023-08-09 01:00:45 +02:00
Daniel Cebrian
131f78e21e
#11682 fixed special days calendar
2023-08-08 18:04:30 +02:00
Matias Didier
16513cf52d
Merge branch 'ent-10071-14719-Comprobacion-estado-previo-del-agente-ante-paradas-planificadas' into 'develop'
...
Ent 10071 14719 comprobacion estado previo del agente ante paradas planificadas
See merge request artica/pandorafms!6319
2023-08-08 10:29:36 +00:00
artica
96710ed03f
Auto-updated build strings.
2023-08-08 01:00:43 +02:00
alejandro.campos@artica.es
68525f0a12
preserve previous disabled or quiet condition when downtime is over
2023-08-07 17:03:25 +02:00
Matias Didier
e4aea936e0
Merge branch 'ent-10231-limpieza-de-codigo-del-server-transaccional' into 'develop'
...
Ent-10231 limpieza-de-codigo-del-server-transaccional
See merge request artica/pandorafms!6073
2023-08-07 08:18:07 +00:00
artica
5e588736ff
Auto-updated build strings.
2023-08-07 01:00:15 +02:00
artica
cb15459cb3
Auto-updated build strings.
2023-08-06 01:00:07 +02:00
artica
99317de9cf
Auto-updated build strings.
2023-08-05 01:00:37 +02:00
artica
eb104dd2e4
Auto-updated build strings.
2023-08-04 01:00:26 +02:00
artica
ab0fda5a5d
Auto-updated build strings.
2023-08-03 01:00:42 +02:00
artica
d3fdb28d05
Auto-updated build strings.
2023-08-02 01:00:29 +02:00
artica
dcb9f89b5d
Auto-updated build strings.
2023-08-01 01:00:44 +02:00
Daniel Maya
8bbaa11ce3
resolved conflict
2023-07-31 09:44:46 +02:00
artica
3dae79d593
Auto-updated build strings.
2023-07-31 01:00:25 +02:00
Félix Suárez
3434b2e621
Fix on where clause
2023-07-30 10:48:57 -06:00
Félix Suárez
f9e1480c56
Fix on table selection
2023-07-30 10:44:38 -06:00