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
0cec3afba0
Deactivated nodes if not unified
2021-07-19 13:47:43 +02:00
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
a4203aaee2
Ent 7272 nuevos elementos consola visual odómetro
2021-07-12 10:27:10 +00:00
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
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
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
074fbf916c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-29 20:03:07 +02:00
b37bbcd944
Ent 7143 autoajuste de la consola visual
2021-06-29 10:02:13 +00:00
fdc6d2f4c8
implemented capacity to handle string data for event data
2021-06-08 16:09:37 +02:00
a1ca4abe8f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-27 08:22:43 +02:00
d95eec0188
Enlarge numeric data fields
2021-05-25 09:57:23 +02:00
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
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +02:00
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
9cde8c345f
removed deprecated incident permissions
2021-05-13 13:33:45 +02:00
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
7d56552e72
Added missing fields to alert snmp actions
2021-05-12 12:54:36 +00:00
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
2ca981b03e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-29 08:34:41 +02:00
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
78487fa4e5
Auto-synchronizer MC
2021-04-22 15:37:59 +02:00
100ae705f8
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 13:33:40 +02:00
b8b9fa561f
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-20 08:07:21 +02:00
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
2e45e0bde4
Fixes in table tevent_rule definition
2021-04-15 10:35:21 +02:00
21d72f41f9
Revert "Revert "Update tevent_rule schema""
...
This reverts commit 2b05cde214
2021-04-15 00:20:42 +02:00
2b05cde214
Revert "Update tevent_rule schema"
...
This reverts commit a80e50b730
2021-04-14 21:42:19 +02:00
a80e50b730
Update tevent_rule schema
2021-04-14 21:39:58 +02:00
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
aa31ed8f58
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-04-13 08:34:05 +02:00
8a27517cc5
Ent 7281 aumentar carácteres de la caja de consulta sql en informes
2021-04-12 14:44:33 +00:00
37fe9bfafb
WIP command center
2021-04-09 14:27:12 +02:00
f8d4039314
Fixed merges
2021-04-09 10:34:25 +02:00
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
4b9f8ce202
Added custom fields combo larger params
2021-04-06 16:51:14 +00:00
505e724384
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-03-15 08:19:32 +01:00
3c5bf3eeef
Merge remote-tracking branch 'origin/develop' into temp
2021-03-12 12:34:47 +01:00
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
5913313bae
Increased number of possible custom fields for Integria action
2021-03-10 10:28:27 +01:00
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
6e0188fac1
add summary report availability graph
2021-03-09 16:32:12 +00:00
6c3cb2c61c
WIP Command center
2021-03-08 12:20:32 +01:00
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
0fb3ba9232
System status notifications filtered by subtype
2021-02-19 13:36:29 +01:00
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
ca17e9cfcb
change in column name of ttag
2021-01-15 09:50:40 +01:00
a470658543
remove IPAM to extension
2021-01-14 14:42:18 +01:00
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
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
Alejandro Campos
fbsanchez
Daniel Maya
vgilc
Ramon Novoa
Daniel Barbero Martin
Luis
José González
Jose Gonzalez
Daniel Rodriguez