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

5905 Commits

Author SHA1 Message Date
fbsanchez 93636aef96 Avoid warning phpcs 2021-08-12 12:00:53 +02:00
fbsanchez 034e921e35 Upgraded jquery to 3.6.0, without npm 2021-08-12 09:30:43 +02:00
Daniel Rodriguez 03306454e0 Merge branch 'ent-7883-aplicacion-de-parches-offline-en-la-open' into 'develop' 
Allowed UMC offline for opensource installations, fixed issue while accessing settings

See merge request artica/pandorafms!4349
 2021-08-11 12:20:32 +00:00
fbsanchez 3662d8b8a0 Added offline entry to menu in community ed 2021-08-11 14:12:49 +02:00
fbsanchez c69c326bc5 Warning to be careful with offline patches 2021-08-11 11:34:29 +02:00
fbsanchez 97afb02ba6 Allowed UMC offline for opensource installations, fixed issue while accessing settings 2021-08-11 11:28:33 +02:00
fbsanchez cf976f9622 Merge remote-tracking branch 'origin/develop' into ent-7861-fallo-umc-cuando-hay-db-historico 
Conflicts:
	pandora_console/godmode/um_client/index.php
 2021-08-11 09:56:02 +02:00
Daniel Rodriguez f8e9bd38ec Merge branch 'ent-7633-selector-de-grupos-en-el-graph-builder-de-las-custom-graphs-ocupa-todo-el-ancho-de-la-pantalla' into 'develop' 
colspan 1 to group selector custom graph

See merge request artica/pandorafms!4223
 2021-08-11 07:10:50 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +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 Maya a5f9e74b50 #7881 Fixed snmp alert 2021-08-05 15:53:44 +02:00
Daniel Rodriguez e623fa1822 Merge branch 'ent-7854-warning-por-memoria-php-umc-cuando-vale-1' into 'develop' 
Minor fix in memory detection UMC

See merge request artica/pandorafms!4327
 2021-08-05 11:51:39 +00:00
alejandro.campos@artica.es 5acd64bbf7 fixed text inputs in add action modals 2021-08-05 13:05:53 +02:00
Daniel Rodriguez 39d4466658 Merge branch 'ent-fix-alert-action-creation' into 'develop' 
Fixed alert action creation problem.

See merge request artica/pandorafms!4313
 2021-08-05 07:56:22 +00:00
Daniel Rodriguez e2a1a42006 Merge branch 'ent-7592-componentes-remotos-de-red-campo-tcp-send' into 'develop' 
Unset field tcp send when snmp remote component selected

See merge request artica/pandorafms!4160
 2021-08-04 12:03:52 +00:00
Daniel Rodriguez 801f8fc3c4 Merge branch 'ent-7615-hide-en-los-comandos-de-alertas' into 'develop' 
Fixed alert command hide on update

See merge request artica/pandorafms!4164
 2021-08-03 06:47:41 +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
fbsanchez b88b019528 errata fix0 2021-07-29 13:15:01 +02:00
fbsanchez 41f2842e41 Proxy fix and some traceability for DBH upgrade 2021-07-29 13:11:45 +02:00
fbsanchez cea9d2ae3d Fix searchpath for MR while updating 2021-07-28 19:16:27 +02:00
fbsanchez 9206dc491e avoid notice but accept any other alert from PHP 2021-07-27 11:24:23 +02:00
fbsanchez 3c78bfc89e Changed LOAD por SOURCE in UMC - MR loader 2021-07-27 10:48:12 +02:00
fbsanchez 60de51cfdb Minor fix in memory detection UMC 2021-07-27 10:21:52 +02:00
fbsanchez dc7d30cbf8 Stupid sexy error_get_last 2021-07-22 11:41:04 +02:00
fbsanchez d3270904bd Avoid notice 2021-07-22 11:33:57 +02:00
fbsanchez f83fddb4ff Always ignopre undefined indexes notices 2021-07-22 11:29:01 +02:00
fbsanchez 52059661a4 Ignore undefined indexes E_NOTICE 2021-07-22 10:59:19 +02:00
fbsanchez f71ae73c84 Load procedures (or complex queries) in UMC 2021-07-21 17:31:03 +02:00
marcos e02dd1b61f fixed error 500 when sort report items 2021-07-21 11:43:11 +02:00
Junichi Satoh 4115bd0cba Fixed an issue where alert actions belonging to the "All" group could be created by restricted users. 2021-07-21 15:34:46 +09:00
José González 96fccb01b9 Created token for hande file creation 2021-07-16 16:54:43 +02:00
fbsanchez d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00
vgilc b7729447f6 Merge branch 'ent-fix-keep-counters' into 'develop' 
Fixed 'Keep counters' cannot be cleared in module configuration.

