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

13374 Commits

Author SHA1 Message Date
vgilc 9cd95e2a48 Merge branch '2154-Fallo-de-visualización-al-crear-y-eliminar-grupos-de-agentes' into 'develop' 
2154 fallo de visualización al crear y eliminar grupos de agentes

See merge request artica/pandorafms!1502
 2018-06-05 11:11:57 +02:00
vgilc a69550f79e Merge branch 'fix-warnings-with-php72' into 'develop' 
Fixed warnings and some icons are not shown correctly with php7.2.

See merge request artica/pandorafms!1490
 2018-06-05 10:26:40 +02:00
vgilc ede1a3e091 Merge branch 'fix-error-with-php72' into 'develop' 
Fixed error and white screen with php7.2.

See merge request artica/pandorafms!1515
 2018-06-05 10:26:10 +02:00
vgilc 6152e93a9e Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop' 
Implement function io_safe_output

See merge request artica/pandorafms!1499
 2018-06-05 09:44:00 +02:00
vgilc 2be81f76b9 Merge branch '2196-Menús-fijados-y-Classic-menu-hace-cosas-raras' into 'develop' 
Fixed menu with top property

See merge request artica/pandorafms!1501
 2018-06-05 09:42:01 +02:00
Junichi Satoh 5142112ae5 Fixed error and white screen with php7.2. 2018-06-05 11:34:19 +09:00
artica db4ce74311 Auto-updated build strings. 2018-06-05 00:01:23 +02:00
danielmaya 89aa85626c Fixed export and import visual consoles 2018-06-04 15:56:17 +02:00
vgilc b620c1e7d9 Merge branch '2016-plugin-monitorizacion-con-docker-swarm' into 'develop' 
Minor fix in plugintools api_methods

See merge request artica/pandorafms!1484
 2018-06-04 10:19:56 +02:00
vgilc dbb802fb31 Merge branch '2214-Crear-nuevo-tipo-de-custom-graph-thermometer' into 'develop' 
New graph thermometer - #2214

See merge request artica/pandorafms!1465
 2018-06-04 10:19:21 +02:00
vgilc e808150f6b Merge branch '2251-Advertencia-al-cambiar-nombre-de-modulo-de-tipo-interfaz' into 'develop' 
Show warning modal window when change snmp or satellite module name - #2251

See merge request artica/pandorafms!1480
 2018-06-04 10:18:44 +02:00
vgilc 4abf3f3b2e Merge branch '1976-Informe-de-log-dev' into 'develop' 
Fixed sources in log report

See merge request artica/pandorafms!1508
 2018-06-04 10:17:17 +02:00
vgilc 0008e0183b Merge branch 'ent-2247-busqueda-libre-en-vista-de-eventos-ext-5725' into 'develop' 
Fixed free search in events view

See merge request artica/pandorafms!1511
 2018-06-04 10:15:29 +02:00
vgilc 900f6ba609 Merge branch '2294-Requisitos-API-cluster-2' into 'develop' 
Add cluster and API get functions - #2294

See merge request artica/pandorafms!1495
 2018-06-04 10:13:28 +02:00
vgilc b7dcd79eb3 Merge branch 'ent-2329-graficas-en-tiempo-real-con-modulos-SNMP-fallo-en-algunos-casos' into 'develop' 
Fixed problems with strange names on SNMP realtime graphs

See merge request artica/pandorafms!1509
 2018-06-04 10:12:27 +02:00
vgilc 9ea0115043 Merge branch 'ent-2010-error-de-ACLs-en-custom-graphs-y-reports' into 'develop' 
[ACL] Now only RM can delete custom graphs

See merge request artica/pandorafms!1341
 2018-06-04 10:10:56 +02:00
vgilc b2eada198a Merge branch 'ent-2142-la-vista-de-grupos-del-nodo-usando-la-cache-esta-mal' into 'develop' 
Ent 2142 la vista de grupos del nodo usando la cache esta mal

See merge request artica/pandorafms!1512
 2018-06-04 10:00:53 +02:00
vgilc 0943540b05 Merge branch '2316-5594-fallo-redireccion.linked-visual-consoles-desde-Metaconsola' into 'develop' 
Fixed static graph links to another visual console in meta

See merge request artica/pandorafms!1507
 2018-06-04 09:59:51 +02:00
