tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,686 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

1278 Commits

Author SHA1 Message Date
Calvo de0352f81c MR changes 2021-09-01 09:35:31 +02:00
Calvo d5910e8a3a Merge remote-tracking branch 'origin/develop' into ent-7587-error-nombre-idioma-aleman 2021-09-01 09:14:39 +02:00
fbsanchez f0791cbd4f WIP CorrelationServer 2021-08-27 15:07:14 +02:00
alejandro.campos@artica.es c07a112f4b migrate histrogram report items 2021-08-19 16:23:52 +02:00
Daniel Rodriguez fe30b9c785 Merge branch 'ent-7445-Fallo-al-almacenar-dato-string-en-tevento-dentro-de-un-evento-Alert-fired' into 'develop' 
implemented capacity to handle string data for event data

See merge request artica/pandorafms!4184
 2021-08-17 12:19:54 +00:00
alejandro.campos@artica.es 54ae7e5783 modified availability report 2021-08-16 09:43:11 +02:00
Daniel Rodriguez 7673e40613 Merge branch 'ent-7737-Pandora-recien-instalado-mensaje-de-advertencia-de-fuente-por-defecto-no-definida' into 'develop' 
fixed font reference

See merge request artica/pandorafms!4238
 2021-08-11 07:12:13 +00: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
Daniel Maya a5f9e74b50 #7881 Fixed snmp alert 2021-08-05 15:53:44 +02:00
Calvo befd3dcf15 Fix mr database name in update 2021-07-22 17:08:25 +02:00
fbsanchez e4a08855e5 Exclude LOAD section from MR until UMC-756 is deployed 2021-07-21 18:09:20 +02:00
fbsanchez f71ae73c84 Load procedures (or complex queries) in UMC 2021-07-21 17:31:03 +02:00
fbsanchez 0cec3afba0 Deactivated nodes if not unified 2021-07-19 13:47:43 +02:00
Calvo 3880cf09ea Fix german language misspell 2021-07-14 18:48:41 +02:00
fbsanchez ae9dbd9b8e Fixed query - duplicated 2021-07-13 13:17:13 +02:00
fbsanchez 84c7e6172a Query updated 2021-07-13 13:14:48 +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 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
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
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
Daniel Barbero Martin 55a1ea6f2a Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-04 17:19:35 +02:00
fbsanchez 34b02982e1 Ensure valid values (alert correlation) for compat mode for criticity, id_group and id_tag 2021-04-30 15:01:43 +02:00
fbsanchez 366e9a08d5 minor fix 2021-04-30 14:36:47 +02:00
fbsanchez 6b83deacdd Migrate old rules 2021-04-30 14:34:10 +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
Daniel Barbero Martin 1b21652ed2 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-14 08:35:02 +02:00
Jose Gonzalez 3d359dab36 Fixed merge with 7161 2021-04-13 12:55:35 +02:00
Daniel Rodriguez 751d7ec3cf Merge branch 'ent-7161-Cambiar-opciones-de-skin-en-usuarios-y-grupos' into 'develop' 
Ent 7161 cambiar opciones de skin en usuarios y grupos

See merge request artica/pandorafms!3972
 2021-04-13 09:26:50 +00:00
Daniel Maya 9bbac06771 Ent 7161 cambiar opciones de skin en usuarios y grupos 2021-04-13 09:26:50 +00: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 2a6dffd0f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-08 17:32:32 +02:00
fbsanchez 1ac6ed35cf Merge remote-tracking branch 'origin/develop' into ent-6924-cambiar-label-event-text-por-event-name 
Conflicts:
	pandora_console/extras/mr/46.sql
 2021-04-07 10:23:33 +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 cc222faddc Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/include/functions_api.php
 2021-03-25 17:00:27 +01:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Barbero Martin 0bfe060c50 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-03-24 17:30:47 +01:00