tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-31 01:35:36 +02:00
Code Issues Packages Projects Releases Wiki Activity
27,987 Commits 34 Branches 30 Tags
Commit Graph

765 Commits

Author SHA1 Message Date
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
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 2b05cde214c4cd3ebbdf4192aea0358f1a0d6528.

 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 a80e50b7301858ff5e98a3a5c5e705a30731a8a8.

 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