artica 77ccbe46a9 Auto-updated build strings. 2018-06-04 00:01:20 +02:00
artica 8138c2f8ae Auto-updated build strings. 2018-06-03 00:01:19 +02:00
artica 57ef534909 Auto-updated build strings. 2018-06-02 00:01:26 +02:00
daniel 97aaad0b02 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-06-01 14:04:46 +02:00
daniel 47a287b6f6 fixed errors in graph 2018-06-01 13:58:29 +02:00
fermin831 a55b829aa1 Fixed a PHP warning 2018-06-01 12:36:34 +02:00
fermin831 f0aacc4c33 Secondary groups are implemented in group view cache 2018-06-01 12:25:20 +02:00
fermin831 5c57ee34a7 Fixed group view on metaconsole (typo) 2018-06-01 12:23:25 +02:00
fermin831 0757d2ed56 Fixed cached group view in node 2018-06-01 12:19:34 +02:00
artica ec050ba606 Auto-updated build strings. 2018-06-01 00:01:21 +02:00
fermin831 6bd672fd38 Fixed free search in events view 2018-05-31 20:32:04 +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
danielmaya 04f117523b Fixed sources in log report 2018-05-31 17:33:51 +02:00
fermin831 0b0fe5ea6c Fixed static graph links to another visual console in meta 2018-05-31 17:14:35 +02:00
fermin831 836cce115d Fixed ACL in custom graphs 2018-05-31 15:29:31 +02:00
artica e1cba85c6e Auto-updated build strings. 2018-05-31 00:01:21 +02:00
daniel a8b8f309e6 fixed graphs 2018-05-30 17:45:17 +02:00
fermin831 f1807246a1 Changed MR to 16 and current_package_enterprise to 723 for new and migrated installations 2018-05-30 15:49:59 +02:00
fermin831 3155fecbfe Fixed ACL in reports created by another user in bit RM 2018-05-30 15:09:47 +02:00
fermin831 061df6495c Merge branch 'develop' into ent-2010-error-de-ACLs-en-custom-graphs-y-reports 2018-05-30 12:14:35 +02:00
artica 7147667d8c Auto-updated build strings. 2018-05-30 00:01:21 +02:00
fermin831 0acaf2312d [Rebranding] Mobile console head title 2018-05-29 13:26:47 +02:00
fermin831 1391f8cc11 [Rebranding] Fixed get header logo on metaconsole 2018-05-29 12:45:08 +02:00
artica aa1e7ff4d2 Auto-updated build strings. 2018-05-29 00:01:28 +02:00
daniel dd57ddbd3c Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/functions.php
	pandora_console/include/styles/pandora.css
 2018-05-28 17:54:53 +02:00
daniel 02a442a8db fixed errors in graph add phantom js 2018-05-28 17:47:40 +02:00
manuel.montes bc98327bb4 Fixed cache in functions_users.php 2018-05-28 17:33:35 +02:00
artica 01cce15955 Updated version and build strings. 2018-05-28 13:20:38 +02:00
manuel.montes 23b6dd5bdb Fixed menu with top property 2018-05-28 12:58:23 +02:00
fermin831 88e060893a Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts resolved:
	pandora_console/operation/events/events_rss.php
 2018-05-28 12:12:16 +02:00
fbsanchez 2f8cdb5ea5 Added check_login to plugin registration 2018-05-28 11:31:09 +02:00
artica 2e4b320861 Auto-updated build strings. 2018-05-28 00:01:21 +02:00
artica 9ff98af9a5 Auto-updated build strings. 2018-05-27 00:01:26 +02:00
artica edd38ac9c8 Auto-updated build strings. 2018-05-26 00:01:24 +02:00
manuel.montes f0e7a59ae7 Implement function io_safe_output 2018-05-25 14:21:52 +02:00
fermin831 a54c074b11 [Rebranding] Added hide help on node 2018-05-25 10:29:40 +02:00
artica 643a07a163 Auto-updated build strings. 2018-05-25 00:01:22 +02:00
fermin831 6675597b62 [Rebranding] Minor fix 2018-05-24 18:35:20 +02:00
fermin831 8eb44762b2 [Rebranding] Added custom favicon and white background to meta 2018-05-24 18:33:45 +02:00
danielmaya 3f1a1a816b Fixed id_agente lost in insert_data 2018-05-24 17:24:53 +02:00
fermin831 750ed29ac9 [Rebranding] Added a header to white backgrounds and make the favicon and the mobile console configurable 2018-05-24 16:59:50 +02:00
danielmaya 8a6755d224 fixed conditional in ajax.php 2018-05-24 16:28:51 +02:00
fermin831 063865e179 [Rebranding] Refactorized logos preview in nodo 2018-05-24 12:50:24 +02:00
vgilc ad3a7071b3 Merge branch '2297-Visor-de-logs-pone-un-ancho-enorme-y-se-mete-en-scroll-horizontal' into 'develop' 
Fixed white-space / pre-wrap

See merge request artica/pandorafms!1494
 2018-05-24 12:07:09 +02:00
