Daniel Rodriguez
f134377b37
Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop'
...
Ent 7547 tree view no filtra bien dashboard
See merge request artica/pandorafms!4136
2021-06-21 14:01:32 +00:00
Daniel Maya
878a5321e8
Ent 7547 tree view no filtra bien dashboard
2021-06-21 14:01:32 +00:00
Daniel Rodriguez
19579c0801
Merge branch 'ent-7505-11819-Bug-en-widget-Tree-view' into 'develop'
...
Ent 7505 11819 bug en widget tree view
See merge request artica/pandorafms!4125
2021-06-21 13:58:57 +00:00
Daniel Rodriguez
314639dc30
Merge branch 'ent-7594-custom-profile-acl-enterprise' into 'develop'
...
Fix dashboards ACLs
Closes pandora_enterprise#7594
See merge request artica/pandorafms!4154
2021-06-21 13:43:13 +00:00
Luis
ebceaebb58
Ent 7253 opcion formato envio informes templates
2021-06-21 13:41:14 +00:00
Daniel Rodriguez
6f98ae05a1
Merge branch 'ent-7038-regex-agent-filter-generacion-informe-tasks' into 'develop'
...
Added agent regex to console task template send email
Closes pandora_enterprise#7038
See merge request artica/pandorafms!4135
2021-06-21 10:21:48 +00:00
Daniel Rodriguez
f4bf9027b1
Merge branch 'ent-7389-Vulnerabilidad-Cross-Site-Scripting-Consola' into 'develop'
...
Ent 7389 vulnerabilidad cross site scripting consola
See merge request artica/pandorafms!4096
2021-06-21 10:18:37 +00:00
Daniel Rodriguez
c5dab9b99b
Merge branch 'ent-7488-pantallazo-blanco-config.php-installer-activo' into 'develop'
...
Ent 7488 pantallazo blanco config.php installer activo
See merge request artica/pandorafms!4106
2021-06-21 10:17:12 +00:00
Luis
10059822cd
Ent 7488 pantallazo blanco config.php installer activo
2021-06-21 10:17:12 +00:00
fbsanchez
fc0b605cee
Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios
2021-06-21 12:13:46 +02:00
marcos
951924dd93
colspan 1 to group selector custom graph
2021-06-21 11:40:48 +02:00
marcos
5aeab363e9
more size for select owner modal events
2021-06-21 11:25:19 +02:00
Daniel Rodriguez
f5221083b1
Merge branch 'ent-7244-Errores-network-tools' into 'develop'
...
Solved issues with double quotes and improve the code
Closes pandora_enterprise#7244
See merge request artica/pandorafms!4101
2021-06-21 09:13:35 +00:00
Daniel Rodriguez
95a152752b
Merge branch 'ent-7555-11820-Filtro-de-eventos-en-widget-Lastest-events' into 'develop'
...
Ent 7555 11820 filtro de eventos en widget lastest events
See merge request artica/pandorafms!4142
2021-06-21 09:10:45 +00:00
Marcos Alconada
827524e6d2
Update delete_files.txt
2021-06-21 06:12:55 +00:00
artica
447d463518
Auto-updated build strings.
2021-06-21 01:00:36 +02:00
artica
dd5e7e550d
Auto-updated build strings.
2021-06-20 01:00:37 +02:00
artica
682a977ef1
Auto-updated build strings.
2021-06-19 01:00:49 +02:00
fbsanchez
1f34cf8596
Massive operation over service elements
2021-06-18 15:36:52 +02:00
marcos
43cd308ef1
fixed conflicts and add removed files in delete_files.txt
2021-06-18 12:37:06 +02:00
marcos
36dd93701a
Merge remote-tracking branch 'origin/develop' into ent-5023-limpiar-toda-referencia-a-event-alert
2021-06-18 12:28:58 +02:00
Daniel Barbero Martin
1e183c2b60
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-18 08:49:57 +02:00
artica
0c1918eb3c
Auto-updated build strings.
2021-06-18 01:00:44 +02:00
Daniel Barbero Martin
6366040ec2
Wip command center, check versions php.ini
2021-06-17 17:09:44 +02:00
rafael.ameijeiras
84f1710a87
change memory_limit to 800M for new update manager
2021-06-17 15:06:16 +02:00
fbsanchez
1401f30e84
Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center
2021-06-17 14:49:25 +02:00
Daniel Barbero Martin
50c7394e7d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-17 08:23:46 +02:00
artica
e5cbcd070b
Auto-updated build strings.
2021-06-17 01:00:42 +02:00
fbsanchez
ae448e6eb8
Some fixes
2021-06-16 20:34:29 +02:00
fbsanchez
d2710b2e66
Clean components when removing plugin (server)
2021-06-16 19:39:25 +02:00
Daniel Barbero Martin
452d5d0b73
Wip command center, error merge
2021-06-16 19:37:09 +02:00
fbsanchez
81254cf3fb
WIP Plugins sync
2021-06-16 18:18:38 +02:00
fbsanchez
b032beb559
Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center
2021-06-16 17:27:06 +02:00
Daniel Barbero Martin
c6877154fb
Wip command center, Plugins in meta
2021-06-16 17:26:19 +02:00
José González
09d5657650
Solve typo
2021-06-16 16:36:14 +02:00
Calvo
06f3b0ea36
Fixed SNMP interface wizard modules with special chars
2021-06-16 16:30:45 +02:00
fbsanchez
b701b2be32
Plugin sync
2021-06-16 15:53:05 +02:00
marcos
493047ae40
fixed visual error
2021-06-16 14:17:45 +02:00
fbsanchez
b8d3d962a0
Minor CDE
2021-06-16 12:44:03 +02:00
fbsanchez
9ed895d457
Fixes in pie coauth: daniel
2021-06-16 11:41:57 +02:00
José González
39f3e1987e
Fixed bye bye
2021-06-16 10:15:53 +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
artica
90905d72f5
Auto-updated build strings.
2021-06-16 01:00:23 +02:00
Daniel Barbero Martin
5b1498e08c
Wip command center, Plugins in meta
2021-06-15 17:40:48 +02:00
Daniel Barbero Martin
64dd4f2c2b
Wip command center, Plugins in meta
2021-06-15 17:24:03 +02:00
Daniel Rodriguez
9fcde88ebf
Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop'
...
pandora_ha enterprise components fixed
See merge request artica/pandorafms!4202
2021-06-15 13:11:21 +00:00
alejandro.campos@artica.es
e8b62561b7
fixed entities
2021-06-15 14:53:00 +02:00
fbsanchez
04e2919497
Avoid using old data when parsing progress
2021-06-15 14:43:11 +02:00
fbsanchez
14495ebdc3
Current package updates
2021-06-15 11:06:46 +02:00
Daniel Barbero Martin
9e6f3f7b46
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-15 10:35:50 +02:00
Daniel Barbero Martin
f9bbc132a6
Wip command center, collections merge restore
2021-06-15 10:35:34 +02:00
artica
2f0cebe979
Auto-updated build strings.
2021-06-15 01:00:51 +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
marcos
2e5073e1ba
new background image UM
2021-06-14 16:12:48 +02:00
Marcos Alconada
42274e7252
changed UM image background
2021-06-14 13:31:37 +00:00
fbsanchez
4db0f75763
Refresh & delete collections Async - synchronization
2021-06-14 14:54:07 +02:00
marcos
0521ffb7bf
fixed sql error without profile
2021-06-14 14:46:41 +02:00
marcos
afa1eef63c
fixed sql error without profile
2021-06-14 14:10:16 +02:00
Daniel Rodriguez
08011d60b2
Merge branch 'ent-7122-nuevo-update-manager' into 'develop'
...
Embebed UMC in Pandora FMS
See merge request artica/pandorafms!3894
2021-06-14 11:56:43 +00: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
Daniel Barbero Martin
a7c1c49636
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-14 08:42:31 +02:00
José González
e17b63e6fc
Fixed issue with single line
2021-06-14 08:16:35 +02:00
artica
595fabb232
Auto-updated build strings.
2021-06-14 01:00:18 +02:00
artica
e7a204d6d8
Auto-updated build strings.
2021-06-13 01:00:16 +02:00
artica
8272eb4f5b
Auto-updated build strings.
2021-06-12 01:00:21 +02:00
José González
6db03d943d
Merge branch 'develop' into 'ent-7594-custom-profile-acl-enterprise'
...
# Conflicts:
# pandora_console/index.php
2021-06-11 13:57:10 +00:00
José González
b3aa47877d
Fixed issue with meta
2021-06-11 15:54:04 +02:00
fbsanchez
86f2beb587
Agent collection synchronization aysnc some improvements
2021-06-11 13:55:18 +02:00
fbsanchez
9c314bcd39
Files reviewed & tested
2021-06-11 13:04:06 +02:00
fbsanchez
085e0ba300
Added Files class to handle zip/unzip/rmrf and more
2021-06-11 10:48:58 +02:00
Daniel Rodriguez
81c2ebc43b
Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop'
...
Fix treeview modules sql inner condition
See merge request artica/pandorafms!4195
2021-06-11 08:44:44 +00:00
Daniel Rodriguez
0adcf5aac2
Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop'
...
add new link documentation
See merge request artica/pandorafms!4188
2021-06-11 08:32:06 +00:00
Daniel Rodriguez
d0c122c193
Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
...
Ent 7519 cambio de fuentes en la consola a nivel global
See merge request artica/pandorafms!4194
2021-06-11 08:24:27 +00:00
alejandro.campos@artica.es
98f0bc9fac
fixed xss vulnerability
2021-06-11 08:54:00 +02:00
alejandro.campos@artica.es
cb5905b000
fixed xss vulnerability
2021-06-11 08:52:10 +02:00
Daniel Barbero Martin
75b889875e
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-11 08:41:23 +02:00
artica
876e776d29
Auto-updated build strings.
2021-06-11 01:00:09 +02:00
fbsanchez
ae34209f52
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 21:45:50 +02:00
fbsanchez
f6f0d35a5f
Collections Async synchronization Meta <=> Nodes
2021-06-10 21:36:54 +02:00
Calvo
e0b3536d1b
Fix treeview modules sql inner condition
2021-06-10 18:00:53 +02:00
marcos
1165ea11b9
cambio de fuentes css
2021-06-10 17:42:39 +02:00
artica
ace916bc8e
Updated version and build strings.
2021-06-10 17:12:11 +02:00
marcos
45667da362
cambio de fuentes css
2021-06-10 16:21:06 +02:00
marcos
e75abd1d2f
cambio de fuentes css
2021-06-10 16:13:45 +02:00
Daniel Barbero Martin
b4e1c9d61f
Wip command center, api call node
2021-06-10 14:15:36 +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 Barbero Martin
9e27843b19
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-10 08:51:48 +02:00
Daniel Barbero Martin
a9864f7d87
Wip command center, clean functions db
2021-06-10 08:45:50 +02:00
artica
5ad364cc4a
Auto-updated build strings.
2021-06-10 01:00:20 +02:00
fbsanchez
5b9098b7b0
Allow API access to nodes registered into the MC
2021-06-09 19:23:17 +02: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
50282dccf4
add new link documentation
2021-06-09 16:55:25 +02:00
Daniel Rodriguez
d58e9f634a
Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
...
Ent 7519 cambio de fuentes en la consola a nivel global
See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
Marcos Alconada
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
Daniel Rodriguez
95832cd071
Merge branch 'ent-7652-iconos-para-black-theme' into 'develop'
...
changed icons for black theme
See merge request artica/pandorafms!4186
2021-06-09 13:12:47 +00:00
Marcos Alconada
8814b1f971
changed icons for black theme
2021-06-09 13:12:47 +00:00
Daniel Rodriguez
73f54c3375
Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop'
...
fixed bug
See merge request artica/pandorafms!4185
2021-06-09 12:37:59 +00:00
Daniel Rodriguez
79499204ce
Merge branch 'ent-fix-planned-downtime' into 'develop'
...
Fixed problems in planned downtime
See merge request artica/pandorafms!4181
2021-06-09 10:49:48 +00:00
alejandro.campos@artica.es
13850e52d5
fixed bug
2021-06-09 10:41:45 +02:00
Daniel Barbero Martin
e54fde338d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-09 08:22:04 +02:00
artica
2953870e4f
Auto-updated build strings.
2021-06-09 01:00:20 +02:00
Jose Gonzalez
9f120280a2
Change token for hash generation
2021-06-08 14:21:33 +02:00
Daniel Barbero Martin
df2f72cce3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-08 08:22:16 +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
artica
a63a4efb71
Auto-updated build strings.
2021-06-08 01:00:20 +02:00
fbsanchez
bbbadff426
Minor style fixes - missed files - in massive services
2021-06-07 21:19:11 +02:00
Daniel Barbero Martin
3a947d31bd
Wip command center, collections merge
2021-06-07 17:58:36 +02:00
Daniel Barbero Martin
c0103367fd
Wip command center, masive edit operations
2021-06-07 13:38:07 +02:00
Daniel Barbero Martin
835aad542f
Wip command center, agent synch
2021-06-07 12:19:03 +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
8b7c5c08c6
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-07 08:32:15 +02:00
artica
bc6b4acd8b
Auto-updated build strings.
2021-06-07 01:00:19 +02:00
artica
656105cdf0
Auto-updated build strings.
2021-06-06 01:00:14 +02:00
artica
2513693ada
Auto-updated build strings.
2021-06-05 01:00:19 +02:00
Daniel Maya
11a6c41728
Fixed url
2021-06-04 14:52:53 +02:00
Calvo
2f3cae8d61
Fixedd XSS on load filter event name
2021-06-04 13:36:32 +02:00
Marcos Alconada
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
Daniel Rodriguez
77b05de784
Merge branch 'ent-fix-bulk-alert-operations' into 'develop'
...
Fixed that restricted users can add/delete all alert templates using bulk alert operations.
See merge request artica/pandorafms!4171
2021-06-04 10:24:51 +00:00
Daniel Barbero Martin
da6c75f5b0
Wip command center, alerts SNMP broken
2021-06-04 11:34:12 +02:00
Daniel Rodriguez
90a5a1c1a3
Merge branch 'ent-5785-Nuevo-informe-inventario-de-agentes' into 'develop'
...
Added new item type in reports
See merge request artica/pandorafms!4133
2021-06-04 09:03:32 +00:00
alejandro.campos@artica.es
c9edf8081c
excluded report item from templates list
2021-06-04 10:50:06 +02:00
alejandro.campos@artica.es
70946af507
Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes
2021-06-04 10:32:45 +02:00
Daniel Rodriguez
d11ddfe059
Merge branch 'ent-7342-Bug-en-busqueda-de-usuarios' into 'develop'
...
fixed bug in users search
See merge request artica/pandorafms!4085
2021-06-04 07:49:56 +00:00
Daniel Rodriguez
8aae3f79be
Merge branch 'ent-7650-no-aparecen-graph-buttons' into 'develop'
...
Fixed missed buttons, improve code and added go back button when create-update
Closes pandora_enterprise#7650
See merge request artica/pandorafms!4169
2021-06-04 07:46:59 +00:00
Junichi Satoh
3563a99703
Fixed that restricted users can see all alert templates.
2021-06-04 16:01:16 +09:00
Daniel Barbero Martin
ca59034cf3
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-04 08:13:20 +02:00
artica
8976ec4b6e
Auto-updated build strings.
2021-06-04 01:00:19 +02:00
Daniel Rodriguez
a12c692972
Merge branch 'ent-fix-custom-report' into 'develop'
...
Fixed custom report
See merge request artica/pandorafms!4167
2021-06-03 15:08:26 +00:00
Jose Gonzalez
08c945d91d
Fixed missed buttons, improve code and added go back button when create-update
2021-06-03 15:37:11 +02:00
alejandro.campos@artica.es
fb5ecaeef4
minor fixes in report item
2021-06-03 13:49:10 +02:00
Daniel Rodriguez
5040b4b265
Merge branch 'ent-7602-XSS-nombre-consolas-visuales' into 'develop'
...
Improved code and fix xss vulnerability
Closes pandora_enterprise#7602
See merge request artica/pandorafms!4157
2021-06-03 11:37:15 +00:00
Daniel Rodriguez
b5802d41c7
Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop'
...
Fix vulnerability with directories created in upper levels
Closes pandora_enterprise#7604
See merge request artica/pandorafms!4158
2021-06-03 11:36:22 +00:00
alejandro.campos@artica.es
b8c6922902
minor fixes in report item
2021-06-03 12:04:25 +02:00
Daniel Barbero Martin
97595ad973
Wip command center
2021-06-03 10:16:29 +02:00
Daniel Barbero Martin
030a4fed6a
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-03 08:15:30 +02:00
artica
e1ae9d7908
Auto-updated build strings.
2021-06-03 01:00:17 +02:00
alejandro.campos@artica.es
36eb084824
minor fixes
2021-06-02 19:02:25 +02:00
alejandro.campos@artica.es
84905a6579
minor fixes in report item
2021-06-02 18:39:33 +02:00
Daniel Barbero Martin
ea90a61b06
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-02 18:27:15 +02:00
Jose Gonzalez
7895a82268
Fixed issue with types
2021-06-02 16:06:00 +02:00
Jose Gonzalez
897a98eab6
Handle directory paths for file upload
2021-06-02 13:17:34 +02:00
alejandro.campos@artica.es
9513386ff7
prevent nonadmin users from viewing admin users in pandora search
2021-06-02 12:47:55 +02:00
Daniel Rodriguez
2edc1c73a7
Merge branch 'ent-7432-giss-11799-modulos-deshabilitados-en-servicios' into 'develop'
...
Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted
See merge request artica/pandorafms!4166
2021-06-02 10:35:32 +00:00
fbsanchez
f003c37b09
Changes in disabled method - Module class
2021-06-02 10:05:31 +02:00
marcos
802dc50b79
fixed error updating item reporting
2021-06-02 09:18:40 +02:00
alejandro.campos@artica.es
24990b26f3
minor fix for pdfs
2021-06-02 09:06:39 +02:00
Junichi Satoh
740a3b6d3e
Fixed following problems.
...
- csv export of custom report with custom graph did not work correctly.
- number of users in default login screen was not correct with restricted user login.
2021-06-02 15:25:33 +09:00
Daniel Barbero Martin
18f414ce5b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-02 08:09:32 +02:00
artica
2a5b5591a3
Auto-updated build strings.
2021-06-02 01:00:45 +02:00
Daniel Barbero Martin
2f536c7577
Wip command center
2021-06-01 19:36:56 +02:00
alejandro.campos@artica.es
8492a7d1c9
created agents inventory report item
2021-06-01 18:05:45 +02:00
alejandro.campos@artica.es
59834088bf
created agents inventory report item
2021-06-01 18:04:01 +02:00
fbsanchez
70b8eb77a3
Remove service elements when removing items itselves and multiple fixes
2021-06-01 12:12:07 +02:00
fbsanchez
a98a72354b
Controlled unhandled exceptions in index and some fixes in Module class while item is being deleted
2021-06-01 10:04:53 +02:00
alejandro.campos@artica.es
9cbe6a2924
created new report item
2021-06-01 09:43:55 +02:00
Daniel Barbero Martin
ddc4b47d0b
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-06-01 08:34:32 +02:00
artica
b0e3b0aa24
Auto-updated build strings.
2021-06-01 01:00:09 +02:00
Daniel Barbero Martin
a996c272e4
Wip command center
2021-05-31 17:32:53 +02:00
Daniel Barbero Martin
3a85c69043
Wip command center
2021-05-31 14:58:36 +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
alejandro.campos@artica.es
3362106afe
added agents inventory report item
2021-05-31 13:13:25 +02:00
Daniel Barbero Martin
33618af381
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-31 08:40:09 +02:00
artica
ff3eb72420
Auto-updated build strings.
2021-05-31 01:00:34 +02:00
artica
20d3399d39
Auto-updated build strings.
2021-05-30 01:00:20 +02:00
artica
ec8ffea249
Auto-updated build strings.
2021-05-29 01:00:10 +02:00
Daniel Barbero Martin
12e67380ee
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-28 14:37:20 +02:00
Daniel Barbero Martin
d88520f752
Wip command center
2021-05-28 14:32:41 +02:00
Daniel Rodriguez
9f57b02295
Merge branch 'ent-7002-Revision-cabeceras-codigo-faltante' into 'develop'
...
Fixed code
Closes pandora_enterprise#7002
See merge request artica/pandorafms!4161
2021-05-28 12:31:14 +00:00
Calvo
275c6d321b
Fixed alert command hide on update
2021-05-28 14:29:53 +02:00
Calvo
8010b375dd
trace deleted
2021-05-28 14:10:12 +02:00
Calvo
b253a01841
Ocultar campos http auth en modulos web en campo Web Checks
2021-05-28 14:00:43 +02:00
Jose Gonzalez
cf358341fb
Fixed issue with css file in meta
2021-05-28 13:47:14 +02:00
Jose Gonzalez
84902a5d3d
Fixed code
2021-05-28 13:20:16 +02:00
Calvo
62272a1f3f
Unset field tcp send when snmp remote component selected
2021-05-28 12:45:39 +02:00
Daniel Rodriguez
2eb85562c2
Merge branch 'ent-7468-campo-plugin-falla-bandwith-politicas' into 'develop'
...
Fixed issue with id_plugin with bandwidth modules
Closes pandora_enterprise#7468
See merge request artica/pandorafms!4159
2021-05-28 10:38:21 +00:00
Daniel Barbero Martin
8c7654cd2d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
...
Conflicts:
pandora_console/godmode/setup/os.php
pandora_console/include/styles/pandora.css
pandora_console/operation/users/user_edit.php
2021-05-28 08:26:19 +02:00
marcos
29f1a8a720
resolve merge conflcit
2021-05-28 08:10:14 +02:00
artica
059b14dbf6
Auto-updated build strings.
2021-05-28 01:00:43 +02:00
José González
91e870edbc
Fixed issue with id_plugin with bandwidth modules
2021-05-27 22:06:58 +02:00
Daniel Rodriguez
0b158028f3
Merge branch 'ent-7560-item-de-excxeption-no-funciona-en-metaconsola-con-not-ok' into 'develop'
...
Fixed report exception item with not ok on meta
See merge request artica/pandorafms!4143
2021-05-27 16:23:20 +00:00
Luis
db306a30b9
Fixed report exception item with not ok on meta
2021-05-27 16:23:20 +00:00
Daniel Rodriguez
be77599c07
Merge branch 'ent-7337-tree-view-os-no-aparecen-not-init-modules' into 'develop'
...
Fixed not showing agents with not init modules on os treeview
See merge request artica/pandorafms!4120
2021-05-27 16:22:47 +00:00
Luis
cb6f130ab0
Fixed not showing agents with not init modules on os treeview
2021-05-27 16:22:47 +00:00
Daniel Rodriguez
791f007ff6
Merge branch 'ent-7502-11735-problemas-visuales-tema-oscuro' into 'develop'
...
fixed visual error on alerts black theme
See merge request artica/pandorafms!4113
2021-05-27 16:22:19 +00:00
Marcos Alconada
e2cfc5d615
fixed visual error on alerts black theme
2021-05-27 16:22:19 +00: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
Daniel Rodriguez
0808960537
Merge branch 'ent-7259-tabla-tickets-integria-descompensada' into 'develop'
...
Integria tickets table visual fix
See merge request artica/pandorafms!4003
2021-05-27 16:21:17 +00:00
Luis
6681d9fd67
Integria tickets table visual fix
2021-05-27 16:21:17 +00:00
Daniel Rodriguez
c2314717e3
Merge branch 'ent-7467-wizard-snmp-falla-para-modulos-que-usen-braa' into 'develop'
...
Ent 7467 wizard snmp falla para modulos que usen braa
See merge request artica/pandorafms!4139
2021-05-27 16:19:08 +00:00
Daniel Rodriguez
f93ff84123
Merge branch 'ent-7474-boton-descolocado-en-modal-de-update-online-open' into 'develop'
...
fixed visual error with update manager online open
See merge request artica/pandorafms!4105
2021-05-27 16:17:47 +00:00
Marcos Alconada
87dd11f99c
fixed visual error with update manager online open
2021-05-27 16:17:47 +00:00
José González
57eeb9a1db
Fix vulnerability with directories created in upper levels
2021-05-27 16:19:51 +02:00
marcos
94cd396072
changed button position
2021-05-27 15:49:20 +02:00
José González
3aee7e7c4d
Improved code and fix xss vulnerability
2021-05-27 14:55:01 +02:00
José González
a495b96bd6
Fix dashboards ACLs
2021-05-27 12:16:17 +02:00
alejandro.campos@artica.es
7abe6d5446
created new report item
2021-05-27 11:22:01 +02:00
marcos
403f326f55
resolve merge conflcit
2021-05-27 09:57:06 +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
artica
9103f671e2
Auto-updated build strings.
2021-05-27 01:00:43 +02:00
fbsanchez
50242d3030
OID fixes while retrieving from remote Satellite server
2021-05-26 17:55:30 +02:00
Daniel Barbero Martin
fb4358945b
Wip command center
2021-05-26 17:36:02 +02:00
Daniel Rodriguez
74b38f299e
Merge branch 'ent-7183-limitar-expansion-lateral-modulos-web-data-server' into 'develop'
...
Resize vertical on textarea web/data server modules css
See merge request artica/pandorafms!4011
2021-05-26 13:39:25 +00:00
Luis
8c100e8809
Resize vertical on textarea web/data server modules css
2021-05-26 13:39:25 +00:00
Daniel Rodriguez
e3cd5b6d56
Merge branch 'ent-7468-snmp-wizard-modulos-plugin-no-configuran-campo-plugin' into 'develop'
...
Fixed missed parameter
Closes pandora_enterprise#7468
See merge request artica/pandorafms!4097
2021-05-26 13:38:43 +00:00
Daniel Rodriguez
cfc70da64c
Merge branch 'ent-7522-Duplicate-modules-de-tipo-remote-cmd-no-clona-la-IP' into 'develop'
...
Ent 7522 duplicate modules de tipo remote cmd no clona la ip
See merge request artica/pandorafms!4123
2021-05-26 13:38:17 +00:00
Daniel Rodriguez
104205a372
Merge branch 'ent-7455-No-funciona-check-de-exec-server' into 'develop'
...
Ent 7455 no funciona check de exec server
See merge request artica/pandorafms!4086
2021-05-26 13:37:27 +00:00
Daniel Rodriguez
693e3988b9
Merge branch 'ent-7182-barra-de-busqueda-no-funciona-correctamente' into 'develop'
...
Changed search bar text
See merge request artica/pandorafms!4004
2021-05-26 13:36:47 +00: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 Rodriguez
c3ea89597c
Merge branch 'ent-7584-no-se-puede-cerrar-ventana' into 'develop'
...
Improve code and fix issue with modal
Closes pandora_enterprise#7584
See merge request artica/pandorafms!4153
2021-05-26 13:34:00 +00:00
Daniel Rodriguez
44ea35bb69
Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop'
...
Email test working with data in text fields
See merge request artica/pandorafms!4090
2021-05-26 13:30:36 +00:00
José González
e7b59ab472
Added standarized headers
2021-05-26 10:16:23 +02:00
Daniel Barbero Martin
d91e7f6aba
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-26 08:28:42 +02:00
artica
22a9043378
Auto-updated build strings.
2021-05-26 01:00:45 +02:00
Daniel Rodriguez
b875199f28
Merge branch 'ent-7492-bug-visual-vista-agents-alerts-no-alerts' into 'develop'
...
Ent 7492 bug visual vista agents alerts no alerts
See merge request artica/pandorafms!4110
2021-05-25 15:53:41 +00:00
Luis
eb54ce9a62
Ent 7492 bug visual vista agents alerts no alerts
2021-05-25 15:53:41 +00:00
Daniel Rodriguez
96741c1864
Merge branch 'ent-7246-icono-vista-informes-y-custom-graphs' into 'develop'
...
Fixed view icon on report and custom graphs
See merge request artica/pandorafms!4002
2021-05-25 15:53:05 +00:00
Daniel Rodriguez
305941bb1d
Merge branch 'ent-7361-fallos-visuales-agent-alerts' into 'develop'
...
Fixed visual issues
Closes pandora_enterprise#7361
See merge request artica/pandorafms!4061
2021-05-25 15:52:22 +00:00
Daniel Rodriguez
f01eec72dc
Merge branch 'ent-7460-fallo-visual-en-error-creacion-usuario' into 'develop'
...
Fixed visual bug on user creation error
See merge request artica/pandorafms!4088
2021-05-25 15:51:49 +00:00
Daniel Rodriguez
d4dceb0a6c
Merge branch 'ent-7344-Selector-de-Dashboards-desplazado' into 'develop'
...
Ent 7344 selector de dashboards desplazado
See merge request artica/pandorafms!4089
2021-05-25 15:51:16 +00:00
Daniel Barbero Martin
6b248da428
Wip command center
2021-05-25 17:39:21 +02:00
José González
a36718c724
Improve code and fix issue with modal
2021-05-25 16:19:41 +02: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
Daniel Rodriguez
bbcf140466
Merge branch 'ent-4991-API-editar-scheduled-downtimes-y-añadir-eliminar-agentes-de-ellas' into 'develop'
...
Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas
See merge request artica/pandorafms!4069
2021-05-25 13:40:33 +00:00
Daniel Maya
7eaaa1f371
Ent 4991 api editar scheduled downtimes y añadir eliminar agentes de ellas
2021-05-25 13:40:33 +00:00
Daniel Rodriguez
adb038dd5f
Merge branch 'ent-7590-fallo-servicios-modulos-goliat' into 'develop'
...
Fixed issue with webserver modules
Closes pandora_enterprise#7590
See merge request artica/pandorafms!4152
2021-05-25 12:48:49 +00:00
José González
e69f258f8a
Fixed issue with webserver modules
2021-05-25 12:50:25 +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
933f679d27
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-25 08:51:48 +02:00
artica
f3d6dafad2
Auto-updated build strings.
2021-05-25 01:00:38 +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
0b36853553
Wip command center
2021-05-24 17:35:15 +02:00
Junichi Satoh
362855a24e
Fixed to follow ACL with get_agents_group_json.
2021-05-24 18:56:18 +09:00
Daniel Rodriguez
4e16f5712d
Merge branch 'ent-7104-mejoras-de-legibilidad-en-correlacion-de-eventos-2' into 'develop'
...
Alert correlatioin some improvements
See merge request artica/pandorafms!4147
2021-05-24 09:26:17 +00:00
José González
d3bd24fc18
Fixed some errors and fixed issue finding policies
2021-05-24 11:01:50 +02:00
artica
3388bfa699
Auto-updated build strings.
2021-05-24 01:00:35 +02:00
artica
5366b40ac3
Auto-updated build strings.
2021-05-23 01:00:27 +02:00
artica
01e811254e
Auto-updated build strings.
2021-05-22 01:00:37 +02:00
Daniel Rodriguez
5fbfacd718
Merge branch 'ent-7558-Informe-group-event-report-no-saca-datos' into 'develop'
...
Fixed issue with group events in reports
Closes pandora_enterprise#7558
See merge request artica/pandorafms!4144
2021-05-21 12:10:04 +00:00
Daniel Rodriguez
85565ef7f9
Merge branch 'ent-7549-error-de-carga-link-publico-consolas-visuales' into 'develop'
...
Ent 7549 error de carga link publico consolas visuales
See merge request artica/pandorafms!4140
2021-05-21 12:09:30 +00:00
José González
52bad0e53c
Added CSRF validation
2021-05-21 13:59:54 +02:00
fbsanchez
26acafac47
Alert correlatioin some improvements
2021-05-21 12:57:48 +02:00
Daniel Barbero Martin
5bc6fa9394
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-21 08:35:49 +02:00
artica
f86c1c50c6
Auto-updated build strings.
2021-05-21 01:01:12 +02:00
Daniel Barbero Martin
03e857ffc8
Wip command center
2021-05-20 17:36:01 +02:00
Calvo
8019126367
Fixed group icon on agent creation
2021-05-20 17:15:27 +02:00
José González
11d1b785b2
Fixed issue with group events in reports
2021-05-20 14:44:40 +02:00
Daniel Barbero Martin
73454dd4ea
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-20 08:21:31 +02:00
artica
63da7abe47
Auto-updated build strings.
2021-05-20 01:00:47 +02:00
Daniel Rodriguez
22fa755fc3
Merge branch 'ent-7527-problemas-pandora_revent' into 'develop'
...
Fixed issues with https calls
Closes pandora_enterprise#7527
See merge request artica/pandorafms!4128
2021-05-19 16:02:34 +00:00
Daniel Rodriguez
4ea790a649
Merge branch 'ent-7141-Vulnerabilities-CSRF' into 'develop'
...
Ent 7141 vulnerabilities csrf
Closes pandora_enterprise#7141
See merge request artica/pandorafms!4015
2021-05-19 16:00:16 +00:00
fbsanchez
4711ca4856
Avoid connection accumulation
2021-05-19 17:44:07 +02:00
Daniel Maya
9559a63c3b
#7555 fixed module_search with filter
2021-05-19 17:11:41 +02:00
Daniel Barbero Martin
8c0a9859a8
remove synch old and check api
2021-05-19 17:08:13 +02:00
fbsanchez
538e7beb48
Public access using PublicLogin interface
2021-05-19 11:57:17 +02:00
fbsanchez
09ccaf254e
Fixed public access and added PublicLogin interface, including code style fixex
2021-05-19 11:31:52 +02:00
fbsanchez
4b114e63a4
Minor fix
2021-05-19 10:13:25 +02:00
Daniel Barbero Martin
3eba993c5c
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-19 08:36:26 +02:00
artica
f3eb560518
Auto-updated build strings.
2021-05-19 01:00:46 +02:00
fbsanchez
8fc438f913
Fix in item load vc-public link
2021-05-18 18:50:01 +02:00
fbsanchez
074fadda35
Fix in item load vc-public link
2021-05-18 18:49:20 +02:00
Daniel Barbero Martin
6c305833bf
fix groups, module_groups, network_components user_edit synch
2021-05-18 17:18:54 +02:00
José González
91d11bd4cf
Controlled pandora_revent with id_agent 0
2021-05-18 16:37:05 +02:00
José González
46e0cbca70
id_agent control for pandora_revent
2021-05-18 14:52:23 +02:00
José González
e5ebc52356
Fixed missed parameter
2021-05-18 13:32:10 +02:00
fbsanchez
876e3dd191
Minor fix - linter return type in comments set to mixed
2021-05-18 13:27:56 +02:00
fbsanchez
0d50ea94db
Ensure oid starts with dot - braa requriements
2021-05-18 13:27:06 +02:00
Daniel Barbero Martin
5d70226b13
fix category, Os, tags, user_edit synch
2021-05-18 11:02:00 +02:00
Daniel Barbero Martin
ec6cb4d532
fix category, Os, tags, user_edit synch
2021-05-18 10:57:21 +02:00
fbsanchez
9666b76fa9
Common requirements using base url
2021-05-18 10:56:40 +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
artica
739bc7ebd9
Auto-updated build strings.
2021-05-18 01:00:45 +02:00
Daniel Barbero Martin
4c12c6e770
fix profiles and user synch
2021-05-17 17:57:08 +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
fbsanchez
4f7ec16467
avoid maintenance warning
2021-05-17 14:37:01 +02:00
alejandro.campos@artica.es
663d1dcf75
minor fix
2021-05-17 13:43:20 +02:00
José González
7617330e93
Added agent regex to console task template send email
2021-05-17 13:31:46 +02:00
fbsanchez
818186ff28
DB updates - syncqueue
2021-05-17 12:57:15 +02:00
Daniel Barbero Martin
bc6a838ebb
WIP command center, fix view synch queue
2021-05-17 12:35:29 +02:00
Daniel Rodriguez
a6f41ede3d
Merge branch 'ent-7521-Dynamic-Threshold-max-desactivado-por-error' into 'develop'
...
Fixed issue with undesired deactivate dynamic threshold max field
Closes pandora_enterprise#7521
See merge request artica/pandorafms!4130
2021-05-17 08:07:11 +00:00
Daniel Rodriguez
8b704cb2c1
Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas-2' into 'develop'
...
new bell orange
See merge request artica/pandorafms!4131
2021-05-17 08:06:37 +00:00
Daniel Barbero Martin
1526dac01d
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-17 08:35:52 +02:00
artica
d2fd310ea2
Auto-updated build strings.
2021-05-17 01:00:38 +02:00
artica
8c0461e2bf
Auto-updated build strings.
2021-05-16 01:00:26 +02:00
artica
bfc805d6a7
Auto-updated build strings.
2021-05-15 01:00:46 +02:00
alejandro.campos@artica.es
1c1e25e712
Added new item type in reports
2021-05-14 14:54:09 +02:00
marcos
9cde309222
new bell orange
2021-05-14 11:58:08 +02:00
Daniel Rodriguez
203310d13b
Merge branch 'ent-7538-traza-en-tree-view-nodo' into 'develop'
...
remove vamos a ver
See merge request artica/pandorafms!4126
2021-05-14 09:39:07 +00:00
Daniel Rodriguez
823eb96d47
Merge branch 'ent-7178-cambiar-icono-de-alertas-disparadas' into 'develop'
...
changed bell orange
See merge request artica/pandorafms!4127
2021-05-14 09:38:47 +00:00
Daniel Rodriguez
5b2c340163
Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop'
...
Create interface views
See merge request artica/pandorafms!4023
2021-05-14 09:37:48 +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@artica.es
2c065d6f38
visual fix
2021-05-14 10:14:53 +02:00
alejandro.campos@artica.es
86447e2a0b
visual fix
2021-05-14 10:10:42 +02:00
Daniel Barbero Martin
3f509ebd09
Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center
2021-05-14 08:36:58 +02:00
artica
9b6ad55910
Auto-updated build strings.
2021-05-14 01:00:47 +02:00
alejandro.campos@artica.es
1a194e1644
minor change
2021-05-13 14:10:42 +02:00
alejandro.campos@artica.es
b52f971262
minor change
2021-05-13 14:06:54 +02:00
alejandro.campos@artica.es
172afc9070
minor change
2021-05-13 13:40:09 +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