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

16350 Commits

Author SHA1 Message Date
Luis Calvo 5b75b671aa Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-08 12:37:10 +02:00
Alejandro Fraguas 297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop' 
Ent 3608 update manager online

See merge request artica/pandorafms!2379
 2019-05-08 11:20:12 +02:00
Daniel Maya 610e0dabbf Merge branch 'develop' into ent-3773-fallo-paginacion-templates-alerts 2019-05-08 11:17:15 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Tatiana Llorente cb49de4d81 New menu module graph - #3617 2019-05-08 10:28:00 +02:00
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
marcos.alconada fa14fa9510 Show new values after update 2019-05-07 17:47:47 +02:00
Luis Calvo 954aac3aeb Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-07 17:13:54 +02:00
Daniel Maya e565ddee42 Round decimal value in percentil item and fixed value font size 2019-05-07 16:43:27 +02:00
Luis Calvo 3221bcf55a Merge remote-tracking branch 'origin/develop' into ent-3782-module-visualization-bug 2019-05-07 16:08:29 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
Ramon Novoa a92f81272a Merge branch 'ent-3835-pandora-db-historical-fails-when-port-setted' into develop 2019-05-07 15:05:03 +02:00
Ramon Novoa 10fd9c4b57 Merge branch 'ent-3755-Vista-de-eventos-se-carga-dos-veces' into develop 2019-05-07 15:02:47 +02:00
Alejandro Fraguas 0a96cfd696 Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop' 
Fixed bug in monitor detail view

See merge request artica/pandorafms!2360

Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
 2019-05-07 10:17:37 +02:00
artica 9116a72a2b Auto-updated build strings. 
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
 2019-05-07 00:01:09 +02:00
marcos.alconada ad00492ad6 se elimina la query del 27 
Former-commit-id: 1756d296ad9c13c62c4eb46a854291dfc4200256
 2019-05-06 18:23:12 +02:00
marcos.alconada fff3a783a1 Se restablece archivo modificado 
Former-commit-id: 1dca6ef8291dbd98951da31fc765130c9c450316
 2019-05-06 18:09:30 +02:00
marcos.alconada e1951c45a4 Se añade al 28 
Former-commit-id: 1607d9cbc88fe0e029df46ada20046899558829e
 2019-05-06 18:06:59 +02:00
Daniel Maya b57adb38a5 added graph_precision for the float in static_graph and percentile item 
Former-commit-id: 7fda14add9bcb0d9c0a425caad752364e29b309c
 2019-05-06 17:12:00 +02:00
Alejandro Fraguas 11a16e4c2a Merge branch 'ent-3408-snmp-component-creation-api' into 'develop' 
Fixed wrong array index for id_group

See merge request artica/pandorafms!2286

Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
 2019-05-06 17:00:29 +02:00
Daniel Barbero Martin 3fcd854ae6 fixed error labels graphs and weight in chart 
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
 2019-05-06 16:43:59 +02:00
alejandro-campos a622dcc9d4 add condition to avoid trying to retrieve a non existing event filter when synchronizing meta and node 
Former-commit-id: 83a1f9ad1c99de0e29a880de4ed6c518884bda31
 2019-05-06 15:06:26 +02:00
Daniel Maya 759c175d4f Added date in analogic clock 
Former-commit-id: 2436cac56b3910e23ce06defc5ce362f463b002f
 2019-05-06 11:36:20 +02:00
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop' 
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
 2019-05-06 10:33:30 +02:00
artica 6d7b748591 Auto-updated build strings. 
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
 2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings. 
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
 2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings. 
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
 2019-05-04 00:01:07 +02:00
Daniel Barbero eb64dbae86 add new checkbox current date for SLA Weekly, Montly and Hourly for item and template item 
Former-commit-id: c9f8c2d93cea8ecc398fe4d89e7a7b7804640cdc
 2019-05-03 14:16:26 +02:00
Daniel Barbero c5884f1ac9 add changes sql for mr 28 
Former-commit-id: 0650b5ec91188a854fb756d7c2d8b1b8eccc3e0d
 2019-05-03 14:09:23 +02:00
Tatiana Llorente 7da5f518d8 Fixed the form when you try to create an agent without alias - #3611 
Former-commit-id: 48bacfeb69e9df8114f2421b5d6b40596a5c263c
 2019-05-03 14:00:24 +02:00
alejandro-campos 7d8f9f7798 fix lint errors 
Former-commit-id: fc0a4502e571495b5ac17174a594aa767e882b21
 2019-05-03 13:54:39 +02:00
alejandro-campos 5b3dfcbf74 add feature to enable obfuscation on command fields when creating or updating commands 
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
 2019-05-03 13:46:52 +02:00
Tatiana Llorente b3a4d9edf1 New View Create/Update Agent - #3611 
Former-commit-id: fc6de6e82874a71477493eb1e9c93a8a7385e342
 2019-05-03 13:24:15 +02:00
Tatiana Llorente 9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
 2019-05-03 13:11:26 +02:00
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611 
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
 2019-05-03 13:07:58 +02:00
