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

449 Commits

Author SHA1 Message Date
fbsanchez e561b1f906 omnishell multiselect 2019-11-15 13:07:23 +01:00
marcos f348310675 ADD function to get SAP agents and sap view to sap agents 2019-11-14 19:01:23 +01:00
alejandro-campos cf0321846f fix bug in dynamic report filter group functionality: not applying recursion correctly 2019-10-29 12:31:23 +01:00
fbsanchez adbb48ab87 pandora HA review 2019-08-10 02:13:01 +02:00
Daniel Barbero Martin ed0688f853 fixed macros reports 2019-07-10 18:20:43 +02:00
Daniel Rodriguez 96fbca35a4 Merge branch 'ent-4194-Revision-de-CSS-alternativos' into 'develop' 
Created black theme - #4194

See merge request artica/pandorafms!2564
 2019-07-10 11:47:21 +02:00
Daniel Rodriguez e43469954a Merge branch 'ent-4109-Bug-en-utilizacion-de-macro-en-report-a-traves-de-plantillas' into 'develop' 
fix item name macros when using report templates

See merge request artica/pandorafms!2570
 2019-07-08 17:13:13 +02:00
Tatiana Llorente 0cccafc7be Heartbeat gifs with black background - #4194 2019-07-08 10:37:34 +02:00
marcos.alconada 2ad44fcf90 final merge 3360 ticket 2019-07-03 17:07:31 +02:00
alejandro-campos 51d7104de7 fix item name macros when using report templates 2019-07-02 18:09:52 +02:00
fbsanchez c3ebe88178 style review 2019-06-18 17:40:31 +02:00
Alejandro Gallardo Escobar 3332e41f41 Added an option to use the metaconsole table when fetching the agents 
Former-commit-id: d21627018f662d27f5612bf69bddfd8d298437ca
 2019-04-22 15:02:15 +02:00
fbsanchez 783417cab5 rollback agent_get_agents 
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
 2019-03-28 12:20:15 +01:00
fbsanchez face622e9e reset-map fixed 
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
 2019-03-22 18:27:12 +01:00
fbsanchez 95c61024f7 Cleanup Networkmaps 
Former-commit-id: 68893c73092e80bf4a67a0aa82c51ec242aab01f
 2019-03-13 11:38:03 +01:00
fermin831 e19e7d3484 Modified agents_create_agent to permit create agents with name as alias 
Former-commit-id: 9d3524e2dc02beb92d819cd877b9b44f64154fd5
 2019-02-26 17:30:21 +01:00
daniel d9e0f2ea42 Merge remote-tracking branch 'origin/develop' into 3088-Se_carga_filtro_en_vista_de_eventos_cuando_no_hay_filtro_activo 
Former-commit-id: f0ab3426fdf23bbceed7c2cd991b37c33ec3ae2e
 2019-02-21 13:26:12 +01:00
daniel dc4d5b1bd7 fixed error in widget 
Former-commit-id: 3b0d2e8641d35f7c339aa4229f0a7108216704e0
 2019-02-21 13:21:05 +01:00
manuel 00cba4cbc9 Fixed bug in filtered modules by tag 
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
 2019-02-19 13:05:31 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
Daniel Rodriguez b38dc64ad8 Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop' 
fixed errors in massive operation edit modules

See merge request artica/pandorafms!2101

Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
 2019-01-15 12:35:11 +01:00
fbsanchez 0686982055 Fixed agents_get_group_agents while trying to get agent list from target group 
Former-commit-id: 8a005e1574760688f5823cc854a287774c8c828b
 2018-12-28 13:09:37 +01:00
daniel ac228a7fad fixed error in massive operation 
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
 2018-12-28 12:14:17 +01:00
manuel.montes d9749aad03 Fixed bug in agent detail filter 2018-12-04 09:17:34 +01:00
vgilc 71a4a6bf77 Merge branch '2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail' into 'develop' 
Fixed bug in agent status filter

See merge request artica/pandorafms!1829
 2018-11-30 13:21:48 +01:00
