Commit Graph

1645 Commits

Author SHA1 Message Date
Daniel Rodriguez c773f5abd2 Merge branch 'ent-8321-formularios-modulos-de-tendencias-ticket-7456' into 'develop'
Ent 8321 formularios modulos de tendencias ticket 7456

See merge request artica/pandorafms!4565
2021-12-13 16:14:15 +00:00
Calvo 6c94cc5e15 Fix visual bug 2021-12-13 12:00:24 +01:00
Calvo f6c0f50a90 Added missin param and Fixed error message and default interval 2021-12-10 18:00:33 +01:00
Calvo f382a5bf15 Fix trending module bugs 2021-12-03 11:02:11 +01:00
Calvo 7139b9e1b1 Switch prediction module to prediction planning 2021-12-03 10:38:25 +01:00
fbsanchez 3e7a81ea33 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-12-03 10:24:01 +01:00
Calvo 66c4087679 Added module interval control and percentage checkbox 2021-12-02 14:12:19 +01:00
Daniel Rodriguez 69590afef6 Merge branch 'ent-1831-5173-nt-nueva-funcionalidad-en-los-templates-de-alertas-para-incremento-de-valor' into 'develop'
Ent 1831 5173 nt nueva funcionalidad en los templates de alertas para incremento de valor

See merge request artica/pandorafms!4557
2021-12-02 10:51:57 +00:00
Calvo a38503491a Wip: trending prediction modules 2021-12-01 11:34:11 +01:00
alejandro.campos@artica.es bca8f6f1c0 minor fix 2021-11-30 14:08:12 +01:00
Calvo 136ad128f9 Added help tip to percentage token 2021-11-30 12:12:24 +01:00
Calvo 7d8a5b029e Changed radio buttons to select on prediction modules 2021-11-29 14:45:19 +01:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/install.php
2021-11-29 09:54:55 +01:00
Calvo 54755db59b Control inverse and percentege cannot be selected at same time 2021-11-26 11:55:38 +01:00
Daniel Rodriguez 137b3b132f Merge branch 'ent-8296-12744-Problemas-Create-a-new-webserver-module' into 'develop'
Ent 8296 12744 problemas create a new webserver module

See merge request artica/pandorafms!4554
2021-11-26 10:49:03 +00:00
alejandro.campos@artica.es d94ed13f76 minor fixes 2021-11-25 15:03:46 +01:00
alejandro.campos@artica.es 6469f8053d minor fixes 2021-11-25 15:00:57 +01:00
Calvo f76670dd28 Fix delete agent secondary ip bug 2021-11-24 14:39:42 +01:00
Calvo 4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
Conflicts:
	pandora_console/extras/mr/51.sql
2021-11-19 10:51:46 +01:00
Daniel Rodriguez 38468ff1f2 Merge branch 'ent-8215-perfiles-usuario-puede-crear-agentes-de-otros-grupos' into 'develop'
Fix ACL grous AW creation

See merge request artica/pandorafms!4523
2021-11-16 17:03:17 +00:00
Daniel Rodriguez e573e79bcd Merge branch 'ent-7784-12114-en-las-templates-de-informes-en-metaconsola-no-busca-por-grupos-secundarios' into 'develop'
Fix list agent with secondaty grouos on selec

See merge request artica/pandorafms!4303
2021-11-15 10:16:24 +00:00
Calvo 61bdc1f4e0 Fix ACL grous AW creation 2021-11-05 15:21:04 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'"
This reverts merge request !4302
2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
fbsanchez 8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
marcos 795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
fbsanchez dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +02:00
Daniel Rodriguez 3743fa6ca8 Merge branch 'ent-7922-selector-demasiado-grande-en-creacion-de-modulos' into 'develop'
less module selector width

See merge request artica/pandorafms!4384
2021-10-05 09:21:22 +00:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez 8c1838abb7 Merge remote-tracking branch 'origin/develop' into ent-7937-mensaje-this-node-is-configured-with-centralized-mode-de-nodo-sale-en-metaconsola
Conflicts:
	pandora_console/install.php
2021-09-29 13:47:10 +02:00
Daniel Rodriguez 4420ecec2c Merge branch 'ent-7514-pasar-networkmaps-a-open' into 'develop'
Ent 7514 pasar networkmaps a open

Closes pandora_enterprise#7514

See merge request artica/pandorafms!4416
2021-09-24 07:14:14 +00:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Jose Gonzalez cd1b7daa00 Fix select fields size 2021-09-20 12:16:08 +02:00
Jose Gonzalez 3af47c0e5f Open network maps 2021-09-17 10:45:01 +02:00
Daniel Rodriguez 6fff287b70 Merge branch 'ent-7314-comillas-comandos-remotos' into 'develop'
Added tip for notice to users for use single quotation

Closes pandora_enterprise#7314

See merge request artica/pandorafms!4376
2021-09-08 13:14:54 +00:00
José González 740a82253a Fixed quot string 2021-09-08 12:20:38 +02:00
Jose Gonzalez e8eb77058b Fix 2021-09-06 15:19:23 +02:00
marcos 9c425f60e8 less module selector width 2021-09-02 16:56:01 +02:00
Jose Gonzalez 73cd0fd17e Changed content of advice 2021-09-01 10:29:25 +02:00
José González 84b8973027 Added tip for notice to users for use single quotation 2021-08-27 12:49:27 +02:00
Daniel Rodriguez 16fff8b2f5 Merge branch 'ent-7619-cambiar-parametros-lanzar-snmpwalk-configuracion-modulo' into 'develop'
Change snmpwalk behaviour in module configuration

Closes pandora_enterprise#7619

