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

287 Commits

Author SHA1 Message Date
manuel b11d1a6687 Merge branch 'develop' into ent-3120-Cambio-de-radio-buttons-yes-no-por-checkbox-2-parte 
Conflicts:
pandora_console/godmode/setup/setup_auth.php
pandora_console/include/functions_api.php
pandora_console/install.php


Former-commit-id: 70caf6f8d0b99057c55b21c8e3b4317a343923fb
 2019-02-13 12:03:46 +01:00
Ramon Novoa fa7f519d34 Merged from develop. 
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
 2019-02-12 14:52:18 +01:00
Ramon Novoa 92e2262440 Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente 
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
 2019-02-07 11:18:15 +01:00
artica b3da2803a4 Changed the format of the .php files 
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
 2019-01-30 16:18:44 +01:00
Ramon Novoa 2626605030 Validate alerts at the time agents/modules are modified. 
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
 2019-01-30 12:58:31 +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
vgilc 9c32a72c9f Merge branch 'develop' into '1077-sql-error-in-log4x-data-module-dialog-dev' 
# Conflicts:
#   pandora_console/include/functions_modules.php
 2017-08-14 15:26:54 +02:00
Arturo Gonzalez d0bd0b3a3b Changed field in sql request 2017-07-10 12:46:02 +02:00
Daniel Maya 4693702741 Fixed sql error in tagente_datos_log4x 2017-06-12 13:43:53 +02:00
enriquecd 6e951bf50b Ignore 0 value modules interval when check last contact in agent details - #888 2017-05-17 13:26:10 +02:00
enriquecd 7034f7afc6 Check interval filter agents without modules and disabled modules - #74 2017-02-28 14:29:05 +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
Alejandro Gallardo Escobar e53d75d98d Added a function to get the agent alias using a module id 2017-02-20 18:50:28 +01:00
m-lopez-f e118729398 Fixed problems with column 'last contact'. Gitlab: #269 2017-02-17 13:34:30 +01:00
Arturo Gonzalez 9a73cb56d7 Added module crontab to local modules with rc. Ticket #246 2017-02-10 11:43:12 +01:00
enriquecd f9817a26ad Add enterprise_hook filter to all config_agents_has_remote_configuration functions - #41 2017-02-02 19:12:22 +01:00
Arturo Gonzalez cfce014ad3 UX console in progress... (Fixed filter form in policy modules) 2017-01-19 10:13:59 +01:00
Arturo Gonzalez fe6f924d7a UX console in progress... (init develop and modules hierachy) 2017-01-18 12:45:25 +01:00
daniel 9e391e0210 Allow dinamic ip 2017-01-17 09:21:46 +01:00
daniel cf2c0a87b6 Revert "Merge branch '17-compatibilidad-ante-cambios-de-ip-en-el-agente-integria-4208' into 'develop'" 
This reverts merge request !31
 2017-01-17 09:03:17 +01:00
daniel 7261b50a4e Allow automatic ip 2017-01-16 17:46:59 +01:00
Arturo Gonzalez c3480f6c04 Added some things to agent_module report. Ticket #4183 2016-12-22 11:35:45 +01:00
m-lopez-f 70bb715516 Change value by deafult of new modules in field discard unknown events. Ticket: #4242 
(cherry picked from commit 8593fb1bb5)
 2016-12-01 15:16:36 +01:00
Arturo Gonzalez 26862b5f9d Added a function to remove right zeros in precision data feature 2016-10-20 10:47:12 +02:00
Arturo Gonzalez 3b7cad9654 Data precision (So much precision) 2016-10-18 16:32:39 +02:00
m-lopez-f a804040d79 Add label with macros in reports. Ticket: #37 2016-09-12 16:22:58 +02:00
Arturo Gonzalez dbb5aeee4c Fixed monitor details search by module name and module group. Ticket #4025 2016-09-12 11:54:54 +02:00
m-lopez-f a98242d151 Fixed problems with times of execution and load page. Tiquet: #3988 2016-08-24 15:31:28 +02:00
Ramon Novoa 798fa8e952 Merge branch 'handle-unknown-properly' of https://github.com/uchida/pandorafms into uchida-handle-unknown-properly 2016-07-28 12:50:58 +02:00
fermin831 1c94eee171 Solved problems with availability reports and unknown time (2) 
Tickets #3449
 2016-05-27 14:11:26 +02:00
mdtrooper 30f806f41c Merge branch 'develop' into feature/new_networkmap 
Conflicts:
	pandora_console/include/functions_modules.php
 2016-04-25 15:25:16 +02:00
mdtrooper 0de64812c2 Added the get status of any module group. 2016-04-22 11:14:25 +02:00
Akihiro Uchida 1da312b8a5 use last_known_status/known_status column to handle unknown properly 2016-04-22 16:36:26 +09:00
fermin831 11623b5c92 Fixed checks in availability reports TICKETS #3449 2016-03-30 14:59:34 +02:00
m-lopez-f 858e3ea202 Fixed problems with performance. Tiquet: #2970 
(cherry picked from commit a57f62e5bf)
 2015-11-18 16:32:20 +01:00
m-lopez-f 579793fa66 Fixed problems with bulk actions with modules. Tiquet: #2963 
(cherry picked from commit ca0ec7364c)
 2015-11-17 08:32:45 +01:00
m-lopez-f 05f45e2692 Fixed problems with bulk module edit. Tiquet: #2837 2015-10-02 09:10:33 +02:00
m-lopez-f 6858a12c57 Fixed function, and add condition if agent is not init. Tiquet: #2804 
(cherry picked from commit 4d73c6ca7c)
 2015-09-23 13:09:17 +02:00
m-lopez-f df6b3efe1a Fixed function, and add condition if agent is not init. Tiquet: #2804 2015-09-23 12:41:59 +02:00
mdtrooper 4d62e41d24 Added functions in modules to get table of data and raw data. 
(cherry picked from commit 2f98c1fc86)
 2015-08-05 14:04:17 +02:00
m-lopez-f cd676cac59 change in the way data show snmp data timeticks. Tiquet: #2494 2015-07-31 11:16:42 +02:00
m-lopez-f 3e0b8a0f52 Fixed errors in php 2015-07-27 15:34:09 +02:00
mdtrooper 9bc9e6f729 Fixed the availability item report. TICKET: #2423 2015-07-21 18:50:57 +02:00
mdtrooper a8162a1876 Added function 'modules_is_not_init' 2015-07-21 13:06:22 +02:00
Alejandro Gallardo Escobar 3b037caf32 Merge remote-tracking branch 'origin/develop' into features/oracle 2015-06-18 20:02:01 +02:00
mdtrooper 89cac169f4 Clean the source code style. 2015-06-08 11:05:19 +02:00
mdtrooper 819b1d5d77 Clean the source code style. 2015-06-08 09:32:01 +02:00
mdtrooper 371aafa3fa Fixes for the Oracl€. 2015-06-05 14:47:50 +02:00
mdtrooper 4a86e40ca2 Fixed the PHP Warning about the config var. (manual cherry-pick from e326c8ff20) 2015-06-05 12:52:18 +02:00
mdtrooper 5c7b230e9b Merge some changes and fixed from the 'develop' branch. 2015-05-29 14:16:39 +02:00
mdtrooper 1160fd800c Fixed the 'availability' item in report. (Merge from 5d25b7c8e6) 2015-05-26 17:20:34 +02:00
Alejandro Gallardo Escobar 137acdb232 Merge remote-tracking branch 'origin/develop' into features/oracle 
Conflicts resolved:
	pandora_console/include/functions_reporting.php
 2015-05-19 19:16:35 +02:00