Daniel Rodriguez 16f687574e Merge branch 'ent-3847-Bug-en-edicion-de-modulos-locales-posible-condicion-especial' into 'develop' 
Fixed bug in unlinked modules

See merge request artica/pandorafms!2347

Former-commit-id: 32bea7e188131ae6115f6c45012dafe648f811cd
 2019-05-03 12:41:01 +02:00
manuel e424a2a684 Fixed bug in unlinked modules edition 
Former-commit-id: ec9ee4ecbc53a5c617aaf2cee52f7cbbf8f94da8
 2019-05-03 12:14:23 +02:00
Daniel Barbero db4cfaf1b7 fixed errors reporting_builder.php 
Former-commit-id: 387262b9ce2735ca60c6a1560c7a55eda9cb5237
 2019-05-03 12:11:20 +02:00
Daniel Barbero 9b9d2a3647 fixed errors reporting_builder.item_editor.php 
Former-commit-id: bef20169ce65e7d78aece4d390bc76f8098864d7
 2019-05-03 10:39:29 +02:00
artica b88456f696 Auto-updated build strings. 
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
 2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings. 
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
 2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings. 
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
 2019-05-01 00:01:10 +02:00
Daniel Rodriguez 3b73ea95ae Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop' 
Fixed node name in netflow map

See merge request artica/pandorafms!2386

Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
 2019-04-30 17:53:48 +02:00
Daniel Rodriguez 5be813e210 Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop' 
add links counters cfv

See merge request artica/pandorafms!2388

Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
 2019-04-30 17:50:33 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name 
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
 2019-04-30 17:30:57 +02:00
Daniel Maya 37d3737f82 Fixed number_format in group stadistic 
Former-commit-id: 7580be83cce0432ab68e3698813fd7eef079665a
 2019-04-30 16:23:14 +02:00
artica 310d217fb2 Auto-updated build strings. 
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
 2019-04-30 00:01:09 +02:00
Daniel Maya 61a0528717 Fixed EventHistory link 
Former-commit-id: 431251e74f419123b4848e10edc5fe472accdf43
 2019-04-29 17:37:36 +02:00
Daniel Barbero Martin 2aaeddd803 fixed errors IPAM subneting 
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
 2019-04-29 16:42:26 +02:00
Daniel Barbero Martin 94932d23ac fixed error cfv status 
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
 2019-04-29 15:43:51 +02:00
marcos.alconada 1d4e8c9bed Changed translations strings 
Former-commit-id: b802cc7a3650a1697ec0f192cbb374fce3ffea56
 2019-04-29 15:17:59 +02:00
manuel 8dc3beaaa9 changed in pandoradb 
Former-commit-id: 8a9ccee718b24455fa21c7bfb38cf704c1aa2a0a
 2019-04-29 15:07:39 +02:00
alejandro-campos bcbcd763a1 fixed double load of events in event list 
Former-commit-id: ea1294c680b5dbe3b069110012e2b54db5312fd1
 2019-04-29 15:04:14 +02:00
Daniel Maya d16b96309b Fixed pagination in Alert templates 
Former-commit-id: 88def9abc66ae8fddceb97ec55823b92ddc1bb1f
 2019-04-29 14:45:11 +02:00
Daniel Rodriguez 9788a9f6d5 Merge branch 'visual-console-refactor' into 'develop' 
Visual console refactor: hotfixes

See merge request artica/pandorafms!2384

Former-commit-id: 59e435071a8cf94f4628ce04a77c00b42c65e4eb
 2019-04-29 12:43:42 +02:00
marcos.alconada 8dc2644368 Deleted default insert on tevent_response 
Former-commit-id: 33fb686679fa89afbf0834e1e434739d11bfc4dd
 2019-04-29 12:36:37 +02:00
marcos.alconada c5c84d7421 Deleted row Integria IMS incident from event on tevent_responoses 
Former-commit-id: 76e41297003d537f8b0ea74394dd433e71ca2976
 2019-04-29 12:32:06 +02:00
Daniel Maya a5379be0d9 Added refr in full screen and public visual console 
Former-commit-id: 348ec996173e95dce73e5800ece9c6861219c7af
 2019-04-29 12:09:40 +02:00
Alejandro Gallardo Escobar 5f986e2390 Visual Console Refactor: bugfix 
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
 2019-04-29 11:53:21 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix 
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
 2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar e5c17f660b Visual Console Refactor: fixed the label position 
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
 2019-04-29 10:56:06 +02:00
Alejandro Gallardo Escobar c09fbf4ddb Visual Console Refactor: fixed the links 
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
 2019-04-29 10:45:12 +02:00
marcos.alconada 24e8d81b43 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: c15ebac07056c99c3c79ae57fa1396ea66d00c04
 2019-04-29 09:26:48 +02:00
artica 5d6bd31786 Auto-updated build strings. 
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
 2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings. 
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
 2019-04-28 00:01:06 +02:00
artica 29b7ddeb6d Auto-updated build strings. 
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
 2019-04-27 00:01:09 +02:00
Daniel Maya 504457f9a6 Fixed decimal in percentil 
Former-commit-id: ad964b4e4e2fa59eae959d5107b63d3c6f96766c
 2019-04-26 14:37:35 +02:00