See merge request artica/pandorafms!4221
2021-08-27 10:45:42 +00:00
Daniel Rodriguez b3336cdc4f Merge branch 'ent-7563-bug-carga-dinamica-icono-grupos-creacion-agente' into 'develop'
Fixed group icon on agent creation

See merge request artica/pandorafms!4145
2021-08-10 07:00:56 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop'
fixed xss vulnerability

See merge request artica/pandorafms!4196
2021-08-09 08:59:44 +00:00
Daniel Rodriguez 2963d67225 Merge branch 'ent-7767-secondary-groups-no-se-anaden-agente' into 'develop'
Improve code for get secondary groups

Closes pandora_enterprise#7767

See merge request artica/pandorafms!4259
2021-08-02 07:18:02 +00:00
Calvo 77552805a4 Fix list agent with secondaty grouos on selec 2021-07-16 13:55:31 +02:00
fbsanchez d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00
Junichi Satoh 512cfb69c5 Fixed 'Keep counters' cannot be cleared in module configuration. 2021-07-13 11:55:49 +09:00
José González 498a353a29 Improve code for get secondary groups 2021-07-02 12:20:53 +02:00
fbsanchez 7e178ed18c Fix add multiple tags at once into a module definition 2021-06-24 19:58:08 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +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
José González 0c5b8766d0 Change snmpwalk behaviour in module configuration 2021-06-18 14:05:59 +02:00
fbsanchez ae448e6eb8 Some fixes 2021-06-16 20:34:29 +02:00
Daniel Barbero Martin 452d5d0b73 Wip command center, error merge 2021-06-16 19:37:09 +02:00
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
Junichi Satoh 5fcf3eca23 Fixed problems in planned downtime below.
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
Daniel Barbero Martin 835aad542f Wip command center, agent synch 2021-06-07 12:19:03 +02:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Barbero Martin 97595ad973 Wip command center 2021-06-03 10:16:29 +02:00
fbsanchez 70b8eb77a3 Remove service elements when removing items itselves and multiple fixes 2021-06-01 12:12:07 +02:00
Daniel Rodriguez 844f583b0c Merge branch 'ent-7596-ocultar-campos-http-auth-en-modulos-web' into 'develop'
Ocultar campos http auth en modulos web en campo Web Checks

See merge request artica/pandorafms!4162
2021-05-31 11:25:25 +00:00
Calvo b253a01841 Ocultar campos http auth en modulos web en campo Web Checks 2021-05-28 14:00:43 +02:00
Jose Gonzalez 84902a5d3d Fixed code 2021-05-28 13:20:16 +02:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop'
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
2021-05-27 16:21:48 +00:00
Luis 8c100e8809 Resize vertical on textarea web/data server modules css 2021-05-26 13:39:25 +00:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs'
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
2021-05-25 13:50:17 +00:00
Calvo 8019126367 Fixed group icon on agent creation 2021-05-20 17:15:27 +02:00
Daniel Rodriguez b8fe685028 Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
implemented user level authentication for integria ims integration

See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
José González 998fb4b0dc Fixed issue with undesired deactivate dynamic threshold max field 2021-05-14 11:22:32 +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
José González 9e9ea4d00a Merge with last develop 2021-05-12 09:17:32 +02:00
Daniel Rodriguez 5a339ac76e Merge branch 'ent-7284-Warning-creación-agente' into 'develop'
Ent 7284 warning creación agente

See merge request artica/pandorafms!4017
2021-05-10 09:10:43 +00:00
Daniel Maya cdf0e1a4f4 Ent 7284 warning creación agente 2021-05-10 09:10:43 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop'
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
Daniel Rodriguez db92b65fd0 Merge branch 'ent-7211-errores-visuales-en-la-vista-de-agente' into 'develop'
resolved error with sql message error external tools2

See merge request artica/pandorafms!3979
2021-05-06 12:05:04 +00:00
José González 9ab027b286 WIP: Upload 2021-04-29 13:28:03 +02:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
Jose Gonzalez 0e12402469 Fixed message issue 2021-04-15 21:20:59 +02:00
Jose Gonzalez 3d3beca727 Added feature of generate event 2021-04-15 15:06:48 +02:00
Jose Gonzalez f8d4039314 Fixed merges 2021-04-09 10:34:25 +02:00
Daniel Rodriguez b244cd28b2 Merge branch 'ent-6962-tags-largos-no-caben-en-configuracion-modulos' into 'develop'
Added tips to large tags in module config

See merge request artica/pandorafms!3851
2021-04-07 10:52:39 +00:00
Luis 36287188b4 Added tips to large tags in module config 2021-04-07 10:52:39 +00:00
Daniel Rodriguez 7756056755 Merge branch 'ent-7242-cambio-iconos-vista-edicion-agentes' into 'develop'
restored bell and module icon with plus on agent edition view

See merge request artica/pandorafms!3988
2021-04-06 17:03:19 +00:00
Luis 4b9f8ce202 Added custom fields combo larger params 2021-04-06 16:51:14 +00:00
Calvo 8352e4d18d restored bell and module icon with plus on agent edition view 2021-03-31 10:54:58 +02:00
marcos 5d38740630 resolved error with sql message error external tools2 2021-03-29 16:54:41 +02:00
Marcos Alconada 3d350ba481 fixed visual error 2021-03-26 09:32:30 +00:00
Jose Gonzalez 4ee0c580bb WIP: Backup upload 2021-03-22 17:52:11 +01:00
Jose Gonzalez 4b7c0fc7ee WIP: Backup upload 2021-03-22 17:39:24 +01:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
Daniel Rodriguez e59600c10b Merge branch 'ent-7151-errores-visuales-en-manage-agents-modo-details' into 'develop'
Ent 7151 errores visuales en manage agents modo details

See merge request artica/pandorafms!3922
2021-03-16 16:44:40 +00:00