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

17115 Commits

Author SHA1 Message Date
vgilc 3e90c3421a Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias-re' into 'develop' 
Fixed duplicate definition $rs

See merge request artica/pandorafms!1360
 2018-03-12 13:55:49 +01:00
fbsanchez 4566aee4e1 Fixed duplicate definition $rs 2018-03-12 13:47:57 +01:00
daniel 2fdc520a36 Merge remote-tracking branch 'origin/develop' into 1923-Migrar_agentes_desde_metaconsola 2018-03-12 13:07:34 +01:00
artica a66a7fde49 Auto-updated build strings. 2018-03-12 00:01:29 +01:00
artica 6235fc381a Auto-updated build strings. 2018-03-11 00:01:29 +01:00
artica 4af8841c29 Auto-updated build strings. 2018-03-10 00:01:37 +01:00
daniel 2605064c02 minor change 2018-03-09 15:33:51 +01:00
vgilc df6370ac4b Merge branch '1908-No-se-muestran-correctamente-las-gráficas-con-decimales-dev' into 'develop' 
Fixed shorten axis units

See merge request artica/pandorafms!1359
 2018-03-09 12:22:27 +01:00
danielmaya 64b62edd90 Fixed shorten axis units 2018-03-09 10:18:02 +01:00
artica 5a13db5a18 Auto-updated build strings. 2018-03-09 00:01:42 +01:00
fermin831 f0dbb78950 [Autoprovision] Added order and removed type from tprovisioning 2018-03-08 14:22:10 +01:00
artica f3f0d7771c Updated version and build strings. 2018-03-08 12:26:57 +01:00
daniel 1f3b95f6d1 check problems migration 2018-03-08 12:09:03 +01:00
enriquecd 97bcaec720 Not blink separator dots for digital clocks - #2026 2018-03-08 11:58:31 +01:00
vgilc ff8051b433 Merge branch '2031-syslogserver-perdida-de-historico-en-cambio-de-alias' into 'develop' 
Added get_agent as unified function

See merge request artica/pandorafms!1355
 2018-03-08 10:08:28 +01:00
artica 05fab2100d Updated version and build strings. 2018-03-08 09:47:20 +01:00
artica 89da7843ee Auto-updated build strings. 2018-03-08 00:01:34 +01:00
vgilc d9bbabf491 Merge branch 'cherry-pick-6b7a22e4' into 'develop' 
Aprovechar el arreglo de artica/pandorafms!1352 en develop

See merge request artica/pandorafms!1353
 2018-03-07 17:24:52 +01:00
fbsanchez 5450c682a9 Added get_agent as unified function 
It unifies:
- get_agent_from_alias
- get_agent_from_addr
- get_agent_from_name
 2018-03-07 16:56:35 +01:00
vgilc 5335b69b61 Merge branch '1776-3833-no-aparecen-eventos-en-la-aplicacion-de-android-v6' into 'pandora_6.0' 
Resolve "[ #3833] No aparecen Eventos en la aplicación de android v6"

See merge request artica/pandorafms!1352

(cherry picked from commit 6b7a22e47c)

c7e7ea1e Removed unwanted output from the api.php responses
 2018-03-07 16:54:18 +01:00
enriquecd 9a4ea41942 Add search bar to cluster agent aggregator - #1866 2018-03-07 16:18:35 +01:00
artica a0eff331c5 Auto-updated build strings. 2018-03-07 00:01:39 +01:00
vgilc 725ad80872 Merge branch '2011-Consolas-visuales-no-se-muestran-IPM-2' into 'develop' 
Fix visual console list groups filter - #2011

See merge request artica/pandorafms!1348
 2018-03-06 17:13:03 +01:00
enriquecd 80fb004c96 Fix visual console list groups filter - #2011 2018-03-06 17:07:02 +01:00
vgilc ccad148875 Merge branch '1894-Metaconsola-no-muestra-contador-de-autorefresh-dev' into 'develop' 
Fixed refresh in metaconsole

See merge request artica/pandorafms!1345
 2018-03-06 13:38:26 +01:00