Daniel Barbero e54112641d add links counters cfv 
Former-commit-id: 5a1bdfc376db32f94d06330c2e498c473361e710
 2019-04-26 14:25:51 +02:00
Tatiana Llorente 77941953a2 New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613 
Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
 2019-04-26 11:57:41 +02:00
Daniel Maya 4b73518804 Fixed node name in netflow map 
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
 2019-04-26 09:54:38 +02:00
marcos.alconada cffb469334 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: 2883dbe057d3c6063a1d1784c64c85dc49c0713b
 2019-04-26 09:44:54 +02:00
artica 6de9b4f23e Auto-updated build strings. 
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
 2019-04-26 00:01:06 +02:00
Alejandro Gallardo Escobar 6feaba0b9d Visual Console: changed the default orientation of the items 
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
 2019-04-25 18:23:28 +02:00
Alejandro Gallardo Escobar f3f5bcecd8 Visual Console Refactor: fixed the module graph element 
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
 2019-04-25 16:59:24 +02:00
Alejandro Gallardo Escobar af69804708 Improved the background size and the elements order of the Visual Console 
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
 2019-04-25 16:36:17 +02:00
marcos.alconada da8507c4b4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
 2019-04-25 16:05:27 +02:00
Alejandro Gallardo Escobar 08f9a34f23 Visual Console Refactor: bugfix 
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
 2019-04-25 14:24:19 +02:00
Alejandro Gallardo Escobar 2d9b4908de Visual Console Refactor: the legacy visual console is enabled by default 
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
 2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar 0bd276bc88 Visual Console Refactor: bugfix 
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
 2019-04-25 14:02:30 +02:00
Daniel Rodriguez 3b03b6fa10 Merge branch 'visual-console-refactor' into 'develop' 
Visual console refactor

See merge request artica/pandorafms!2348

Former-commit-id: 6a257514f7a5487b84a1cb35514899e1ef6f11e8
 2019-04-25 11:27:49 +02:00
Alejandro Gallardo Escobar 7d95151a5b Visual Console Refactor: minor fixes 
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
 2019-04-25 10:57:25 +02:00
Daniel Maya 260a149668 fixed include_once in items 
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
 2019-04-25 10:37:11 +02:00
Alejandro Gallardo Escobar 35d54a7e79 Visual Console Refactor: added missing libs 
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
 2019-04-25 10:30:24 +02:00
Alejandro Gallardo Escobar fbd8937cd3 Merge remote-tracking branch 'origin/develop' into visual-console-phase-2 
Former-commit-id: d79ca27527b9f3662617f8cfd641a55a8272b3b8
 2019-04-25 10:09:45 +02:00
Alejandro Gallardo Escobar 6a378f664e Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor 
Former-commit-id: 0c2ffa8d51737644ae99eebdaae842af26ba52b8
 2019-04-25 10:02:38 +02:00
Alejandro Gallardo Escobar 8ae521b2c4 Visual Console Refactor: added missing libraries 
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
 2019-04-25 10:02:35 +02:00
marcos.alconada 87ff7b3d4e Merge remote-tracking branch 'refs/remotes/origin/develop' into develop 
Former-commit-id: 2c3deaf32137b14caa9b714148808922a169f937
 2019-04-25 09:37:14 +02:00
Daniel Maya 3d2bcb3495 Fixed include_once in DonutGraph 
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
 2019-04-25 09:25:19 +02:00
Alejandro Gallardo Escobar b6d6b05ddb Visual Console Refactor: upgraded the bundles 
Former-commit-id: af79177070cbae3c3ff61282332564f8426a544d
 2019-04-25 09:13:34 +02:00
artica 7f7a727c21 Auto-updated build strings. 
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
 2019-04-25 00:01:10 +02:00
Daniel Barbero Martin 596e760454 fixed error secondary groups 
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
 2019-04-24 17:28:55 +02:00
Alejandro Gallardo Escobar 48917c565f Visual Console Refactor: renamed the bundles 
Former-commit-id: 0f63859b3e2eeeb890ad35779d2119137855fb8a
 2019-04-24 17:25:57 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor 
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
 2019-04-24 17:05:20 +02:00
Alejandro Gallardo Escobar dab4024f24 Visual Console Refactor: fixed the module graph's height 
Former-commit-id: 9e9bed04904c136450d0831e542bf7bcd6abab14
 2019-04-24 16:57:52 +02:00
Tatiana Llorente ab6658a450 Fixed pagination in modal windows - #3707 
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
 2019-04-24 16:26:50 +02:00
marcos.alconada e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
 2019-04-24 16:20:42 +02:00
Alejandro Gallardo Escobar 1cb15c9404 Visual Console Refactor: fixed the donut graph 
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
 2019-04-24 16:07:46 +02:00
Alejandro Gallardo Escobar 3c2e65a8a5 Visual Console Refactor: added the missing macros to the label 
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
 2019-04-24 15:58:33 +02:00
Daniel Maya d541eab986 Fixed size in module graph 
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
 2019-04-24 15:40:07 +02:00