fermin831 8a00fe5a30 Fixed query on function agents_get_group_agents 2018-11-20 10:58:58 +01:00
daniel 2eb47c1251 fixed errors in custom fields view 2018-11-16 15:00:09 +01:00
daniel e21fde537a fixed css errors custom field view and new features 2018-11-15 19:16:49 +01:00
daniel 4dbcecb951 WIP custom fields view 2018-11-13 15:46:44 +01:00
daniel afaa6ad2ba Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-12 09:07:56 +01:00
daniel bb15c39ef5 WIP Custom view fields 2018-11-08 15:03:40 +01:00
fermin831 059ca855f9 Added cache to agents_get_alias 2018-11-08 13:03:04 +01:00
daniel 218bf81fa1 Merge remote-tracking branch 'origin/develop' into 2784-Pantalla_por_dispositivos_filtrado_por_custom_fields 2018-11-07 13:30:19 +01:00
daniel 3f78f15499 WIP View custom fields data 2018-11-07 13:28:00 +01:00
danielmaya 3ffd976365 resolved conflicts in ver_agente 2018-11-07 12:31:54 +01:00
daniel b71d396c84 WIP custom fields view 2018-11-05 09:35:17 +01:00
daniel e2fabb6167 WIP custom fields view 2018-11-02 13:37:30 +01:00
daniel b5045d522e WIP custom fields view 2018-10-31 18:02:36 +01:00
daniel f78e86b925 view cusatom field 2018-10-25 17:08:56 +02:00
vgilc 4b317b573b Merge branch '2708-API-metaconsola-function-get_agent-no-devuelve-nada' into 'develop' 
Added code for function api_get_agent_alias for the API of the metaconsole - #2708

See merge request artica/pandorafms!1816
 2018-10-25 12:11:16 +02:00
danielmaya bbde9c70b6 conflict resolved 2018-10-25 11:13:57 +02:00
vgilc b7f9149c20 Merge branch '2920-No-funciona-el-wizard-para-crear-agentes-desde-la-metaconsola' into 'develop' 
Changed function that creates a new agent from metaconsole to set field name…

See merge request artica/pandorafms!1873
 2018-10-19 11:30:47 +02:00
alejandro-campos 3fd588353b Changed function that creates a new agent from metaconsole to set field name with a hash and fixed bug when setting alias in database 2018-10-19 10:43:43 +02:00
fermin831 060e46868d Fixed tags filter on bulk operation (select module first) 2018-10-17 11:57:22 +02:00
fermin831 2693bbe209 Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev 
Conflicts:
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/operation/agentes/ver_agente.php
 2018-10-10 19:39:27 +02:00