danielmaya dc5a8b8425 Fixed refresh in metaconsole 2018-03-06 13:13:40 +01:00
vgilc 9588ddeb1b Merge branch 'ent-2014-5152-autovalidacion-automatica-de-eventos-en-metaconsola-sin-tener-que-validarse' into 'develop' 
[Server] Fixed event creation from alert server (use id_template_module instead id_template)

See merge request artica/pandorafms!1344
 2018-03-06 11:10:25 +01:00
artica 98b2aa2c8e Auto-updated build strings. 2018-03-06 00:01:36 +01:00
fermin831 79f65b43ff [Server] Fixed event creation from alert server (use id_template_module instead id_template) 2018-03-05 18:06:42 +01:00
vgilc 7ee1fbf1d8 Merge branch '1802-comision-europea-mejoras-plugin-mysql' into 'develop' 
Minor fixes and new methods

See merge request artica/pandorafms!1330
 2018-03-05 17:00:02 +01:00
fbsanchez 22192e6890 PluginTools Minor fixes 2018-03-05 16:43:18 +01:00
Ramon Novoa e1c171483e Change the type of netstat modules to incremental. 2018-03-05 15:33:42 +01:00
fbsanchez 19ddaeb799 Plugin Tools added get_address, some fixes and default values 2018-03-05 14:27:51 +01:00
fermin831 cd74015b95 [Autoprovision] Create tprovisioning and tprovisioining rules tables 2018-03-05 12:39:56 +01:00
vgilc efdb784ffd Merge branch 'ent-2009-Backgrounds-Consola-Visual-azul' into 'develop' 
[Visual console] Added background images

See merge request artica/pandorafms!1343
 2018-03-05 12:05:18 +01:00
vgilc 88d000379a Merge branch 'fix-modules_selection_mode_changes_not_update_module_list' into 'develop' 
Make change of "modules selection mode" in scheduled downtime editor updates module list

See merge request artica/pandorafms!1334
 2018-03-05 09:15:30 +01:00
artica a01d65fb89 Auto-updated build strings. 2018-03-05 00:01:32 +01:00
artica 5db4a03117 Auto-updated build strings. 2018-03-04 00:01:30 +01:00
artica a3c3b1c699 Auto-updated build strings. 2018-03-03 00:01:43 +01:00
fermin831 33e76d176a [Visual console] Added background images 2018-03-02 14:21:18 +01:00
fbsanchez f85ee5d508 PluginTools: fixed a issue parsing configuration files 2018-03-02 14:21:01 +01:00
vgilc 6932939458 Merge branch '2004-Query_muy_pesada_en_paradas_programadas' into 'develop' 
fixed errors select all agent where module common

See merge request artica/pandorafms!1340
 2018-03-02 13:09:03 +01:00
daniel 78bb12f015 fixed errors select all agent where module common 2018-03-02 12:55:03 +01:00
vgilc d5dc8c04e7 Merge branch 'ent-1850-no-hay-opcion-command-line-snapshot-en-meta-2' into 'develop' 
[Tree View] Fixed snapshot preview in metaconsole

See merge request artica/pandorafms!1339
 2018-03-02 11:29:53 +01:00
fermin831 28755d90a0 [Tree View] Fixed snapshot preview in metaconsole 2018-03-02 10:58:37 +01:00
vgilc 2b2c99cc42 Merge branch 'ent-1941-sql-charts' into 'develop' 
Ent 1941 sql charts

See merge request artica/pandorafms!1331
 2018-03-02 10:15:03 +01:00
KIKUCHI Koichiro a63a107f10 Cast $idAgents to array to prevent PHP warning 2018-03-02 17:33:19 +09:00
fermin831 d7cbcd012f [SQL Graph reports] Added dynamic height configuration option 2018-03-02 09:27:29 +01:00
fbsanchez b9bd02c7d5 PluginTools: Forwarded pfile to parse_configuration custom evals 2018-03-02 09:09:54 +01:00
artica 6f04665c72 Auto-updated build strings. 2018-03-02 00:01:32 +01:00