8054809dda
Merge branch '2931-Fallos_en_el_conteo_de_modulos_en_la_tabla_tagente' into 'develop'
...
Added new functionality in CLI and API to update module counts and alert counts
See merge request artica/pandorafms!2133
Former-commit-id: e5ee2c87fc7281ece82ace2d8b5654a1c278f60a
2019-02-07 13:10:56 +01:00
f4c22d2250
added extra arguments to get_snmpwalk
...
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
2019-02-07 13:01:21 +01:00
fb814680db
Added some well formatted docs
...
Former-commit-id: 30aa9de2e1b3835f96adf2fbec24bfd5ab17e7c2
2019-02-07 12:57:51 +01:00
cf5716e569
supervisor added subtype to tmensajes
...
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
2019-02-07 12:56:48 +01:00
d5fb9f1051
Added AJAX to user notification config window
...
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
6dbeaf6307
Added more attributes to swith HTML element
...
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
4c2215a3db
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/install.php
Former-commit-id: bc20f50737c115ade0034b4ca9e6d4cab26d35e6
2019-02-07 08:59:45 +01:00
1f3fe51f69
Auto-updated build strings.
...
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
9ea3980b26
wip supervisor
...
Former-commit-id: 991922a7dd18ace8fd831d02ada2cf20e81d27c2
2019-02-06 20:22:22 +01:00
fcb9275d11
Fixed conflict
...
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
f098b72fe4
Merge branch 'ent-3274-Retoque-visual-vista-SNMP-interfaces' into 'develop'
...
Fixed height in slicesbar graph of table interface snmp - #3274
See merge request artica/pandorafms!2144
Former-commit-id: c4e83cd7a6525aae2a567a90b3fb7d4d1ebb70bf
2019-02-06 18:56:47 +01:00
986dfcb74d
Added basic and dummy user edit notifications
...
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
37d02ddf59
Added disabled status to switches
...
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
9f7ab61766
Merge branch '3358-Mejora-en-la-aplicación-de-estilos' into 'develop'
...
3358 mejora en la aplicación de estilos
See merge request artica/pandorafms!2161
Former-commit-id: ef392bbd62ec9df99964d2057e23e35e334cb6c7
2019-02-06 16:34:00 +01:00
b805fe594e
Merge remote-tracking branch 'origin/develop' into ent-3274-Retoque-visual-vista-SNMP-interfaces
...
Conflicts:
pandora_console/include/functions_reporting_html.php
Former-commit-id: d096025f7a166160598f9fb26fe17c60809c9c3e
2019-02-06 15:34:06 +01:00
b8aab972c9
Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None
...
Conflicts:
pandora_console/godmode/groups/group_list.php
Former-commit-id: 6f928cc0a3ce2d4822affc7444254393d1d47b69
2019-02-06 15:14:22 +01:00
27495845ba
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
...
Former-commit-id: 500d7bb0d6e05093cfa3d7557fb8af6f22c410c7
2019-02-06 12:53:02 +01:00
6ddcfcbb19
Fixed code style lintern
...
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
77c92ba5ab
Merge remote-tracking branch 'origin/ent-3371-sistema-de-notificaciones-pandora' into ent-1959-cron-supervisor-de-estado
...
Former-commit-id: 982b806890f05118d71c6424a8879168c3a00028
2019-02-06 11:49:20 +01:00
ac6b74dcdf
Added new window to display user notifications config
...
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
c0a23889ab
Auto-updated build strings.
...
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
2019-02-06 00:01:29 +01:00
6f87b436d0
minor fix
...
Former-commit-id: 3fabf2561773365932c5d33e8bf9e42b7ed4e7f0
2019-02-05 18:47:41 +01:00
ddcf0bbd16
Added deletion on global notification config
...
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
7df3fe2dac
Added functionallity to Add element on notification global config
...
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
b4f3e94b13
Clean dialog box on creation
...
Former-commit-id: 824f7a968b2e196d6df98b9f5dbd48f21a7c9859
2019-02-05 15:31:08 +01:00
68bdbd511c
Fixed add consecutive source elements
...
Former-commit-id: 7763da94a48442953879538d42f36673fbdec752
2019-02-05 13:46:16 +01:00
8811257762
Popup to add groups and sources to global notification configuration
...
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
0b72571c7c
Added NOT IN in format mysql filter
...
Former-commit-id: f3a8cdd6923834443ed7223d1e6ad7776b861184
2019-02-05 12:53:57 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
97259bc285
Auto-updated build strings.
...
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
2019-02-05 00:01:28 +01:00
89af077b52
Servers get server string name
...
Former-commit-id: e67755e9a86872ba65c5768191cba80fbd879322
2019-02-04 19:16:50 +01:00
53947de42a
minor changes - constants style
...
Former-commit-id: 3482cb88dc0884ea3c1742eb8fef4ac7c603a849
2019-02-04 19:14:02 +01:00
54f0bc1a03
Disable selec boxes when click notify all users on notifications global config
...
Former-commit-id: 93a3a0007a3a8dfabfec5d0b9ead7d185aeee81b
2019-02-04 11:02:52 +01:00
0a94ac9eb0
Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations
...
Conflicts:
pandora_console/godmode/massive/massive_operations.php
Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
2019-02-04 11:00:50 +01:00
d2a3d3bbbc
Added all users in global notifications config
...
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
4c735762dc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
2019-02-04 09:11:39 +01:00
af1f081e5c
Auto-updated build strings.
...
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
2019-02-04 00:01:33 +01:00
934533141e
Auto-updated build strings.
...
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
2019-02-03 00:01:26 +01:00
24e799f18e
Auto-updated build strings.
...
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
2019-02-02 00:01:29 +01:00
50030b6933
Added notify all users and disable on first load
...
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
2019-02-01 14:48:52 +01:00
a8b85d2593
Added missing docs
...
Former-commit-id: 807c7466b60e4c8ecb77fb8d94102300e9bcd780
2019-02-01 13:53:22 +01:00
315a51c5e7
Added only read selector global notification setup
...
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
2019-02-01 13:46:58 +01:00
d38236091b
Format fixes
...
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
62461525e8
Auto-updated build strings.
...
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
2019-02-01 00:01:36 +01:00
1c0a5ca247
Added pospone select (fixme)
...
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
75eaa875c9
Added checkboxes to notifications global configuration
...
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
01bc0775bc
Added notification global configuration (only enable and disable)
...
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
b589826c86
Added HTML switch element
...
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
95f3c063a5
Added tnotification_source_group_user table
...
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
2019-01-31 16:27:55 +01:00
397f2964da
Added messages notification ball
...
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
2019-01-31 15:16:56 +01:00
229c60c5cc
Merge branch 'develop' into cursed-format-change
...
Former-commit-id: a3dfd193c81af0ebe0549dc2a9c953aac98b5f68
2019-01-31 09:42:10 +01:00
d6667354fc
Auto-updated build strings.
...
Former-commit-id: 166da74dd65e72a242b58cf10f4c564496b76fe9
2019-01-31 00:01:24 +01:00
3f81e60df2
wip messages
...
Former-commit-id: 7852ce90b3f2681a0134a651812341f7fac00c53
2019-01-30 17:33:31 +01:00
d0fe6c9ecf
fixed mr token
...
Former-commit-id: ab5615c8eb0f1a2b153934b807d23804f4fd5562
2019-01-30 17:11:48 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
406c062a3c
WIP messages, usable
...
Former-commit-id: 79e0b38fe7499642480505aac088ef8b45b04714
2019-01-30 13:29:46 +01:00
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
fa6c4d5bc9
notifications, WIP: new lib defined
...
Former-commit-id: 430ac2e090f91403fc074d2a9b37ab36de10d5a9
2019-01-30 11:56:47 +01:00
dc3d7cc5e2
notifications, first approach db schema
...
Former-commit-id: 1142c65f175c13eaaff9b26a9887f4ef519e9612
2019-01-30 11:56:21 +01:00
6485de04fd
Auto-updated build strings.
...
Former-commit-id: b5071a47e475e0aa13a62e9e76066cfd10d99ec1
2019-01-30 00:01:26 +01:00
edd96e75ab
Merge branch 'ent-3450-Error-informe-dinámico-al-marcar-una-gráfica-por-cada-agente' into 'develop'
...
Fixed auto combined graph in metaconsole
See merge request artica/pandorafms!2146
Former-commit-id: c25a50e5176dcb2996df04ebcee3907cc444b56e
2019-01-29 19:14:15 +01:00
11456bcfbb
Merge branch '2519_Listart_y_crear_comandos_de_alerta' into 'develop'
...
Add commands alert
See merge request artica/pandorafms!2025
Former-commit-id: 340201221d0219a0c67e1e34eb6421b7c6d1782d
2019-01-29 18:26:56 +01:00
cc27f0451a
Fixed auto combined graph in metaconsole 2
...
Former-commit-id: 672531931421175354f2a877ac295c1763107756
2019-01-29 17:12:24 +01:00
ae190ef058
Merge branch 'ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into 'develop'
...
Ent 2523 api listar, crear, borrar y modificar usuarios desde la api #6167 eu comm
See merge request artica/pandorafms!2149
Former-commit-id: a5a1e6aadf4efe43160eebe883a27ce58ac09bc2
2019-01-29 16:23:35 +01:00
a3c71f4bca
Merge remote-tracking branch 'origin/2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm' into ent-2523-APIListar,-crear,-borrar-y-modificar-Usuarios-desde-la-API-#6167-EUComm
...
Former-commit-id: b8eba6ae5a4efa338199efbc35b50b1b6bea8824
2019-01-29 11:57:19 +01:00
cec6aedaf5
Updated version and build strings.
...
Former-commit-id: 3ba62782db1b3eac4caafb21b5491d249f5a9b44
2019-01-29 11:08:54 +01:00
354834a872
Auto-updated build strings.
...
Former-commit-id: b59b540696e6f36d82e154a9aefea75519e9adac
2019-01-29 00:01:27 +01:00
e03b62d168
Fixed auto combined graph in metaconsole
...
Former-commit-id: c0e819e35fbb5952fa8ce2806e9cddff521a5131
2019-01-28 18:05:46 +01:00
7bc5fb47a0
Don't show image for groups without icon - #3446
...
Former-commit-id: 6a67e368a2aef7f2df04a3937a0466064fa6894e
2019-01-28 17:06:35 +01:00
cf2b9c5798
Fixed conflicts
...
Former-commit-id: 1be548acda51690c59d03e7270810ad03bb16822
2019-01-28 15:35:37 +01:00
042bf1c6e7
Merge branch '2526_Listar_acciones_de_alerta_desde_la_API' into 'develop'
...
List alert actions in nodes with CLI and API
See merge request artica/pandorafms!2085
Former-commit-id: 9732161ea417a1518e508cb9e2d20438d34ec3b2
2019-01-28 12:56:28 +01:00
ad368ed09b
Fixed height in slicesbar graph of table interface snmp - #3274
...
Former-commit-id: ebfb44b1bfe9c6d2cfb9e95a982ae169f0c631a4
2019-01-28 12:15:05 +01:00
550abc6634
Auto-updated build strings.
...
Former-commit-id: b2b65befe5f01bb047fe48f25c4f33eacc277d41
2019-01-28 00:01:23 +01:00
dd9f6e5f21
Auto-updated build strings.
...
Former-commit-id: 92bbfc8b4c06e1873fe92c9f3b31ddc43d070a1d
2019-01-27 00:01:29 +01:00
50036f2120
Auto-updated build strings.
...
Former-commit-id: 18dc882c6097c97f606ffc45e592f2118b4890cc
2019-01-26 00:01:25 +01:00
7d4fc056ca
fixed errors Qa
...
Former-commit-id: 9eea2ee2a3ec6bd51d0e7ef88b560e0475fe7504
2019-01-25 11:18:15 +01:00
61c9603ae8
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: ec5c28bb52343952fd644c1f999d3b5ef04cd709
2019-01-25 09:55:09 +01:00
335abb9abc
fixed error css
...
Former-commit-id: d2be8c4cf4306cb51c9b3854cbe06d4c80119d8b
2019-01-25 09:54:53 +01:00
d191cdef17
Auto-updated build strings.
...
Former-commit-id: 0c056fa59423bd4342f513f80bd0a49a9df0dddd
2019-01-25 00:01:33 +01:00
3cd9d22f1e
Merge branch 'ent-3441-no-se-esta-comprobando-bien-el-modo-centralizado-en-el-nodo' into ent-2516-api-listar-y-crear-modulos-de-inventario-6170-eucomm
...
Former-commit-id: 577301035cbde2dee5e7a001e48aab50a482a0ec
2019-01-24 14:56:23 +01:00
072ad0a1ea
Add return value to generate_hash_to_api function
...
Former-commit-id: b6420e14ab59c08c661a11763edaaa52ad612af8
2019-01-24 13:38:13 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
f9113fa2e5
Auto-updated build strings.
...
Former-commit-id: 4593b36762b46a3b621d39318cb7a9e5b437db52
2019-01-24 00:01:27 +01:00
48eea4ab87
Added centralized error code to API
...
Former-commit-id: 0400f0047276d08182477b4d4c59d42c665189c7
2019-01-23 19:21:02 +01:00
687358d70c
add new token treshold IPAM
...
Former-commit-id: cc7858af6a83b0773fec3249e13cfbfb274f2fba
2019-01-23 17:33:06 +01:00
5d8360860d
fixed error include in API not necessary
...
Former-commit-id: a1520c5b4438d559fd98bba4daafd80fb854a406
2019-01-23 17:06:31 +01:00
25d4239ef9
Merge branch '2521_Crear_grupos_de_modulo_desde_la_API' into 'develop'
...
Create module group API
See merge request artica/pandorafms!2053
Former-commit-id: 55819d89a59549ebec28d32840667e37d34a1f79
2019-01-23 17:02:34 +01:00
fb46197c1f
fixed minor error button
...
Former-commit-id: 4b57425285d33d181390090fbdd3c36882ab4fcf
2019-01-23 15:30:46 +01:00
841a9cf60b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: a23fffb984a6edd4ef7eefe871814ea0120c615a
2019-01-23 11:08:48 +01:00
1e4a288f53
Auto-updated build strings.
...
Former-commit-id: d02bc496b37ddd35ad1a75174daa0b3ca6d24f24
2019-01-23 00:01:23 +01:00
2e2774f256
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 5729e346de91ebf8897bc5d0dbc9f3f451711e86
2019-01-22 17:42:47 +01:00
65fce762df
Merge branch 'Informes_Event_report_group_no_se_visualizan_exportan_2' into 'develop'
...
Fixed Event reports pie graphs in metaconsole
See merge request artica/pandorafms!2128
Former-commit-id: d134417a05ddb7fd323d8ed4cba93e21e2551f7f
2019-01-22 14:30:45 +01:00
d8ca12bd63
Merge branch 'ent-3296-Descarga-informe-CSV-con-Graficas-no-funcionan' into 'develop'
...
Fixed bug in export to csv report
See merge request artica/pandorafms!2135
Former-commit-id: 04d0af4a61212057c7e539fc4513e2b45a2bc31a
2019-01-22 14:06:59 +01:00
e8497bb80c
Changed the order of actions
...
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +01:00
f1dbd40a6a
Merge branch 'ent-3421-error-en-un-push' into 'develop'
...
Ent 3421 error en un push
See merge request artica/pandorafms!2138
Former-commit-id: 6740a7f61adebbacaeb40b47b42973e4b518d12d
2019-01-22 10:04:07 +01:00
4236b55694
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Conflicts:
pandora_server/lib/PandoraFMS/DataServer.pm
Former-commit-id: 87b7d3a7591ed181be022b786deba8f090e43d49
2019-01-22 09:00:47 +01:00
0f29d6461e
Merge branch 'ent-3013-ipam-modo-configuracion-de-vlan' of brutus.artica.lan:artica/pandorafms into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b7873c08910f08827387db6d92d8a656d8ca4bf2
2019-01-22 08:57:59 +01:00
2c208b5e29
fixed errors php7 mysqli and warning include
...
Former-commit-id: 68bdf4c26530de45efe2dd8fab360fb88c8976bc
2019-01-22 08:57:48 +01:00
c586b68cb3
Auto-updated build strings.
...
Former-commit-id: 84dcfe707e9a70754b4ee72365bd549c8d1c09ef
2019-01-22 00:01:24 +01:00
da7e8e5487
Fixed conflict
...
Former-commit-id: 9ca611335700b59f58edf02fa1ab393fcfb8c567
2019-01-21 19:03:32 +01:00
923c8ee0b8
Revert "Added tnetwork_matrix data structure"
...
This reverts commit 5328a0e239
2019-01-21 18:43:35 +01:00
c75f94f9e0
Merge branch 'ent-3418-nueva-estructura-de-datos-tnetworkmatrix' into 'develop'
...
Ent 3418 nueva estructura de datos tnetworkmatrix
See merge request artica/pandorafms!2136
Former-commit-id: b04eaee2ce78625f9710b0851609ca8dfa2aea43
2019-01-21 18:32:05 +01:00
5328a0e239
Added tnetwork_matrix data structure
...
Former-commit-id: aa49de6c04a3c7a612ce7041393fe521e23e281d
2019-01-21 17:42:41 +01:00
4c6cd847bd
Fixed bug in export to csv report
...
Former-commit-id: 4bb84abbbb42945974643207f4976131753ab257
2019-01-21 16:19:22 +01:00
bd48c96de4
Fixed duplicated function module group synch in API
...
Former-commit-id: 03b23a85223add6d8f730dbfebaf58fbf7839e2a
2019-01-21 15:03:02 +01:00
bd0aa4ea8a
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 6545ada5fba710e8399e01f84d7503b289317abd
2019-01-21 12:26:46 +01:00
367c9fc6fc
Merge remote-tracking branch 'origin/2521_Crear_grupos_de_modulos_desde_la_API_2' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: 7d604cb6777734f43dc5d64f38b5cca651cce25d
2019-01-21 11:41:57 +01:00
1dbbc820ad
Merge branch 'develop' into 2521_Crear_grupos_de_modulo_desde_la_API
...
Former-commit-id: c8ce459cee080644b5184d74bdea56f34ab82eaf
2019-01-21 11:31:36 +01:00
f8ac525281
Merge branch '2527-listar-ycrear-filtros-de-eventos-desde-la-api' into 'develop'
...
implemented api functions to create/update/delete/list event filters
See merge request artica/pandorafms!2093
Former-commit-id: 03b530b0a118972a6af7b17fba9919b0fc45d611
2019-01-21 10:31:17 +01:00
dc2b738776
IPAM supernet
...
Former-commit-id: f34430ee824f4221b2922b02b844bd6c7d97614c
2019-01-21 09:24:00 +01:00
dc24599f18
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: f89cf021526d5e7f9fcaad080d0f8721c20c82cb
2019-01-21 09:22:42 +01:00
e2471b376c
Auto-updated build strings.
...
Former-commit-id: 6c89b359049f06338695df7e9cabd3293885df10
2019-01-21 00:01:23 +01:00
14c5e9d48b
Auto-updated build strings.
...
Former-commit-id: 1eb9179a088600ca4e68930cf9e903997d8f20c7
2019-01-20 00:01:23 +01:00
5a75662b99
Auto-updated build strings.
...
Former-commit-id: 8eff24974e5b3cfbeb57d408c2d4817fe0cb7156
2019-01-19 00:01:25 +01:00
344589494a
Fixed minor error
...
Former-commit-id: 56aafe5689d627ac515c80b0158fc998992bd457
2019-01-18 17:33:29 +01:00
0c9446fceb
Added new functionality in CLI and API to update module counts and alert counts
...
Former-commit-id: aca543eb33de0dc231d18a4776676a4700b37120
2019-01-18 17:24:32 +01:00
b3011e419a
Merge branch '3156-Translate-string-no-funciona' into 'develop'
...
fixed bug in function __()
See merge request artica/pandorafms!2023
Former-commit-id: 5fbbb662fdb7a044a3c616521158bcfa24e50413
2019-01-18 13:37:11 +01:00
979a87762e
Auto-updated build strings.
...
Former-commit-id: 56c567b92e7aad5a2aabd6551b3aa2f07517fb0b
2019-01-18 00:01:26 +01:00
3e25008c9f
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: b12bfcf0f580e011d1fa9ac9fab18d108b403b0a
2019-01-17 15:50:00 +01:00
1c8d846574
WIP IPAM Supernet
...
Former-commit-id: 9da8df381292bc79a49c1416fc6d2820f4b814ac
2019-01-17 15:49:41 +01:00
92aafb5953
Merge branch '2978-INTRACOM-Funciones-API-traps-y-control-de-acceso-de-aplicacion-externa-Fix-de-código-pisado-2' into 'develop'
...
Add traps, and other intracom API functions - #2978
See merge request artica/pandorafms!2119
Former-commit-id: 42bf67414f74d373ece3f83b4eecf2e4fd17f049
2019-01-17 12:08:03 +01:00
80d64f3d6b
Merge branch 'pandora_enterprise#2987' into 'develop'
...
Solved errors in mobile events view
See merge request artica/pandorafms!1907
Former-commit-id: 8efb7e917cf6a86b93d9c2905f1c63c292c742e3
2019-01-17 11:59:07 +01:00
bfecbc5337
Merge branch '2952_Mejora_en_wizard_para_crear_agentes_desde_la_metaconsola' into 'develop'
...
Added improvements in the creation of agents in the meta console
See merge request artica/pandorafms!1894
Former-commit-id: b5c450723740359204e4062a89a252247ee5157e
2019-01-17 10:04:30 +01:00
6bf6fd19d6
Auto-updated build strings.
...
Former-commit-id: f9fe79ec45febec900d21f62269f4352cc1a97a2
2019-01-17 00:01:26 +01:00
6e8e5d0dd6
Fixed Event reports pie graphs in metaconsole
...
Former-commit-id: 6fe0eb4035200dc4e22736098b810f31194e1a45
2019-01-16 19:44:29 +01:00
65d4c5aab7
Included control for user set filter and admin set filter
...
Former-commit-id: fe0ae14537a558e8f3ce423fd761a653ff8168e7
2019-01-16 17:53:32 +01:00
ab13faa788
Merge remote-tracking branch 'origin/develop' into pandora_enterprise#2987
...
Former-commit-id: 8d8324be8f876974cc0e33f18e9f0a93a6aff1a8
2019-01-16 17:49:10 +01:00
45becfe9ad
Merge branch '3046-Fallos-en-edicion-de-usuario' into 'develop'
...
3046-Fallos-en-edicion-de-usuario
See merge request artica/pandorafms!1947
Former-commit-id: bff6a1068784bb6ded8adec78f7458285f742368
2019-01-16 12:26:27 +01:00
b2434229db
Merge branch '1851-Grafica_de_widget_de_WUX_se_descoloca_si_falla_la_primera_fase' into 'develop'
...
fixed error widgets wux
See merge request artica/pandorafms!2102
Former-commit-id: c47bc3fc71f671b9ae4d668a6f81711683bb43a2
2019-01-16 11:03:02 +01:00
c0398dfa5b
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 8cfa910f14527759459b667c2d9b1303472c30ca
2019-01-16 08:41:50 +01:00
fe13a117aa
Auto-updated build strings.
...
Former-commit-id: 04682af4f07a1cb2bae17db88c4a4f4e17ad5600
2019-01-16 00:01:27 +01:00
aabcf73210
Fixed bug in functions_api
...
Former-commit-id: 28e5d9cf323dd04432ca5cabcd447e8cbf748706
2019-01-15 16:33:52 +01:00
797b49c03d
Merge branch '313-Respuestas-de-evento-masivas' into 'develop'
...
ent-313-Respuestas-de-evento-masivas
See merge request artica/pandorafms!2121
Former-commit-id: c4cf56f0b2526158d8f7f67ab3417e46b6e0f003
2019-01-15 16:17:53 +01:00
6ba8b9ab9a
Merge branch '2299_Añadir_nueva_funcionalidad_en_el_CLI_remove_agent_from_policy' into 'develop'
...
2299 añadir nueva funcionalidad en el cli remove agent from policy
See merge request artica/pandorafms!2092
Former-commit-id: d9ef39c8571ab3558e76883e1afc9cbb00225c79
2019-01-15 14:37:08 +01:00
9048a13840
fix bug: in progress events deleting on event view massive deletion
...
Former-commit-id: 4c4f0a387ad3abd7cfea913b45c885ab3af4ecc6
2019-01-15 13:27:14 +01:00
b38dc64ad8
Merge branch '3134-Tardanza_a_la_hora_de_aplicar_cambios_masivamente' into 'develop'
...
fixed errors in massive operation edit modules
See merge request artica/pandorafms!2101
Former-commit-id: 5c3a995d57b344ec860679b07b3624aec73cf4b8
2019-01-15 12:35:11 +01:00
5235b62c0d
fix disable actions in event list when centralized mode is enabled
...
Former-commit-id: d5f16b4453b1e291ba051cd381fc6c09ce0bd027
2019-01-15 11:29:12 +01:00
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
6894623429
Auto-updated build strings.
...
Former-commit-id: 582bbf87e0972212cf48dc220871981f80974321
2019-01-15 00:01:25 +01:00
f68cc53bb2
Merge branch '2896-Vista-de-monitores-en-metaconsola' into 'develop'
...
first load it does not show the data
See merge request artica/pandorafms!2112
Former-commit-id: 5f88566e4123c079956274ac4f7db27316e11718
2019-01-14 19:21:01 +01:00
24260cea34
Merge branch 'ent-2753-meter-profiler-en-el-docker' into 'develop'
...
Added profiller to docker
See merge request artica/pandorafms!1966
Former-commit-id: 24ade418bbc05cc6a40ee6f988b53eb648fffec5
2019-01-14 14:59:50 +01:00
efa2e5332f
fix massive custom event responses
...
Former-commit-id: 24db40167b05bfd7fe4de88060f03a7a0ec38e73
2019-01-14 13:40:49 +01:00
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
98c0bbec9a
Merge branch 'ent-2570-6239-ldap-grupos-secundarios' into 'develop'
...
Ent 2570 6239 ldap grupos secundarios
See merge request artica/pandorafms!2110
Former-commit-id: f710fa17c372e5dde1401d5cafa47a3e4ac56711
2019-01-14 10:53:45 +01:00
ad9a316a47
Auto-updated build strings.
...
Former-commit-id: 3426e636c31a7a9dcea09e442811310a4956d6ce
2019-01-14 00:01:23 +01:00
20a0aefe84
Auto-updated build strings.
...
Former-commit-id: aab4a872f690f104fe10dbdf7ef8ba86e02daef8
2019-01-13 00:01:23 +01:00
5abf8e14ff
Auto-updated build strings.
...
Former-commit-id: f78ab7f528f841aeda3dd7e28b1a2fcb34c9a05e
2019-01-12 00:01:24 +01:00
16ecc4efa3
Merge remote-tracking branch 'origin/develop' into ent-3013-ipam-modo-configuracion-de-vlan
...
Former-commit-id: 069f3fb28862a06eba76132c5e31da24ecf54b05
2019-01-11 13:12:35 +01:00
5ead23014d
Add traps, and other intracom API functions - #2978
...
Former-commit-id: 6f4029434a36030206def701df0d6e66995c6ca3
2019-01-11 12:33:22 +01:00
Daniel Rodriguez
fbsanchez
fermin831
Tatiana Llorente
artica
samucarc
Alejandro Fraguas
manuel.montes
Alejandro Gallardo Escobar
daniel
Daniel Maya
artica
Kike
alejandro-campos
enriquecd