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
28,559 Commits 34 Branches 30 Tags
Commit Graph

1259 Commits

Author SHA1 Message Date
vgilc
04c402bc03 Merge branch 'ent-7772-agentes-con-id-grupo-inexistente-entornos-metaconsola' into 'develop' 
remove any agent belonging to a non-existent group

See merge request artica/pandorafms!4256
 2021-07-06 09:29:14 +00:00
fbsanchez
e6acc2c28b restore centralised mode for all 2021-07-05 21:20:49 +02:00
José González
9e49ed8efa MR file for this feature 2021-07-05 17:43:17 +02: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
Luis
367789f2dd Ent 7775 eliminar event alerts metaconsola 2021-07-05 07:47:17 +00: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
2a964b52f1 remove any agent belonging to a non-existent group 2021-07-01 16:11:09 +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
fbsanchez
c64b972564 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 10:51:55 +02:00
Luis
f74b74675a Removed new wiki url from talert_templates and actions from mr and added to migrate 2021-06-28 09:58:29 +00:00
alejandro.campos@artica.es
548c0c3013 fixed font reference 2021-06-28 11:27:41 +02:00
alejandro.campos@artica.es
7fa398b027 fixed font reference 2021-06-28 11:25:22 +02:00
fbsanchez
4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis
497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
fbsanchez
faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez
7937a988df Merge branch 'ent-5023-limpiar-toda-referencia-a-event-alert' into 'develop' 
remove help_event_alert.php

See merge request artica/pandorafms!3057
 2021-06-21 14:08:03 +00:00
Luis
ebceaebb58 Ent 7253 opcion formato envio informes templates 2021-06-21 13:41:14 +00:00
Marcos Alconada
827524e6d2 Update delete_files.txt 2021-06-21 06:12:55 +00:00
marcos
43cd308ef1 fixed conflicts and add removed files in delete_files.txt 2021-06-18 12:37:06 +02:00
fbsanchez
81254cf3fb WIP Plugins sync 2021-06-16 18:18:38 +02:00
Daniel Barbero Martin
841842da59 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/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
Daniel Barbero Martin
64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
fbsanchez
14495ebdc3 Current package updates 2021-06-15 11:06:46 +02:00
fbsanchez
94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez
cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada
665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez
4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Marcos Alconada
2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +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
d8dcdb5af4 Wip command center, alerts SNMP source in mr file 2021-06-07 10:32:59 +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
Daniel Rodriguez
8d847bb071 Merge branch 'ent-7544-11866-bug-en-datos-inc-con-18-digitos' into 'develop' 
Enlarge numeric data fields

See merge request artica/pandorafms!4151
 2021-05-26 13:35:50 +00:00
Daniel Barbero Martin
d91e7f6aba Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-26 08:28:42 +02:00
Daniel Maya
e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
fbsanchez
d95eec0188 Enlarge numeric data fields 2021-05-25 09:57:23 +02:00
Daniel Barbero Martin
337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
Daniel Barbero Martin
8c0a9859a8 remove synch old and check api 2021-05-19 17:08:13 +02:00
fbsanchez
09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +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
Daniel Rodriguez
13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
José González
3758c80019 Fixed delete_files entries. 2021-05-12 13:07:45 +00:00
Luis
7d56552e72 Added missing fields to alert snmp actions 2021-05-12 12:54:36 +00:00
José González
9e9ea4d00a Merge with last develop 2021-05-12 09:17:32 +02:00