Daniel Maya
dcdcbfad88
#8786 Fixed delete address
2022-04-04 17:40:51 +02:00
Daniel Rodriguez
de75277c8a
Merge branch 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop' into 'develop'
...
Fix missing include
See merge request artica/pandorafms!4741
2022-03-15 10:47:39 +00:00
Daniel Rodriguez
a67b6647f7
Merge branch 'ent-2152-Operaciones-masivas-de-grupos-secundarios' into 'develop'
...
bulk operation edit agents add secundary groups pandora_enterprise#2152
See merge request artica/pandorafms!4677
2022-03-11 08:51:33 +00:00
Luis
d1709a631c
Merge branch 'develop' into 'ent-8664-deshabilitado-de-modulos-no-funciona-correctametne-en-docker-php8-de-develop'
...
# Conflicts:
# pandora_console/godmode/agentes/configurar_agente.php
2022-03-10 10:55:12 +00:00
Daniel Rodriguez
e637c74dbf
Merge branch 'ent-8692-Faltan-iconos-de-configuración-del-agente-en-760' into 'develop'
...
Ent 8692 faltan iconos de configuración del agente en 760
See merge request artica/pandorafms!4752
2022-03-09 13:20:12 +00:00
Daniel Maya
29906b3c53
#8692 Fixed remote config 2
2022-03-09 13:55:49 +01:00
Daniel Rodriguez
09ba16c593
Merge branch 'ent-5886-Vista-para-mostrar-modulos-agentes-en-paradas-planificadas' into 'develop'
...
clean file planned_downtime pandora_enterprise#5886
See merge request artica/pandorafms!4688
2022-03-09 12:48:47 +00:00
Daniel Maya
0a7238fe33
#8692 Fixed remote config
2022-03-09 12:06:21 +01:00
Daniel Barbero Martin
640d93045f
Merge remote-tracking branch 'origin/develop' into ent-2152-Operaciones-masivas-de-grupos-secundarios
...
Conflicts:
pandora_console/godmode/massive/massive_edit_agents.php
2022-03-09 09:28:08 +01:00
Calvo
a34ba86129
Fix missing include
2022-03-04 15:26:47 +01:00
Daniel Rodriguez
953aa2887c
Merge branch 'ent-6375-proyectos-auto-aplicacion-de-politicas' into 'develop'
...
some tools for policy-auto-application
See merge request artica/pandorafms!4526
2022-03-01 12:53:36 +00:00
José González
95e8a10fe1
Clean traces
2022-02-25 08:31:14 +01:00
José González
08b393614a
Fixed missing char
2022-02-24 14:55:47 +01:00
fbsanchez
deb46436d3
Merge remote-tracking branch 'origin/develop' into ent-6375-proyectos-auto-aplicacion-de-politicas
...
Conflicts:
pandora_console/extras/mr/52.sql
2022-02-23 12:11:44 +01:00
Daniel Rodriguez
45b97be611
Merge branch 'ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad' into 'develop'
...
Added token local user to allow enabling local auth at user level
See merge request artica/pandorafms!4668
2022-02-18 11:04:06 +00:00
Calvo
5ba7b47b85
Merge remote-tracking branch 'origin/develop' into ent-7049-permitir-seleccionar-a-nivel-de-usuario-si-autenticara-local-o-remotamente-ldap-ad
2022-02-18 09:26:55 +01:00
fbsanchez
1da5534484
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
...
Conflicts:
.gitlab-ci.yml
pandora_console/pandoradb.sql
2022-02-15 17:32:10 +01:00
fbsanchez
7c11a01b85
Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
2022-02-15 14:32:50 +01:00
Daniel Rodriguez
6abd7212e6
Merge branch 'ent-7573-Problemas-integracion-Module-Library-vs-Wordpress' into 'develop'
...
Ent 7573 problemas integracion module library vs wordpress
Closes pandora_enterprise#7573
See merge request artica/pandorafms!4634
2022-02-15 10:19:49 +00:00
Daniel Rodriguez
cbee39189f
Merge branch 'ent-8559-no-aparece-webserver-module' into 'develop'
...
Fixed issue with web_available token
Closes pandora_enterprise#8559
See merge request artica/pandorafms!4686
2022-02-11 10:51:01 +00:00
fbsanchez
4d912fbd34
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-11 09:55:34 +01:00
fbsanchez
9ba2eb0c74
Merge remote-tracking branch 'origin/develop' into ent-8161-deshabilitar-reglas-de-autoconfiguracion-en-nodos-a-demanda
...
Conflicts:
pandora_console/extras/mr/52.sql
pandora_console/pandoradb.sql
2022-02-10 18:52:51 +01:00
Daniel Barbero Martin
b56c9e6529
new modal planned_downtime resume agents/modules pandora_enterprise#5886
2022-02-09 14:57:36 +01:00
Daniel Barbero Martin
625438c1c3
clean file planned_downtime pandora_enterprise#5886
2022-02-09 10:51:18 +01:00
José González
fc4b702db0
Merge branch 'develop' into 'ent-8422-Revision-completa-audit-logs'
...
# Conflicts:
# pandora_console/godmode/alerts/configure_alert_template.php
2022-02-08 11:35:01 +00:00
Jose Gonzalez
995095afc7
Fixed issue with web_available token
2022-02-08 11:56:12 +01:00
fbsanchez
e9249d550a
removed policy stuff from configurar_agente
2022-02-07 18:53:31 +01:00
fbsanchez
e1776d7994
removed collation from filtering
2022-02-04 13:26:03 +01:00
Daniel Barbero Martin
1146afe94c
bulk operation edit agents add secundary groups pandora_enterprise#2152
2022-02-03 13:52:40 +01:00
Daniel Barbero Martin
a359fd6828
bulk operation edit agents add secundary groups pandora_enterprise#2152
2022-02-03 12:56:36 +01:00
fbsanchez
17be6f3ca5
Merge remote-tracking branch 'origin/develop' into ent-6802-super-8
2022-02-02 11:36:14 +01:00
fbsanchez
5b06942caf
DANGER COMMIT, uses schema collation instead forced one
2022-02-01 15:18:45 +01:00
Jose Gonzalez
40efaa157d
Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs
2022-02-01 13:42:30 +01:00
Calvo
11dc743dac
Planned downtime copy.
2022-01-28 10:59:08 +01:00
Calvo
0b119af949
WIP:Planned downtime copy.
2022-01-27 18:24:14 +01:00
Calvo
a92fe64b64
WIP:Planned downtime copy.
2022-01-27 18:23:07 +01:00
Jose Gonzalez
3252832cc7
WIP: Check audit logs
2022-01-20 10:55:23 +01:00
Jose Gonzalez
6fb7f317a6
Fix issues with links
2022-01-17 17:13:29 +01:00
Daniel Maya
e8d3d93f7f
Fixed pandora_black in metaconsole
2022-01-17 10:22:30 +01:00
Daniel Rodriguez
0f82255904
Merge branch 'ent-8421-extension-antigua-backups' into 'develop'
...
Ent 8421 extension antigua backups
Closes pandora_enterprise#8421
See merge request artica/pandorafms!4614
2022-01-11 10:10:29 +00:00
Daniel Rodriguez
eb9d1ff70d
Merge branch 'ent-8430-mensaje-erroneo-al-cambiar-thresholds-modulo-snmp' into 'develop'
...
Fix wrong error message when changing editing snmp modules
See merge request artica/pandorafms!4612
2022-01-07 11:59:56 +00:00
Daniel Rodriguez
e1a1281985
Merge branch 'ent-8363-edicion-de-paradas-planificadas' into 'develop'
...
Fix module edidtion on alerts only planned downtime
See merge request artica/pandorafms!4608
2022-01-05 12:33:11 +00:00
Jose Gonzalez
1e92ad99ad
Fix merge
2022-01-05 11:14:04 +01:00
Calvo
14c860aec6
Fix wrong error message when changing editing snmp modules
2022-01-04 17:50:27 +01:00
Calvo
d8ab5c1e7f
Fix module edidtion on alerts only planned downtime
2022-01-03 11:42:06 +01:00
Calvo
e4804db8cb
Planned downtime monthly same day on different hours fix
2021-12-29 18:27:18 +01:00
Jose Gonzalez
e9b619f507
Fix issue with output
2021-12-24 12:08:25 +01:00
Daniel Rodriguez
7f78a5b514
Merge branch 'ent-8179-Mensaje-anti-hacking-al-intentar-eliminar-modulos' into 'develop'
...
minor fix
See merge request artica/pandorafms!4562
2021-12-23 12:16:54 +00:00
fbsanchez
f852df2f1c
Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2
...
Conflicts:
pandora_console/extras/mr/51.sql
2021-12-14 11:03:04 +01:00
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
marcos
f05592faeb
fixed error
2021-03-16 13:12:03 +01:00
marcos
137a2c31ad
fixed visual fails
2021-03-15 15:30:56 +01:00
Daniel Maya
e4e3007def
Fixed img
2021-03-15 13:32:25 +01:00
Daniel Rodriguez
971f86601a
Merge branch 'ent-5276-AADCM-creacion-de-paradas-planificadas' into 'develop'
...
Refactored downtime editor
See merge request artica/pandorafms!3879
2021-03-15 11:29:04 +00:00
alejandro.campos@artica.es
88b4b4920f
Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas
2021-03-15 12:13:05 +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
2f7a826253
minor fixes
2021-03-11 17:54:20 +01:00
Marcos Alconada
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
Daniel Rodriguez
05a133bf77
Merge branch 'ent-4659-AADCM-Opcion-de-deshabilitar-mediante-checks-varios-modulos-desde-la-vista-de-agente' into 'develop'
...
added option to disable selected agents massively
See merge request artica/pandorafms!3874
2021-03-10 15:55:07 +00:00
alejandro.campos@artica.es
5c3b5d2be0
minor fixes in scheduled downtime setup
2021-03-10 13:02:17 +01:00
alejandro.campos@artica.es
b117bbfd7e
Refactored downtime editor
2021-03-04 16:27:14 +01:00
Alejandro Campos
d4054f15d0
Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora'
...
# Conflicts:
# pandora_console/extras/mr/45.sql
# pandora_console/godmode/alerts/configure_alert_action.php
# pandora_server/util/pandora_db.pl
2021-03-04 10:27:07 +00:00
alejandro.campos@artica.es
9b3f6f1efb
added option to disable selected agents massively
2021-03-02 10:42:08 +01:00
Daniel Rodriguez
23edf2f11f
Merge branch 'ent-6751-Al-poner-en-unidades-distintas-del-selector-no-se-puede-volver-a-dejar-en-blanco' into 'develop'
...
Ent 6751 al poner en unidades distintas del selector no se puede volver a dejar en blanco
See merge request artica/pandorafms!3695
2021-03-01 12:14:54 +00:00
Daniel Rodriguez
f6d9997b16
Merge branch 'ent-6547-Visual-styles-cambio-de-tamaño-agente-modulo-y-descripcion' into 'develop'
...
Ent 6547 visual styles cambio de tamaño agente modulo y descripcion
See merge request artica/pandorafms!3707
2021-03-01 10:57:08 +00:00
Daniel Rodriguez
b2ed2f5511
Merge branch 'ent-6833-planned-downtimes-any-no-funciona' into 'develop'
...
Fix issue with adding agents and modules
Closes pandora_enterprise#6833
See merge request artica/pandorafms!3723
2021-03-01 10:05:59 +00:00
Daniel Rodriguez
1767712c72
Merge branch 'ent-2530-bug-tokens-webserver-module' into 'develop'
...
Fixed tokens htpp_auth user,avoid repetiton
See merge request artica/pandorafms!3734
2021-03-01 09:53:55 +00:00
Jose Gonzalez
7cfc1d2f9a
Fixed issue with all modules
2021-02-25 16:08:02 +01:00
alejandro.campos@artica.es
901d12fec0
Integration with Integria
2021-02-25 13:18:04 +01:00
Jose Gonzalez
26a788b2e9
Added control for max agents in groups
2021-01-26 12:35:08 +01:00
alejandro-campos
366d02f203
Merge remote-tracking branch 'origin/ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-2' into ent-6354-Bug-de-creacion-de-dashboard-con-permisos-no-ALL-3
2021-01-14 09:22:06 +01:00
Luis Calvo
a8ab897d44
Fixed tokens htpp_auth user,avoid repetiton
2020-12-17 17:42:53 +01:00
Jose Gonzalez
dc5a0eb5b9
Fix issue with adding agents and modules
2020-12-14 17:33:58 +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
fcf4b6c239
Fixed Agent and module text size
2020-12-10 12:06:56 +01:00
Daniel Maya
244c4d56d6
Fixed unit
2020-12-04 12:32:38 +01:00
Daniel Maya
296cb9125e
Ent 5316 anadir seccion credential store al menu de discovery
2020-12-03 14:48:12 +01:00
Jose Gonzalez
649442f794
Updated copyrights
2020-11-27 13:52:35 +01:00
fbsanchez
df03b77b60
Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo
2020-11-26 12:57:37 +01:00
fbsanchez
146f3b44d9
Merge remote-tracking branch 'origin/develop' into ent-3653-finalizacion-de-paradas-planificadas-al-dia-siguiente-de-su-comienzo
2020-11-26 11:30:39 +01:00
fbsanchez
d18fffb0cb
Merge remote-tracking branch 'origin/develop' into ent-6445-excesivo-tiempo-de-carga-web-cuando-un-servidor-esta-caido
...
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
2020-11-25 12:07:53 +01:00
Daniel Rodriguez
e8d628a049
Merge branch 'ent-6175-10434-problemas-con-la-creacion-y-asignacion-de-componentes-locales-en-el-campo-unit' into 'develop'
...
Ent 6175 10434 problemas con la creacion y asignacion de componentes locales en el campo unit
See merge request artica/pandorafms!3452
2020-11-20 13:23:12 +01:00
Daniel Rodriguez
01b315de3f
Merge branch 'ent-#10872-GUARDIA-Problemas-menus-de-modulos' into 'develop'
...
added check for element
See merge request artica/pandorafms!3577
2020-11-04 16:40:36 +01:00
Daniel Rodriguez
4f3e09c6c3
Merge branch 'ent-6488-URL-creación-de-agentes-sin-redireccionar-se-crea-agente-con-grupo-0' into 'develop'
...
Ent 6488 url creación de agentes sin redireccionar se crea agente con grupo 0
See merge request artica/pandorafms!3541
2020-10-29 13:43:10 +01:00
alejandro-campos
315e522b2e
added check for element
2020-10-27 12:01:38 +01:00
alejandro-campos
def59508ae
changed behavior of all group acl check and fixed acl vulnerabilities
2020-10-22 12:00:44 +02:00
fbsanchez
42cca865ac
groups_get_children and propagate update
2020-10-21 11:38:57 +02:00
Daniel Maya
3c95d17482
Fixed new_agent
2020-10-20 16:15:42 +02:00
fbsanchez
5a5fb6eeea
Allow define time start greater than time end in weekly planed downtimes
2020-10-07 14:49:46 +02:00
fbsanchez
2187f9d0c9
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
...
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
2020-10-02 14:56:07 +02:00
fbsanchez
ea3f147bad
minor fixes group selector
2020-10-02 14:31:41 +02:00
fbsanchez
b07d24ed25
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
...
Conflicts:
pandora_console/include/functions_api.php
pandora_console/operation/events/events.php
2020-09-30 18:38:27 +02:00
Daniel Rodriguez
311186a70a
Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop'
...
fixed mobile console donut charts
See merge request artica/pandorafms!3470
2020-09-30 13:19:06 +02:00
fbsanchez
b7c2913071
Avoid create agent if no group is selected
2020-09-29 15:49:10 +02:00
fbsanchez
d73c215b91
Avoid create agent if no group is selected
2020-09-29 15:48:20 +02:00
fbsanchez
5d63bc547e
Group selection review
2020-09-29 14:22:58 +02:00
fbsanchez
5f4893ef1a
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
2020-09-29 12:47:11 +02:00
Daniel Rodriguez
f8bfd6c99b
Merge branch 'ent-6119-cambiar-critical-warning-status-por-critical-warning-threshold' into 'develop'
...
Ent 6119 cambiar critical warning status por critical warning threshold
See merge request artica/pandorafms!3423
2020-09-23 14:06:09 +02:00
Daniel Barbero Martin
c6165fbdee
fixed mobile console donut charts
2020-09-21 15:13:07 +02:00
fbsanchez
4fb69f343a
minor fix
2020-09-17 19:32:28 +02:00
fbsanchez
867fccf604
Custom id improvements
2020-09-17 14:38:01 +02:00