fermin831 acad8d537b [Rebranding] Added tooltip to avoid Monitoring Event name will be changed 2018-05-24 11:37:26 +02:00
fermin831 66dfd9b171 [Rebranding] Change alert action Pandora FMS Event to Monitoring Event 2018-05-24 11:16:30 +02:00
fermin831 bcb3af09ca [Rebranding] Minor fix 2 2018-05-24 10:56:24 +02:00
fermin831 653248698d [Rebranding] Remove a obsolete link 2018-05-24 10:31:51 +02:00
artica bd48fe4fe6 Auto-updated build strings. 2018-05-24 00:01:24 +02:00
enriquecd dbafab2ae7 Add cluster and API get functions - #2294 2018-05-23 19:13:47 +02:00
fermin831 5e9cf38474 [Rebranding] Modified some strings to new installations 2018-05-23 18:21:42 +02:00
fermin831 43447bbee4 [Rebranding] Minor ended fixed 2018-05-23 18:19:24 +02:00
manuel.montes b68948307b Fixed white-space / pre-wrap 2018-05-23 17:55:07 +02:00
daniel 16dca6860f Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 
Conflicts:
	pandora_console/include/graphs/flot/pandora.flot.js
 2018-05-23 12:46:12 +02:00
vgilc dcf6e46f61 Merge branch 'ent-2105-internal-audit-view-improvements' into 'develop' 
Más corrección de errores

See merge request artica/pandorafms!1492
 2018-05-23 08:46:52 +02:00
vgilc 6727941bac Merge branch 'ent-2268-fallo-en-la-vista-de-RSS-de-eventos' into 'develop' 
Fixed rss events due to secondary groups

See merge request artica/pandorafms!1481
 2018-05-23 08:45:45 +02:00
vgilc 076724ba35 Merge branch '1141-Ajustar-grafica-a-los-valores-mostrados' into 'develop' 
add zoom graphs xy

See merge request artica/pandorafms!1491
 2018-05-23 08:45:17 +02:00
artica e015354a99 Auto-updated build strings. 2018-05-23 00:01:24 +02:00
fermin831 e71fd399fb Merge branch 'develop' into 2106-intracom-rebranding 
Conflicts:
	pandora_console/godmode/admin_access_logs.php
	pandora_console/include/javascript/functions_pandora_networkmap.js
 2018-05-22 19:29:46 +02:00
fermin831 2c97232f90 [Rebranding] Miscelaneous rebranding 2018-05-22 19:22:37 +02:00
Alejandro Gallardo Escobar dcdce9c8fc Merge branch 'develop' into ent-639-add-user-defined-timezones 2018-05-22 17:58:47 +02:00
fermin831 9935b7f8a3 [Rebranding] Added custom logo to node request new license 2018-05-22 16:49:49 +02:00
Alejandro Gallardo Escobar 9d558fb7cb Removed some duplicated html entities 2018-05-22 16:30:33 +02:00
Alejandro Gallardo Escobar 37f19dc9fd Fixed a column name 2018-05-22 16:17:08 +02:00
daniel 3accc31372 add zoom graphs xy 2018-05-22 15:57:36 +02:00
fermin831 946e897db6 [Rebranding] Get the correct header logo in the metaconsole 2018-05-22 15:26:11 +02:00
fermin831 2e8e3c27b6 [Rebranding] Modified tinylogo by custom_logo in node 2018-05-22 13:40:23 +02:00
Junichi Satoh cb10d6d4a4 Fixed warnings and some icons are not shown correctly with php7.2. 2018-05-22 20:18:49 +09:00
daniel 727b173392 fixed error library pdf example 2018-05-22 13:15:09 +02:00
fbsanchez a5be501f4d Merge remote-tracking branch 'origin/develop' into 2016-plugin-monitorizacion-con-docker-swarm 2018-05-22 11:41:29 +02:00
fbsanchez 9f140e6197 Applied lukasr patch for pchart 2018-05-22 10:51:03 +02:00
daniel 25666e1bff fixed errors 2018-05-22 10:50:38 +02:00
vgilc 58370449dd Merge branch 'ent-2200-Unreachable-host-en-respuestas-de-eventos' into 'develop' 
Removed unreachable host from events responses

See merge request artica/pandorafms!1450
 2018-05-22 10:00:37 +02:00
artica 4b197ab61a Auto-updated build strings. 2018-05-22 00:01:31 +02:00
fermin831 0e3db1eb80 [Rebranding] Added custom logo to network maps central node 2018-05-21 18:26:28 +02:00
fbsanchez a82299f1cf PluginTools minor changes 
API cluster minor changes
 2018-05-21 18:08:36 +02:00
vgilc f9a5df12db Merge branch 'ent-2266-mobile-sql-injection-vulnerability' into 'develop' 
Vulnerabilidad: Inyección SQL en la consola móvil

See merge request artica/pandorafms!1486
 2018-05-21 17:55:47 +02:00
daniel 78f73d5a76 Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio 2018-05-21 17:26:19 +02:00
daniel b323d524d6 fixed errors in graph update version 2018-05-21 17:25:09 +02:00
Alejandro Gallardo Escobar f0f331be4e Moved a button 2018-05-21 16:22:38 +02:00
Alejandro Gallardo Escobar 447958144e Error fix 2018-05-21 16:00:54 +02:00