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

233 Commits

Author SHA1 Message Date
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01: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 18ad7a2ce9 [Tags performance] Fixed not init filter 2018-10-10 19:14:24 +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
fermin831 f3eae5e111 [Tags performance] Some agents_get_modules checks 2018-10-03 17:00:57 +02:00
fermin831 28b879f058 [Tags performance] Added TODOS to revise agents_get_modules 2018-10-02 09:48:29 +02:00
vgilc 2dac09435a Merge branch '2040-Tags-en-operaciones-masivas' into 'develop' 
fixed bug on bulk delete and bulk update module operation

See merge request artica/pandorafms!1613
 2018-09-28 11:05:34 +02:00
vgilc d31a2f4cc4 Merge branch 'ent-2763-snmp-traps' into 'develop' 
Added recalculate counters when a status module is forced by console

See merge request artica/pandorafms!1794
 2018-09-28 10:29:14 +02:00
vgilc dec9021702 Merge branch '2548_Bug_edicion_modulos_operaciones_masivas' into 'develop' 
Fixed tags in module bulk operations

See merge request artica/pandorafms!1639
 2018-09-28 10:25:38 +02:00
fermin831 a097fdf5e6 Added recalculate counters when a status module is forced by console 2018-09-21 11:15:25 +02:00
fermin831 9c032f4dfe [Secondary groups] Fixed group report 2018-09-11 13:22:51 +02:00
daniel f9af750f47 fixed counters group tree view 2018-08-28 12:52:57 +02:00
fermin831 4315cef4c9 [Secondary groups] Fixed modules permissions in some views 2018-08-08 11:49:54 +02:00
vgilc ab3998e097 Merge branch '2600-Error-al-crear-servicio-en-meta-dev' into 'develop' 
Fixed create services

See merge request artica/pandorafms!1661
 2018-08-03 11:35:56 +02:00
danielmaya a9e162a199 Fixed create services 2018-08-03 10:49:01 +02:00
fermin831 ca67bd632e Removed Oracle and Posgre code 2018-08-02 12:56:43 +02:00
samucarc 3593d2b762 Fixed tags in module bulk operations 2018-07-26 16:49:02 +02:00
manuel.montes b922066a72 Add items to the view events 2018-07-19 18:04:50 +02:00
alejandro-campos 213a59d26e fixed bug on bulk delete and bulk update module operation 2018-07-16 18:14:18 +02:00
daniel 69852a1c2a mejora el rendimiento en consulta sql 2018-07-09 09:23:19 +02:00
daniel 0f9b7d13ee fixed errors cps in meta and others 2018-07-02 17:14:31 +02:00
fermin831 dcb73f844e Revert "Revert "Recover critical status the SNMPTrap on SNMP console actions"" 
This reverts commit 16cff75242.
 2018-06-22 13:37:36 +02:00
fermin831 16cff75242 Revert "Recover critical status the SNMPTrap on SNMP console actions" 
This reverts commit 8ef8f31f67.
 2018-06-22 13:30:10 +02:00
fermin831 8ef8f31f67 Recover critical status the SNMPTrap on SNMP console actions 2018-06-21 19:27:33 +02:00
daniel badfd83b0d Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
 2018-06-06 11:57:02 +02:00
fermin831 ad4b38d510 Fixed problems with strange agent name on SNMP realtime graphs 2018-05-31 18:02:50 +02:00
fermin831 552f2ce14c Fixed problems with strange names on SNMP realtime graphs 2018-05-31 18:00:44 +02:00
daniel 123d49d604 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/styles/pandora.css
 2018-05-10 08:52:45 +02:00
fermin831 6297b20bf6 Added hint to Realtime SNMP graph 2018-05-07 13:30:09 +02:00
fermin831 fd91ba63f6 Added realtime graph to monitor view 2018-05-07 12:53:12 +02:00
fermin831 0f4daee237 Added icon to realtime SNMP graph 2018-05-04 13:18:33 +02:00
fermin831 bd3f0712f1 Added separated window view to SNMP realtime graphs 2018-05-04 10:58:37 +02:00
fermin831 32822054d6 Added realtime graph button to agent view 2018-05-03 17:13:38 +02:00
daniel e7a8706434 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions_graph.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/graphs/flot/pandora.flot.js
	pandora_console/include/graphs/functions_flot.php
 2018-04-23 12:21:11 +02:00
daniel d881e0028d fixed errors detected SLA 2018-03-16 12:03:51 +01:00
daniel d2390528ac fixed errors in graphs 2018-02-27 16:28:00 +01:00
enriquecd ae471bb9f2 Merge remote-tracking branch 'origin/clusters' into 1748-Sistema-de-gestión-de-Clusters 2018-02-07 13:52:44 +01:00
enriquecd 2b446a681d Popup when click modules in cluster view, new images, filter modules - #1748 2018-01-30 17:38:29 +01:00
daniel 57990d80a8 fixed warnings php 2018-01-11 13:05:31 +01:00
daniel d7d1cfe81b Merge branch 'develop' into 1632-Pandora_FMS_charts 2017-12-13 17:18:36 +01:00
fermin831 84ff86fede keepalive modules are boolean too (console function fix) 2017-12-11 15:47:38 +01:00
daniel 06c1c4f243 fixed errors in fullscale graph and normal graph 2017-12-05 13:44:42 +01:00
vgilc 93c0ddfad4 Merge branch 'ent-1545-no-mostrar-valor-de-modulos-booleanos-en-static-graphs-carrefour' into 'develop' 
Removed last value on visual console boolean static graphs

See merge request artica/pandorafms!1053
 2017-11-29 16:56:36 +01:00
fermin831 6c519ff08a Removed last value on visual console boolean static graphs 2017-11-13 11:13:42 +01:00
vgilc 68a10343fb Revert "Merge branch…" 
This reverts merge request !1025
 2017-11-10 12:24:33 +01:00
daniel c780cb5285 fixed errors in fullscale graph and normal graph 2017-11-07 09:46:37 +01:00
fermin831 443163515d Added checkbox to free search on agents data view 2017-11-02 15:51:37 +01:00
fermin831 2adf951121 Added free search values to data table 2017-10-30 15:45:31 +01:00
Daniel Maya d7f3e1ecde New feature. Dynamic units 2017-09-14 12:10:41 +02:00
daniel c29d8a4fdb Revert "merge develop" 
This reverts commit 8232911713, reversing
changes made to f5da86ac0a.
 2017-08-23 09:35:17 +02:00