fermin831 de10de03f7 [Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first 2018-10-10 17:42:33 +02:00
manuel.montes 159d7466cd Merge branch 'develop' into 2869-Filtro-de-estado-not-normal-incorrecto-en-vista-de-agent-detail 
Conflicts:
	pandora_console/include/functions_agents.php
 2018-10-09 17:01:08 +02:00
samucarc 61a82337c3 Fixed error in agents bulk operations 2018-10-08 17:57:05 +02:00
Fermin 099f01a4ba [Tags performance] Fixed select modules from Agent/Module dashboard widget 2018-10-08 13:45:30 +02:00
Fermin d2b8939804 [Tags performance] Fixed select_modules_for_agent_group function (failed with several secondary groups). 2018-10-08 12:33:40 +02:00
Fermin a72b9b0515 [Tags performance] Fixed agents_get_modules to ajax calls 2018-10-05 13:32:14 +02:00
manuel.montes 07e476a740 Fixed bug in agent status filter 2018-10-04 16:35:37 +02:00
fermin831 a33cae9e8f [Tags performance] Check functions_agents agents_get_modules 2018-10-03 16:33:56 +02:00
fermin831 0ca13b8e98 Removed unused code 2018-10-03 15:04:45 +02:00
fermin831 7ffeaaf50b [Tags performance] fermin revision 1 2018-10-03 11:13:52 +02:00
danielmaya 958930931e Fixed filter group in agents/modules view 2018-10-03 10:42:59 +02:00
fermin831 f767474516 [Tags performance] Fixed indexed agents_get_modules with no details 2018-10-02 15:30:19 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
fermin831 9a47d5325e [Tags performance] Events improvements 2018-10-01 17:03:37 +02:00
tatiana.llorente@artica.es 9977f1ddf9 Added code for function api_get_agent_alias for the API of the metaconsole - #2708 2018-10-01 09:51:58 +02:00
vgilc f98e2ed1bf Merge branch '2613_Error_en_filtrar_agentes_por_estado_en_bulk_operations' into 'develop' 
Fixed error in agents bulk operations with a normal status

See merge request artica/pandorafms!1709
 2018-09-28 10:24:27 +02:00
danielmaya 453fb3f67b TODO List 2018-09-27 13:30:32 +02:00
fermin831 48798d4af5 Added some secondary groups checks to meta 2018-09-20 17:59:12 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
fermin831 5c54afe673 Fixed secondary groups in alerts details 2018-09-11 09:15:48 +02:00
daniel e5fec6b303 Merge remote-tracking branch 'origin/develop' into 2611-Cache_de_vista_de_arbol_y_vista_de_grupos 2018-08-31 10:56:04 +02:00
daniel 24f7dbd420 added cache to function agents_get_all_groups_agent 2018-08-23 14:50:19 +02:00
samucarc 2687c9fce6 Fixed error in agents bulk operations with a normal status 2018-08-21 17:21:28 +02:00
fermin831 399c9c2d58 [Secondary groups] Fixed agent/modules view 2018-08-21 13:33:16 +02:00
fermin831 8be030b7da Fixed agents_get_agentmodule_group to search only in tagente table 2018-08-10 12:55:04 +02:00
fermin831 7b22caaea8 Fixed warning 2018-08-02 13:41:56 +02:00
fermin831 223d13edd5 Change the policy agents to work on serialized way 2018-07-18 14:50:09 +02:00
Alejandro Gallardo Escobar de58fe7b90 Fixes 2018-07-06 14:03:05 +02:00
vgilc 8d639b031e Merge branch 'ent-2405-recuento-y-paginado-vista-agent-detail' into 'develop' 
Fixed filter count in agent detail.

See merge request artica/pandorafms!1591
 2018-07-06 09:40:15 +02:00
fermin831 d1eaef6f6d Fixed filter count in agent detail. 2018-07-03 13:22:23 +02:00
daniel 0f9b7d13ee fixed errors cps in meta and others 2018-07-02 17:14:31 +02:00
vgilc fdbe03ef83 Merge branch 'ent-639-add-user-defined-timezones' into 'develop' 
Add user defined timezones

See merge request artica/pandorafms!1462
 2018-06-12 10:20:31 +02:00
Alejandro Gallardo Escobar f6184b52da Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-06-11 17:42:02 +02:00
Alejandro Gallardo Escobar fac3e21829 Added a lot of fixes to the dates stored as strings without timezone information to made them use the user timezone 2018-06-11 16:40:10 +02:00
Fermin 2e1bb2ac9c Merge branch 'develop' into 2290-seguridad-en-la-api 
Conflicts:
	pandora_console/include/functions_api.php
 2018-06-07 11:38:37 +02:00
fermin831 0afd436cea [ACL API] Added ACL to some get api calls and refactorized agent count 2018-06-06 15:04:30 +02:00
enriquecd dbafab2ae7 Add cluster and API get functions - #2294 2018-05-23 19:13:47 +02:00
daniel ef9d31adfd fixed errors in function alias in metaconsole 2018-04-24 13:23:45 +02:00
fermin831 60f7a0ab79 Merge branch 'develop' into 2015-implementacion-de-grupos-secundarios 
Conflicts:
	pandora_console/include/class/Tree.class.php
 2018-04-10 09:29:14 +02:00
fermin831 8da6eca4ab [Secondary groups] Fixed get agents function to works properly with groups view 2018-04-09 12:40:52 +02:00
fermin831 c88e6e703a [Secondary groups] Fixed duplicated agents in group view and agent detail 2018-04-04 11:17:08 +02:00
fermin831 88375a2460 [Secondary groups] Fixed some problems in agent view 2018-03-27 16:38:17 +02:00
fermin831 c96b883614 [Secondary groups] Fixed agent view to include secondary agents 2018-03-26 12:52:37 +02:00
danielmaya e83c3bb5aa Added tmetaconsole_agent in function agents_get_alias 2018-03-26 12:03:25 +02:00
enriquecd 8fce51a816 Filter clusters by groups - #1868 2018-02-28 14:32:35 +01:00
daniel ad0b463d13 fixed errors acl 2018-01-30 17:44:51 +01:00
danielmaya 3adb990970 Fixed redeclare function 2017-11-29 18:11:40 +01:00
vgilc 43308596c1 Merge branch '1490-Añadir-un-nuevo-campo-de-búsqueda-en-vista-de-agentes-dev' into 'develop' 
added Search in custom fields

See merge request artica/pandorafms!969
 2017-11-29 16:57:32 +01:00
Daniel Maya 5a2a97e94c Fixed function api_set_disable_alert 2017-10-27 12:25:00 +02:00
Daniel Maya 3bafe27361 added Search in custom fields 2017-10-25 12:04:14 +02:00
Arturo Gonzalez 1dae698333 Added disabled option to get ggroup agents function 2017-09-05 13:40:57 +02:00
Daniel Maya e1b867069b Remove quotation marks in agent deletion 2017-05-23 17:50:37 +02:00
Daniel Maya 42c7a400f0 Changed name by alias when deleting agent 2017-04-18 10:42:23 +02:00
vgilc c3157f2aea Merge branch '106-faltan-los-no-iniciados-en-agents_get_status' into 'develop' 
Added not init state if there are no initialized modules

Closes #106

See merge request !309
 2017-04-07 12:49:53 +02:00
vgilc f7b4523b1f Merge branch 'problems-with-interfaces-snmp' into 'develop' 
Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541

See merge request !277
 2017-03-29 10:12:53 +02:00
Daniel Maya 967b43061d Added not init state if there are no initialized modules 2017-03-28 11:59:30 +02:00
enriquecd 27d4a6c316 Show agent alias in gis maps with entities - #98 2017-03-17 11:55:34 +01:00
m-lopez-f 26b3754ee8 Fixed interfaces snmp, because dont show icon of open graphs and problems with show graphs when click in icons. Gitlab: #541 2017-03-17 10:13:57 +01:00
Alejandro Gallardo Escobar c795f56feb Fixed functions_agents.php 2017-03-10 14:58:19 +01:00
Alejandro Gallardo Escobar cc16225e31 Added a function to generate random identifiers for the agent name 2017-03-10 13:46:53 +01:00
Ramon Novoa 9e7c6612be Merge branch 'develop' into feature#new-iface-names 2017-03-10 10:32:40 +01:00
m-lopez-f e5ec0cb35a Kill pink unicorns 2017-03-07 16:30:40 +01:00
daniel ff3d8ca07f fixed error graph in report network_interfaces 2017-03-02 13:35:11 +01:00
Ramon Novoa 225147770d Merge branch 'develop' into feature#new-iface-names 2017-03-01 12:18:09 +01:00
daniel 5faf2fdaef merge develop in new_ifaces_name 2017-03-01 11:47:38 +01:00
enriquecd 7034f7afc6 Check interval filter agents without modules and disabled modules - #74 2017-02-28 14:29:05 +01:00
daniel 5a79f83bba feature change name interfaces 2017-02-28 12:42:50 +01:00
daniel 8f8a17bf24 fixed alias for name in reports 2017-02-27 16:48:28 +01:00
enriquecd 63c112a628 Functions_module now not use async modules to calc if last contact is major than minimum module interval - #74 2017-02-21 18:45:44 +01:00
daniel bf29d4c5f9 fixed error in view agent/module 2017-02-21 17:21:10 +01:00
Alejandro Gallardo Escobar c49df7c60d Added a function to get the agent alias 2017-02-20 15:32:10 +01:00
Alejandro Gallardo Escobar 545dad643c XMerge branch 'develop' into feature/alias_friendly_name 2017-02-20 12:04:43 +01:00
m-lopez-f e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +01:00
Daniel Maya d39b108c1f Merge branch 'develop' into feature/alias_freandly_name 
Conflicts:
	pandora_agents/unix/pandora_agent
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.mysql.sql
	pandora_console/extras/pandoradb_migrate_6.0_to_6.1.oracle.sql
	pandora_console/godmode/agentes/agent_manager.php
	pandora_console/godmode/agentes/modificar_agente.php
	pandora_console/godmode/agentes/planned_downtime.editor.php
	pandora_console/godmode/massive/massive_delete_modules.php
	pandora_console/godmode/massive/massive_edit_modules.php
	pandora_console/include/class/Tree.class.php
	pandora_console/include/functions_graph.php
	pandora_console/include/functions_treeview.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/pandoradb.sql
 2017-02-16 16:05:21 +01:00
daniel 528a2bc957 fixed error count agents disabled 2016-12-21 09:29:45 +01:00
enriquecd a1d731f71b Afected modules keep tag register when delete agent #4216 Resize sort icon #4220 2016-11-23 19:26:51 +01:00
enriquecd 6c5c6d264c Snapshop image modules for mobile console #90, Delete relation ttag_module on delete agent #4216 2016-11-22 19:24:07 +01:00
m-lopez-f 88879e8e6e Feature: Search by status module in bulk module delete/edit actions. Ticket: #4190 2016-11-17 12:55:29 +01:00
Daniel Maya cf3d44872f Changed agent name 2016-10-06 12:10:10 +02:00
Daniel Maya 2014f51410 sort by alias. 2016-09-27 10:31:42 +02:00
Daniel Maya be2bbb262a Changed agent name in custom graphs. 2016-09-26 13:36:53 +02:00
Arturo Gonzalez ff0aa5e3b6 New networkmaps in progress... (Moved code from O to E) 2016-09-20 16:26:57 +02:00
Arturo Gonzalez 831e7ca314 New networkmap in progess... (Changed db structure and more important things) 2016-09-15 16:41:05 +02:00
Arturo Gonzalez 17e3f38aca New networkmaps in progress... (Transfer e code to Open version) 2016-09-14 11:18:26 +02:00
Arturo Gonzalez f9b6dc3b84 Revert "Fixed gets "all" group in the ntwmap generator" 
This reverts commit a45475ad70.
 2016-09-13 15:01:58 +02:00
Arturo Gonzalez a45475ad70 Fixed gets "all" group in the ntwmap generator 2016-09-13 13:47:12 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
Alejandro Gallardo Escobar 5616429f9e Fixed an error in a query 2016-05-05 18:26:41 +02:00
Alejandro Gallardo Escobar e515a1d587 Added the function 'agents_get_agent_custom_field' 2016-05-04 18:48:54 +02:00
fermin831 78d8092e9c Improved function agents_get_modules to decrease execution time TICKETS #3518 2016-04-12 17:34:15 +02:00
m-lopez-f a837e110d0 Fixed bulk deleted action alerts. Tiquet: #3268 
(cherry picked from commit aac2460c85)
 2016-01-28 09:46:06 +01:00
mdtrooper c97899452c Fixed in the function 'agents_get_group_agents' get agents with noACL flag is setted. TICKET: #3166 
(cherry picked from commit a2b97333ce508cd087aa88420bf0cb3ebe3f411c)
 2015-12-31 12:39:46 +01:00
Arturo Gonzalez d7b8bdc369 Minor fix 2015-12-23 16:25:28 +01:00
Arturo Gonzalez 54e0f25947 Fixed "agents with templates" box in bulk alert actions add. Ticket#3087 2015-12-23 16:20:58 +01:00
m-lopez-f 67ee2232cb Fixed problems with filter agents with status not is normal. Tiquet: #2788 2015-09-23 13:40:46 +02:00
m-lopez-f 0e090c27c5 Fixed list of alerts when dbengine is Oracle. Tiquet: #2699 2015-09-07 11:50:35 +02:00
Alejandro Gallardo Escobar d14e250ad8 Now the agents retrieved by group can be served with the key serialized when using the metaconsole 2015-08-05 10:39:16 +02:00
mdtrooper adf6c263ea Added support for arrays into the function 'agents_get_addresses' 2015-07-14 12:49:36 +02:00
mdtrooper f02abea556 Upload more files from previous commit. 2015-07-08 16:47:00 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
Alejandro Gallardo Escobar 6e3b32d60d Fixed an error retrieving data when using oracle 2015-06-12 13:58:39 +01:00
Alejandro Gallardo Escobar 745445d6d4 Fixed an error on oracle 2015-06-12 13:05:33 +01:00
Alejandro Gallardo Escobar 25dde2c836 Fixes to improve the oracle compatibility 2015-06-10 15:40:59 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
Alejandro Gallardo Escobar 8fbe1175b5 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/DEBIAN/control
	pandora_console/DEBIAN/make_deb_package.sh
	pandora_console/include/config_process.php
	pandora_console/pandoradb.data.oracle.sql
 2015-06-02 18:08:46 +02:00