See merge request artica/pandorafms!4292
 2021-07-13 08:37:09 +00:00
Junichi Satoh 512cfb69c5 Fixed 'Keep counters' cannot be cleared in module configuration. 2021-07-13 11:55:49 +09:00
Junichi Satoh e7079dd4c4 Fixed all alert actions are shown after alert action creation/edition even if user has access rights only for specific groups. 2021-07-13 09:53:23 +09:00
marcos ff60a4ec62 fixed visual error 2021-07-12 10:58:51 +02:00
Daniel Maya 66e9539818 Added agent ip in custom events 2021-07-07 16:07:08 +02:00
marcos 7a4224cef6 add update manager black background update manager 2021-07-06 12:49:20 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +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
José González 498a353a29 Improve code for get secondary groups 2021-07-02 12:20:53 +02:00
Calvo 5bd49a1e49 Fixed SLA report items creating empty extra item 2021-06-30 12:04:01 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
fbsanchez 3bd0464c86 removed unwanted traces 2021-06-29 14:35:22 +02:00
fbsanchez f403e3a43b Avoid trial users from using UMC 2021-06-29 14:34:09 +02:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00:00
fbsanchez 4e1110a052 MQ up to down connections (MC => NODES) 2021-06-28 21:21:31 +02:00
fbsanchez 017e12c751 Use metaconsole_access_node to allow or deny access to node for a user created and synchronized from MC 2021-06-25 15:41:34 +02:00
fbsanchez 4d2f9fb4c9 missing messages 2021-06-25 12:54:14 +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
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 294741b472 Merge branch 'ent-6990-copiar-informes' into 'develop' 
Ent 6990 copiar informes

See merge request artica/pandorafms!4129
 2021-06-21 14:07:03 +00:00
Luis 51844da01b Ent 6990 copiar informes 2021-06-21 14:07:03 +00:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
Daniel Rodriguez ab3a7e9d2d Merge branch 'ent-7629-Error-500-en-borrado-selectivo-de-items-de-informes' into 'develop' 
Ent 7629 error 500 en borrado selectivo de items de informes

See merge request artica/pandorafms!4175
 2021-06-21 14:03:39 +00:00
Daniel Rodriguez 227055446e Merge branch 'ent-7630-bug-visual-enedicion-de-items-de-informes' into 'develop' 
fixed error updating item reporting

See merge request artica/pandorafms!4168
 2021-06-21 14:02:54 +00:00
marcos 951924dd93 colspan 1 to group selector custom graph 2021-06-21 11:40:48 +02:00
José González 0c5b8766d0 Change snmpwalk behaviour in module configuration 2021-06-18 14:05:59 +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
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
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
fbsanchez b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
fbsanchez b8d3d962a0 Minor CDE 2021-06-16 12:44:03 +02:00
marcos 716c82bd30 fixed error with pagination user filter 2021-06-16 10:41:12 +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 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
fbsanchez 04e2919497 Avoid using old data when parsing progress 2021-06-15 14:43:11 +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 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
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02: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 Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +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
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
alejandro.campos@artica.es 13850e52d5 fixed bug 2021-06-09 10:41:45 +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 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 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Daniel Maya 11a6c41728 Fixed url 2021-06-04 14:52:53 +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