Daniel Maya
16554cfc7a
#8898 networkmap
2022-08-29 09:39:47 +02:00
Daniel Maya
182bb2d2c4
8898 Refresh time
2022-08-23 11:17:48 +02:00
alejandro.campos@artica.es
ded2fb08ff
implemented cron based scheduled downtimes
2022-08-16 18:42:51 +02:00
edu.corral
86a0847f2a
ent 9398 fixed ip tmetaconsole_agent
2022-08-16 12:37:40 +02:00
Luis
de1977fec1
Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal'
...
# Conflicts:
# pandora_console/extras/mr/56.sql
2022-08-10 11:26:05 +00:00
Daniel Barbero
1e4fa95730
discovery server to none pandora_enterprise#9282
2022-08-08 12:24:04 +02:00
Luis
33f9972293
Merge branch 'develop' into 'ent-7683-switch-en-consola-para-desactivar-la-actualizacion-automatica-de-la-ip-principal'
...
# Conflicts:
# pandora_console/extras/mr/56.sql
2022-07-29 11:20:22 +00:00
Daniel Barbero Martin
027f61daff
Merge remote-tracking branch 'origin/develop' into ent-8942-token-para-cambiar-comportamiento-de-la-busqueda-de-grupos-en-filtro-de-eventos
...
Conflicts:
pandora_console/extras/mr/56.sql
2022-07-19 10:18:04 +02:00
Calvo
3ee8f6b431
Added switch to agetn conf to avoid automatic Ip update
2022-07-15 13:40:54 +02:00
Daniel Maya
4011ca99fe
#8769 Resolved conflict 2
2022-07-14 13:02:39 +02:00
Daniel Maya
994c76a39b
#8732 Added autoconfiguration scheduled
2022-07-08 11:02:58 +02:00
Daniel Barbero Martin
12f73d86fd
new filter search eventspandora_enterprise#8942
2022-07-05 17:02:40 +02:00
Daniel Maya
e839d82e00
resolved conflict
2022-07-04 13:40:06 +02:00
Daniel Barbero Martin
5328cf21c6
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
2022-06-23 12:51:35 +02:00
Daniel Barbero Martin
58f5f4e9f1
refactor events meta pandora_enterprise#9086
2022-06-23 12:47:49 +02:00
Daniel Barbero Martin
b63da2066e
Merge remote-tracking branch 'origin/develop' into ent-9086-eliminacion-de-la-replicacion-de-eventos-duplicado
2022-06-23 08:22:31 +02:00
Ramon Novoa
59ea9a716e
Merge remote-tracking branch 'origin/develop' into ent-8912-Problemas-en-recuperación-alertas-de-evento---Necesaria-refactorizacion
2022-06-22 11:46:19 +02:00
Daniel Maya
44fdf1c321
#7926 Added asynchronous mode
2022-06-21 16:31:56 +02:00
Daniel Barbero Martin
c42852a18f
refactor events meta pandora_enterprise#9086
2022-06-21 11:20:26 +02:00
Daniel Barbero Martin
3e59093b0e
refactor events meta pandora_enterprise#9086
2022-06-20 12:29:00 +02:00
Calvo
0c2823f23f
Merge remote-tracking branch 'origin/develop' into ent-8590-indicar-a-que-satelite-pertenece-un-agente
2022-06-17 12:38:11 +02:00
José González
93b9e6142e
DB Changes #8912
2022-06-17 09:00:35 +02:00
José González
33e1d7aca4
DB Changes
2022-06-16 16:49:09 +02:00
José González
32bfa233d5
Merge
2022-06-16 11:45:58 +02:00
José González
ea60e4be71
Added database changes
2022-06-16 11:14:00 +02:00
Daniel Rodriguez
709b49a371
Merge branch 'ent-9134-Falta-campo-disable-de-tabla-autoconfig-en-pandoradb.sql' into 'develop'
...
Ent 9134 falta campo disable de tabla autoconfig en pandoradb.sql
See merge request artica/pandorafms!4954
2022-06-14 12:10:22 +00:00
Daniel Maya
a5517a9c02
#9134 Added disabled
2022-06-09 15:12:05 +02:00
Calvo
5297123d17
Console changes for 8950
2022-06-08 13:10:01 +02:00
alejandro.campos@artica.es
6f0782782e
Merge remote-tracking branch 'origin/develop' into ent-8838-Longitud-id-user-tusuario
2022-06-08 11:54:35 +02:00
alejandro.campos@artica.es
12b0f5cda1
database changes
2022-06-08 11:49:48 +02:00
Daniel Maya
c9b94273be
#8769 removed metaconsole_assigned_server
2022-06-07 15:21:07 +02:00
Daniel Maya
ea16aac7af
#8897 conflict resolved
2022-06-06 11:18:14 +02:00
Alejandro Campos
91d949942a
Merge branch 'develop' into 'ent-8838-Longitud-id-user-tusuario'
...
# Conflicts:
# pandora_console/extras/mr/55.sql
2022-06-03 10:26:35 +00:00
Daniel Maya
fc7b4d8a11
#8897 Fixed tdashboard name
2022-05-25 13:13:09 +02:00
Daniel Maya
0d3b14da40
#9005 Added lts_name
2022-05-23 13:00:01 +02:00
alejandro.campos@artica.es
5c789125f2
changed id_user field length from tusuario
2022-05-09 12:40:36 +02:00
Daniel Maya
aad40cb004
#8897 name changed
2022-05-04 16:11:08 +02:00
Daniel Maya
9f1be4531b
#8587 Added sunburst
2022-04-12 17:24:47 +02:00
fbsanchez
686ba0a5a5
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
...
Conflicts:
pandora_console/extras/mr/53.sql
2022-04-07 09:44:12 +02:00
Daniel Barbero Martin
c049f18bf1
Merge remote-tracking branch 'origin/develop' into ent-8540-contel-nuevo-informe-custom-render
2022-04-05 08:20:21 +02:00
Daniel Rodriguez
71fef65f35
Merge branch 'ent-8340-POST-Custom-data-en-vista-de-eventos' into 'develop'
...
implemented custom data filter in event view
See merge request artica/pandorafms!4787
2022-04-04 10:38:30 +00:00
Daniel Barbero Martin
318ac668e9
add new report custom render pandora_enterprise#8540
2022-03-31 20:11:52 +02:00
fbsanchez
e70c85fc65
Merge remote-tracking branch 'origin/develop' into ent-8731-umc-en-vendor
2022-03-30 15:05:04 +02:00
fbsanchez
2d334f7860
Historical view for update manager
2022-03-30 14:41:47 +02:00
alejandro.campos@artica.es
d137e0d798
implemented custom data filter in event view
2022-03-29 18:09:19 +02:00
José González
cc776ddbf7
Added enable console task feature
2022-03-23 11:47:34 +01:00
Alejandro Campos
0c41459b83
Merge branch 'develop' into 'ent-8607-12764-Agregar-columna-IDs-personalizadas-a-VLANs-en-IPAM'
...
# Conflicts:
# pandora_console/extras/mr/53.sql
2022-03-16 14:07:23 +00:00
Daniel Rodriguez
4dc6f7764c
Merge branch 'ent-8400-borrado-backups-generados-por-tareas-de-consolas' into 'develop'
...
Missed tables
See merge request artica/pandorafms!4721
2022-03-15 10:09:32 +00:00
fbsanchez
182fac98f1
Missed tables
2022-02-24 18:27:57 +01:00
alejandro.campos@artica.es
c319c30e24
added new field to ipam vlan
2022-02-24 13:58:04 +01:00
alejandro.campos@artica.es
bf88c54480
added new field to ipam vlan
2022-02-24 09:35:12 +01:00
fbsanchez
deb46436d3
Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
...
Conflicts:
pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
fbsanchez
ef75a260d0
Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
2022-02-21 17:58:32 +01:00
Daniel Rodriguez
45b97be611
Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop'
...
Added token local user to allow enabling local auth at user level
See merge request artica/pandorafms!4668
2022-02-18 11:04:06 +00:00
Calvo
5ba7b47b85
Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad
2022-02-18 09:26:55 +01:00
fbsanchez
261fbe0ba3
Merge remote-tracking branch 'origin/develop' into ent-8508-cepsa-correlation-server-no-encola-alertas-en-alert-server
...
Conflicts:
pandora_console/extras/mr/52.sql
pandora_console/pandoradb.sql
2022-02-16 10:17:24 +01:00
fbsanchez
1da5534484
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
.gitlab-ci.yml
pandora_console/pandoradb.sql
2022-02-15 17:32:10 +01:00
fbsanchez
9ba2eb0c74
Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
...
Conflicts:
pandora_console/extras/mr/52.sql
pandora_console/pandoradb.sql
2022-02-10 18:52:51 +01:00
fbsanchez
4a61efd7b6
added tpolicy_group_agents
2022-02-08 22:52:54 +01:00
fbsanchez
6bb754d5d2
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
pandora_console/pandoradb.sql
2022-02-08 13:02:22 +01:00
fbsanchez
fcfb5e0d2a
Schema, allow certain autoconfigurations being disabled on MC environments
2022-02-07 11:26:36 +01:00
fbsanchez
83a9c0867c
CHANGE UTF8 => UTF8MB4, isssues with old iamges
2022-02-02 14:17:44 +01:00
fbsanchez
cea110e209
Alert server improved
2022-02-02 13:37:45 +01:00
fbsanchez
460052b25f
code style
2022-02-02 12:32:33 +01:00
fbsanchez
53149712f5
code style
2022-02-02 12:30:02 +01:00
Calvo
f1dca5e525
Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad
2022-02-02 10:38:53 +01:00
Daniel Barbero Martin
b91109d747
Merge remote-tracking branch 'origin/develop' into ent-3943-Plantillas-de-alerta-con-varios-horarios
2022-02-02 08:06:05 +01:00
fbsanchez
592df1c3a7
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
pandora_console/pandoradb.sql
2022-02-01 15:16:21 +01:00
fbsanchez
ead8b39146
some updates
2022-02-01 15:11:59 +01:00
alejandro.campos@artica.es
74c2dafed0
added token to display or hide command in event response execution
2022-02-01 14:30:25 +01:00
fbsanchez
b15feab154
MySQL8 review for pandoradb.sql
2022-02-01 13:49:32 +01:00
Daniel Barbero Martin
a7da2faa32
alert template schedule pandora_enterprise#3943
2022-02-01 13:16:11 +01:00
Calvo
34a9c2f1f2
Added token local user to allow enabling local auth at user level
2022-02-01 09:37:02 +01:00
Daniel Barbero Martin
15ada66942
alert template schedule pandora_enterprise#3943
2022-01-31 16:50:48 +01:00
Daniel Barbero Martin
c02abbc508
alert template schedule pandora_enterprise#3943
2022-01-31 13:45:44 +01:00
fbsanchez
46d995a983
Added index to service elements (modules)
2022-01-10 11:24:32 +01:00
Calvo
0bad3761a7
Fix db lock stopping policy apply
2021-12-16 10:26:45 +01:00
fbsanchez
f852df2f1c
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
Daniel Barbero Martin
b55679cbfd
Merge remote-tracking branch 'origin/develop' into ent-5188-IPAM-Implementacion-de-Sites
2021-12-10 08:18:46 +01:00
Daniel Barbero Martin
b97ecda12b
db changes
2021-12-09 16:19:05 +01:00
fbsanchez
5c25fa8406
mr updates and a pretty icon
2021-12-09 15:07:35 +01:00
fbsanchez
2cbfca2cdd
mr rev + timap_sites
2021-12-09 13:51:20 +01:00
fbsanchez
a94f6be37e
force db_process_sql
2021-12-03 12:59:50 +01:00
fbsanchez
3e7a81ea33
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
Daniel Rodriguez
69590afef6
Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
...
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor
See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
fbsanchez
cad0c6cea6
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-02 10:43:30 +01:00
alejandro.campos@artica.es
8c8b5aee30
minor change
2021-11-29 16:34:32 +01:00
alejandro.campos@artica.es
73cde9ee48
db changes
2021-11-29 14:58:34 +01:00
fbsanchez
68c2400b9c
fix
2021-11-29 10:32:54 +01:00
fbsanchez
9c17625c77
ncm2
2021-11-26 18:11:34 +01:00
fbsanchez
ba8087f49b
ncm2 with schedules
2021-11-24 22:01:21 +01:00
Calvo
5464a73a12
Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor
2021-11-24 13:28:36 +01:00
Calvo
4dd931f277
Modules percentage threshold form
2021-11-24 11:33:36 +01:00
fbsanchez
cbbfc337df
errata fix
2021-11-23 14:33:59 +01:00
fbsanchez
a9485024f4
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-23 14:29:23 +01:00
fbsanchez
41dcc95d5a
db changes
2021-11-23 14:26:11 +01:00
José González
b8d884008b
Merge branch 'develop' into 'ent-7787-Debug-modulos-web-corta-urls'
...
# Conflicts:
# pandora_console/extras/mr/51.sql
2021-11-22 11:44:06 +00:00
Jose Gonzalez
192237a452
Merge remote-tracking branch 'origin' into ent-7787-Debug-modulos-web-corta-urls
2021-11-22 12:31:24 +01:00
fbsanchez
3e90bb6490
minor change
2021-11-19 11:53:59 +01:00
fbsanchez
582cb9a082
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +01:00
Daniel Barbero Martin
c52e11e91a
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-11-19 08:12:22 +01:00
Daniel Rodriguez
c47c5e34f6
Merge branch 'ent-7892-problemas-en-despliegue-de-agentes-rcmd_timeout' into 'develop'
...
set deployment_timeout per agent installation file
See merge request artica/pandorafms!4516
2021-11-18 16:34:12 +00:00
fbsanchez
9ff3c8eee1
wip ncm2
2021-11-15 18:58:57 +01:00
fbsanchez
a96d5d68e3
MR updates for NCMv2
2021-11-10 17:13:17 +01:00
Daniel Barbero Martin
900a37ad5d
Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales
2021-11-08 08:54:41 +01:00
Daniel Barbero Martin
ea747f25f3
Fix mr pandoradb migrate
2021-11-05 12:29:34 +01:00
Daniel Barbero Martin
c3f4addb0e
wip special days alerts
2021-11-04 12:33:40 +01:00
Daniel Barbero Martin
fdca5e4a78
wip special days alerts
2021-11-03 17:30:54 +01:00
Daniel Barbero Martin
25268ec9b4
color
2021-11-02 17:49:45 +01:00
fbsanchez
08d4323941
set deployment_timeout per agent installation file
2021-11-02 17:37:47 +01:00
fbsanchez
a5bf72cca0
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/include/constants.php
pandora_server/lib/PandoraFMS/Tools.pm
2021-10-26 14:21:40 +02:00
fbsanchez
5ae3bbc4fe
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
2021-10-25 10:28:31 +02:00
fbsanchez
bb8dbc9332
NCM
2021-10-21 02:17:17 +02:00
fbsanchez
6c0e2d23de
updates
2021-10-15 13:39:23 +02:00
fbsanchez
75949691f3
fix mr
2021-10-14 21:22:21 +02:00
fbsanchez
6a537e58f4
Fix
2021-10-14 21:09:14 +02:00
fbsanchez
79174d512d
Added tncm_vendor and model to manage targetrs
2021-10-14 20:44:05 +02:00
fbsanchez
96250dcfa0
WIP NCM
2021-10-13 22:47:31 +02:00
Daniel Maya
e986005cc0
#8090 Added auto_adjust in tlayout_template
2021-10-13 17:23:34 +02:00
fbsanchez
d2f5a04583
WIP NCM
2021-10-11 20:42:43 +02:00
fbsanchez
ef42348807
compat mysql 5.1 exceeded key
2021-10-08 16:02:06 +02:00
fbsanchez
fa35e6054c
Fixes
2021-10-08 15:30:17 +02:00
fbsanchez
1cb2f77945
WIP NCM
2021-10-08 15:12:23 +02:00
fbsanchez
6781e513c8
NCM WIP
2021-10-06 19:52:46 +02:00
fbsanchez
b8dc85a0dd
wip
2021-10-05 16:42:24 +02:00
fbsanchez
31f329a833
Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red
...
Conflicts:
pandora_console/vendor/composer/autoload_classmap.php
pandora_console/vendor/composer/autoload_static.php
2021-10-05 10:57:00 +02:00
fbsanchez
e11d8f3766
minor schema update
2021-10-04 19:43:57 +02:00
fbsanchez
be95b5ffd0
updates
2021-10-01 13:56:21 +02:00
fbsanchez
e237d7dd07
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/mr/50.sql
2021-09-30 12:24:19 +02:00
fbsanchez
18b1a1e14e
Schema update to avoid using JSON columns until internal CICD is updated
2021-09-30 11:18:13 +02:00
fbsanchez
696c59b258
WIP NCM
2021-09-29 20:56:39 +02:00
alejandro.campos@artica.es
fc6fb36293
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-29 13:29:20 +02:00
fbsanchez
15c2bdf17b
WIP NCM
2021-09-28 18:53:22 +02:00
alejandro.campos@artica.es
9e0729574e
Merge remote-tracking branch 'origin/develop' into ent-7168-Integrar-vista-de-warnings-en-Availability-reports
2021-09-24 11:40:25 +02:00
fbsanchez
12ddb4d792
Merge remote-tracking branch 'origin/develop' into ent-7595-12357-prototipo-event-server-paralelizado-y-con-recuperacion-de-alertas-bingo-card
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/pandoradb.sql
2021-09-23 16:23:38 +02:00
Alejandro Campos
ca46285a0e
Merge branch 'develop' into 'ent-3407-Informes-en-IPAM'
...
# Conflicts:
# pandora_console/extras/mr/50.sql
2021-09-23 13:33:02 +00:00
alejandro.campos@artica.es
fc959f0bc6
created report for ipam networks
2021-09-21 15:59:14 +02:00
Daniel Maya
10f1894b82
#7982 Added id_template_fields and id_template_conditions
2021-09-10 09:46:00 +02:00
fbsanchez
f0791cbd4f
WIP CorrelationServer
2021-08-27 15:07:14 +02:00
alejandro.campos@artica.es
54ae7e5783
modified availability report
2021-08-16 09:43:11 +02:00
Alejandro Campos
ff93169049
Merge branch 'develop' into 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired'
...
# Conflicts:
# pandora_console/extras/mr/48.sql
2021-08-09 06:45:46 +00:00
José González
ebc4df2080
Changes in debug_content db field
2021-07-22 15:20:06 +02:00
fbsanchez
0cec3afba0
Deactivated nodes if not unified
2021-07-19 13:47:43 +02:00
fbsanchez
9b31906bdf
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-13 10:01:59 +02:00
Daniel Maya
a4203aaee2
Ent 7272 nuevos elementos consola visual odómetro
2021-07-12 10:27:10 +00:00
fbsanchez
f52d389327
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/48.sql
2021-07-05 09:55:14 +02:00
vgilc
159920a05d
Merge branch 'ent-7127-alert-server-implementar-la-ejecucion-de-alertas-de-manera-independiente' into 'develop'
...
Add the AlertServer to the repo.
See merge request artica/pandorafms!4251
2021-07-02 09:15:27 +00:00
Ramon Novoa
f8bcd1660f
Add the AlertServer to the repo.
...
The new AlertServer allows alerts to be queued and executed outside the
data processing pipeline. Ref. pandora_enterprise#7127.
2021-07-01 16:19:47 +02:00
fbsanchez
074fbf916c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 20:03:07 +02:00
Daniel Maya
b37bbcd944
Ent 7143 autoajuste de la consola visual
2021-06-29 10:02:13 +00:00
alejandro.campos@artica.es
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +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
fbsanchez
d95eec0188
Enlarge numeric data fields
2021-05-25 09:57:23 +02:00
Daniel Barbero Martin
a0982cd260
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/users/profile_list.php
2021-05-18 08:39:06 +02:00
fbsanchez
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +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
Daniel Barbero Martin
5b376568a4
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/47.sql
2021-05-13 08:25:59 +02:00
Luis
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
alejandro.campos@artica.es
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
Daniel Barbero Martin
2ca981b03e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-29 08:34:41 +02:00
Daniel Maya
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
fbsanchez
78487fa4e5
Auto-synchronizer MC
2021-04-22 15:37:59 +02:00
Daniel Barbero Martin
100ae705f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 13:33:40 +02:00
Daniel Barbero Martin
b8b9fa561f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 08:07:21 +02:00
fbsanchez
50f580c112
Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas
2021-04-19 14:35:59 +02:00
fbsanchez
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
fbsanchez
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214
.
Changes to be committed:
modified: pandora_console/extras/mr/46.sql
modified: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
modified: pandora_console/pandoradb.sql
2021-04-15 00:20:42 +02:00
fbsanchez
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b730
.
Changes to be committed:
modified: pandora_console/extras/mr/46.sql
modified: pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
modified: pandora_console/pandoradb.sql
2021-04-14 21:42:19 +02:00
fbsanchez
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
José González
4a028b2ee3
Merge branch 'develop' into 'ent-6387-limitar-agentes-por-grupo'
...
# Conflicts:
# pandora_console/extras/mr/46.sql
2021-04-13 07:52:48 +00:00
Daniel Barbero Martin
aa31ed8f58
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-13 08:34:05 +02:00
Daniel Maya
8a27517cc5
Ent 7281 aumentar carácteres de la caja de consulta sql en informes
2021-04-12 14:44:33 +00:00
Daniel Barbero Martin
37fe9bfafb
WIP command center
2021-04-09 14:27:12 +02:00
Jose Gonzalez
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
Daniel Barbero Martin
e5b2a27631
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/extras/mr/46.sql
2021-04-07 08:26:38 +02:00
Luis
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
Daniel Barbero Martin
505e724384
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-03-15 08:19:32 +01:00
alejandro.campos@artica.es
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01: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
Daniel Barbero Martin
cb0883a87a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/include/functions_api.php
2021-03-10 08:34:29 +01:00
daniel
6e0188fac1
add summary report availability graph
2021-03-09 16:32:12 +00:00
Daniel Barbero Martin
6c3cb2c61c
WIP Command center
2021-03-08 12:20:32 +01:00
Daniel Maya
208c0d10e8
Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas
2021-03-01 10:35:28 +00:00
fbsanchez
0fb3ba9232
System status notifications filtered by subtype
2021-02-19 13:36:29 +01:00
Jose Gonzalez
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
Daniel Maya
ca17e9cfcb
change in column name of ttag
2021-01-15 09:50:40 +01:00
daniel
a470658543
remove IPAM to extension
2021-01-14 14:42:18 +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
Daniel Rodriguez
22159a6d69
Merge branch 'ent-6800-campos-no-se-guaerdan-plantillas' into 'develop'
...
Ent 6800 campos no se guaerdan plantillas
Closes pandora_enterprise#6800
See merge request artica/pandorafms!3693
2020-12-17 17: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
Daniel Maya
369002cb96
inventory alerts
2020-12-04 10:31:22 +01:00
Jose Gonzalez
279a4124f1
Database changes
2020-12-03 15:51:08 +01:00
Jose Gonzalez
eeac1ca35e
Merge
2020-12-02 11:28:46 +01:00
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
Jose Gonzalez
df517d8720
Added lost sql files
2020-11-26 15:02:06 +01:00
Jose Gonzalez
dc15125cd8
Merge remote-tracking branch 'origin/develop' into ent-2323-Modo-Debug-instantáneo
...
Update
2020-10-15 12:27:59 +02:00
Jose Gonzalez
c28e2917ed
Modified database files
2020-10-15 11:29:47 +02:00
Jose Gonzalez
65851afe4d
Database update
2020-10-14 10:59:55 +02:00