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
daniel
40864eee6b
add new token to report
2020-10-07 09:34:43 +02:00
daniel
a5d5a45cac
add render graph to reports
2020-10-02 14:16:55 +02:00
José González
0d8e2d5021
Merge branch 'develop' into 'ent-5847-optimizacion-recomendada-Gautier'
...
# Conflicts:
# pandora_console/extras/mr/42.sql
Solved conflicts.
2020-09-25 11:27:41 +02:00
Luis
ef043a169a
Increased number of max macro data fields from 15 to 20
2020-09-25 10:47:36 +02:00
Jose Gonzalez
da01f9abd5
Fix alter index
2020-09-16 17:32:05 +02:00
Jose Gonzalez
dbb1ec6b84
Too long name fix
2020-09-16 17:19:07 +02:00
Jose Gonzalez
ed4ba27158
Fixed index
2020-09-16 17:11:19 +02:00
Jose Gonzalez
e8efd228c0
Added indexes
2020-09-16 14:33:20 +02:00
daniel
b96cade165
new options 24x7 sla,availavility reports
2020-08-31 12:33:41 +02:00
Jose Gonzalez
3c0ea8b08a
Solved issues with DB
2020-08-10 15:10:17 +02:00
Jose Gonzalez
35644a367f
Added ttag modifies
2020-08-10 14:53:07 +02:00
Jose Gonzalez
7300ccd185
Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola
2020-08-07 13:29:25 +02:00
Jose Gonzalez
c67d8bd005
Fixed little issues
2020-08-07 13:29:09 +02:00
José González
85d8e1f796
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql
# pandora_console/godmode/alerts/configure_alert_template.php
2020-08-07 13:17:41 +02:00
José González
f3d1a80252
Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola'
...
# Conflicts:
# pandora_console/extras/mr/40.sql (solved)
2020-07-10 08:19:07 +02:00
Ramon Novoa
19a8288f26
Increase the size of tserver.version.
...
Ref pandora_enterprise#4943
2020-07-09 17:47:11 +02:00
Jose Gonzalez
a1bd93bac7
Add database changes
2020-07-07 11:08:44 +02:00
fbsanchez
faaf14bfd4
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
pandora_console/include/lib/Module.php
2020-06-30 17:04:33 +02:00
José González
311b259684
Backup upload
2020-06-30 12:16:51 +02:00
fbsanchez
94a7b625fb
Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos
...
Conflicts:
pandora_console/extras/mr/39.sql
2020-06-22 14:06:13 +02:00
Luis
efb69c18bc
Ent 5809 message delete not working
2020-06-22 13:52:54 +02:00
fbsanchez
9bae4f8a17
MR change - minor
2020-06-19 12:14:09 +02:00
fbsanchez
6c5484baf0
MR change smart services
2020-06-18 12:35:52 +02:00
daniel
65c733e1dd
iot metaconsole
2020-05-27 09:18:21 +02:00
fbsanchez
026562e7ee
MR changes
2020-04-30 15:00:04 +02:00