Commit Graph

15083 Commits

Author SHA1 Message Date
fbsanchez ed63ef47fa Moved ReconServer to DiscoveryServer
Former-commit-id: 5e18aa75d669f6b45d3b4e2648f31473fd206091
2019-02-13 14:56:10 +01:00
fermin831 0ecf2bb9c4 Added pandora db messages purgue
Former-commit-id: 23d1f55ac6b7d6d5470fa25860b9bbb1575875df
2019-02-13 14:43:55 +01:00
fermin831 855822f61e Fixed arrow on notifications area
Former-commit-id: 6771d282bf7a6b5b9ddd0baec8a0a887f741d931
2019-02-13 12:44:30 +01:00
fermin831 8be28b5fed Removed some header icons (it will be substituted by notifications)
Former-commit-id: 29929ee6f9785cf892b3a0afe7779531d5615e6c
2019-02-13 11:47:33 +01:00
fermin831 fe50d6caff Open toasts and messages into new window
Former-commit-id: ff3d565247225032219d4bbb5fa903bdae7730e8
2019-02-13 11:09:15 +01:00
fermin831 48724fe033 Added onclick to notification-item's
Former-commit-id: 2e4833686b08b104b11ba9023f6eca38e0ed6bd9
2019-02-12 16:46:21 +01:00
fermin831 cc2b2709f9 Show the notifications with AJAX
Former-commit-id: 73f407d13d3805dce879c1431311a4aaec00c152
2019-02-12 16:25:59 +01:00
fermin831 105341e553 Removed unwanted traces (again)
Former-commit-id: c6453610177b1894bc9d65c8297cd4f8ee01092d
2019-02-12 16:01:24 +01:00
fermin831 35ea03ddf6 Fixed notifications global configuration. Do not disable the multiple selects.
Former-commit-id: c5148e3adad63300c2b938a78eb46974cceff761
2019-02-12 15:36:41 +01:00
fermin831 3c3d9daa09 Removed unwanted traces
Former-commit-id: 23e41d90e1ee5d94758c050de942b6f8fb779613
2019-02-12 15:29:28 +01:00
fermin831 325f5e8775 Added onclik con notification toasts
Former-commit-id: 7d0c7a7cc9dacc0e52c7f362a3301ed87a7205d3
2019-02-12 15:27:14 +01:00
manuel 27da41c7da WIP Host&devices
Former-commit-id: cc18e55a30f72c606bb5b5736a5fa771987e0a45
2019-02-12 14:39:01 +01:00
fermin831 36dd59b250 Added changes without delete install.php
Former-commit-id: 686b0dc8e519283508f8f83ff663f6d3b79e7b80
2019-02-12 13:29:43 +01:00
fermin831 af90734436 Revert "Merged from discovery and validated"
This reverts commit e744dd50eb [formerly af2047a38913f2763b68a8ec15b8f0cd58b8e676].


Former-commit-id: b32e3295f770a72ee587754b0d63ac8df1fd70f8
2019-02-12 13:29:04 +01:00
fbsanchez e744dd50eb Merged from discovery and validated
Former-commit-id: af2047a38913f2763b68a8ec15b8f0cd58b8e676
2019-02-12 13:14:22 +01:00
fbsanchez 166c3bbe88 Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: d630994f964e43b28197f4d26469fa1484d08ac2
2019-02-12 12:41:11 +01:00
fbsanchez daa72a031a Merge branch 'ent-3371-sistema-de-notificaciones-pandora' of brutus.artica.lan:artica/pandorafms into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: 9c321b0841261f1c44f7c809190c22acf20f5fa5
2019-02-12 12:27:48 +01:00
fbsanchez 9a3140baf2 notifications. Up to date
Former-commit-id: 80b94d79e7ad393fcaea63cbbd7f734a805da751
2019-02-12 12:27:32 +01:00
fbsanchez 42dc0c60be supervisor
Former-commit-id: cf99e746a02ab3e921a39b19f6b4822580299b7e
2019-02-12 11:41:21 +01:00
fbsanchez d40ced2043 alert_command send notification
Former-commit-id: ff0eb13b51cdab9c2d188362da0c8b2c4191b2cf
2019-02-12 11:16:34 +01:00
fbsanchez 738443445c minor fix in tevento db script
Former-commit-id: cb75a25c47f8025c4d9482ec0f8ebd64365073a7
2019-02-11 20:20:23 +01:00
fbsanchez 851050f04e message_edit.css added
Former-commit-id: f4e88b813dc1b39e50b0f997ace3768a10f406f1
2019-02-11 19:48:20 +01:00
fbsanchez 332c53b098 change behaviour to avoid mr slow updates. Event extended
Former-commit-id: c5a6d5448a14b10b6851f59c5f688f360d747606
2019-02-11 19:46:46 +01:00
fbsanchez 72a57bfbec minor changes in message edit
Former-commit-id: a36fe911f191c3a187c8c70032f3b1aaa0977fea
2019-02-11 19:27:21 +01:00
fbsanchez be8877563b Merge branch 'ent-3371-sistema-de-notificaciones-pandora' of brutus.artica.lan:artica/pandorafms into ent-3371-sistema-de-notificaciones-pandora
Former-commit-id: 5a0ef1ab4b8627f72158e3d012dd1d65e9852bcc
2019-02-11 18:28:05 +01:00
fbsanchez 0dbabd3ba3 Improved conversation view (messages) some filters and fixes in functions_messages
Former-commit-id: 13597c6556939bbe772d5ed749930e30e5377c47
2019-02-11 18:28:00 +01:00
fermin831 c355a581ff Added toasts to notifications
Former-commit-id: 7429bf8d9c4f4e8bb16549172a59c33d22185821
2019-02-11 17:53:37 +01:00
fbsanchez d2649bb51c fixed double count in read messages
Former-commit-id: e3661ad675c7dcd70fbea3bc5a41b3f103a376a0
2019-02-11 15:28:38 +01:00
fbsanchez 7893827652 fixed query notifications pending
Former-commit-id: ac8c5b5cb1276c16b9339e2e86c88d856540be0d
2019-02-11 14:51:59 +01:00
fermin831 17c012cd83 Added update ball notifications
Former-commit-id: 60c253a1b64d1084ae732e88e0a6fb1f98cf8a12
2019-02-11 14:44:14 +01:00
fermin831 1223ce69da Added missing docs
Former-commit-id: d0477e479f4ba4d138112de73746ca8173c9d563
2019-02-11 13:49:03 +01:00
fermin831 a50a251b00 Added filter to get last messages by notification ball
Former-commit-id: 57619fe6cd46f3f723c5b2c3bdbe3aa9ba155a0c
2019-02-11 13:35:36 +01:00
fermin831 e6dc69e3be Added last_id to notification ball
Former-commit-id: f7095e633ce5799cf79bd20393e13e5b6233bf4c
2019-02-11 13:05:31 +01:00
fbsanchez e1d87ce0c8 minor fix falsse => false
Former-commit-id: 938e161b179736a3b72cad3f35db90a02e5d632c
2019-02-08 19:09:36 +01:00
fbsanchez 49cf9d5db0 Extended events
Former-commit-id: f2e0925ce58042dc9c9505a0d0fcf1a424c8a0bb
2019-02-08 19:07:49 +01:00
Fermin d5d58e5b2b Added outter shadow to notifications messages box
Former-commit-id: 1eed4b4f2ef7d58dbab73ccb2628bb0ef9ffc7ca
2019-02-08 18:53:28 +01:00
fbsanchez 091f6ace96 minor fixes and revised code style
Former-commit-id: aad587c578de99432dd759d6c82b622f6cd6c6e7
2019-02-08 17:30:47 +01:00
fbsanchez a3a1bbb778 added missed new field extended_info for events
Former-commit-id: 8edb7cb854364259ffca27585e423464d213137a
2019-02-08 17:30:13 +01:00
Fermin 0124bd0a17 Added real notifications (not AJAX jet)
Former-commit-id: 5d0dee32c4fb96ad8dcb4f3f70049e1d1c4936fc
2019-02-08 14:23:05 +01:00
fbsanchez 7077d5d1ef Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3381-eventos-extendidos
Former-commit-id: e67aa2dd0d9aac3040bd1708cbf598e6d17dd2c8
2019-02-08 14:02:18 +01:00
fbsanchez 348a10cfe4 Added tevent_extended to db scripts
Former-commit-id: 5391b8dc0da2bc30bf92735f8604fe84456e992e
2019-02-08 13:59:48 +01:00
Fermin 4b86683d23 Fixed style
Former-commit-id: bd4c0370bb3c63eddb9a7b36b0e8f6938c48b4ae
2019-02-08 11:39:17 +01:00
Fermin 80a5d0b0b9 Removed unused code and format some files
Former-commit-id: 5f8da31efc5241dd16002565fdb89d774072b7b3
2019-02-08 10:32:04 +01:00
artica e6abb61a13 Auto-updated build strings.
Former-commit-id: 0f011fb8fe35e16e311b4cd0f946fec051170c32
2019-02-08 00:01:29 +01:00
fbsanchez e90d4b7256 Supervisor added blacklist to avoid mail twice
Former-commit-id: e2f03306076d90f9abe312694ea1fa2298ee7c62
2019-02-07 18:29:20 +01:00
fbsanchez 42b0afb884 Supervisor minor fixes
Former-commit-id: 84171e197df0a016a9a4b7d0e49f0412b65ee864
2019-02-07 18:07:52 +01:00
fermin831 04b2cb8665 Use real ids instead fake ids
Former-commit-id: 2360a14d1865f918247d23b2f3181626052cad60
2019-02-07 18:04:14 +01:00
fbsanchez 681ad67028 ConsoleSuperviso - mailing support and minor fixes
Former-commit-id: 86db19d675aa2b7ea37af2839764245fde9ee3c4
2019-02-07 18:00:51 +01:00
fermin831 7fa344c2a4 Change the global configuration notification to AJAX
Former-commit-id: a9017377c8ed6780170c0f418ec3e9bc39f7782c
2019-02-07 17:53:09 +01:00
fbsanchez dc9decde42 ConsoleSupervisor
Former-commit-id: 3c40e628883f032a449862d0161659586819e6df
2019-02-07 16:24:49 +01:00
Daniel Rodriguez 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
fbsanchez f4c22d2250 added extra arguments to get_snmpwalk
Former-commit-id: bf02258e312d3a81673e79a144173b53e0c2c153
2019-02-07 13:01:21 +01:00
fermin831 fb814680db Added some well formatted docs
Former-commit-id: 30aa9de2e1b3835f96adf2fbec24bfd5ab17e7c2
2019-02-07 12:57:51 +01:00
fbsanchez cf5716e569 supervisor added subtype to tmensajes
Former-commit-id: 650e7317a4fea4e44be850af1156024297396a16
2019-02-07 12:56:48 +01:00
fermin831 d5fb9f1051 Added AJAX to user notification config window
Former-commit-id: 9ca09ae777d699588a76dfb619156d800a95895b
2019-02-07 12:22:50 +01:00
fermin831 6dbeaf6307 Added more attributes to swith HTML element
Former-commit-id: aa567ef6f16e1e89489b16f808b00e772866ef86
2019-02-07 12:20:34 +01:00
Tatiana Llorente 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
artica 1f3fe51f69 Auto-updated build strings.
Former-commit-id: 984f5cc8c4bf0b5adb68d7bfe86e171f7b748f77
2019-02-07 00:01:40 +01:00
fbsanchez 9ea3980b26 wip supervisor
Former-commit-id: 991922a7dd18ace8fd831d02ada2cf20e81d27c2
2019-02-06 20:22:22 +01:00
samucarc fcb9275d11 Fixed conflict
Former-commit-id: 7aeb505d4d2b8e11f72e5b841eec557d4afc1b6d
2019-02-06 19:09:09 +01:00
Daniel Rodriguez 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
fermin831 986dfcb74d Added basic and dummy user edit notifications
Former-commit-id: d0395c5b2cbc870812e54e15db523eeaac94557f
2019-02-06 18:20:26 +01:00
fermin831 37d02ddf59 Added disabled status to switches
Former-commit-id: 7fee49f58e4be84bfb8bad08303b203d71dafe16
2019-02-06 18:18:48 +01:00
Alejandro Fraguas 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
Tatiana Llorente 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
Tatiana Llorente 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
fbsanchez 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
fermin831 6ddcfcbb19 Fixed code style lintern
Former-commit-id: d7757a56f8368761776f80f826600d601b56b6d9
2019-02-06 12:51:02 +01:00
fbsanchez 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
fermin831 ac6b74dcdf Added new window to display user notifications config
Former-commit-id: 57ba8fcd01365cedc92535d7cf71f70432a55a94
2019-02-06 11:36:28 +01:00
artica c0a23889ab Auto-updated build strings.
Former-commit-id: ad456bf0e4cb361694afa246a9348e5b87b85a94
2019-02-06 00:01:29 +01:00
fbsanchez 6f87b436d0 minor fix
Former-commit-id: 3fabf2561773365932c5d33e8bf9e42b7ed4e7f0
2019-02-05 18:47:41 +01:00
fermin831 ddcf0bbd16 Added deletion on global notification config
Former-commit-id: 2356bbe374e5decf929cfaaf2fc4776611b0652d
2019-02-05 18:14:10 +01:00
fermin831 7df3fe2dac Added functionallity to Add element on notification global config
Former-commit-id: b51cf2d5079019a69fd7c4344dfcff2bf38147db
2019-02-05 17:40:44 +01:00
fermin831 b4f3e94b13 Clean dialog box on creation
Former-commit-id: 824f7a968b2e196d6df98b9f5dbd48f21a7c9859
2019-02-05 15:31:08 +01:00
fermin831 68bdbd511c Fixed add consecutive source elements
Former-commit-id: 7763da94a48442953879538d42f36673fbdec752
2019-02-05 13:46:16 +01:00
fermin831 8811257762 Popup to add groups and sources to global notification configuration
Former-commit-id: 481812290ea1d1446aa7378ab6a935139483c8a0
2019-02-05 13:36:16 +01:00
fermin831 0b72571c7c Added NOT IN in format mysql filter
Former-commit-id: f3a8cdd6923834443ed7223d1e6ad7776b861184
2019-02-05 12:53:57 +01:00
Tatiana Llorente 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
artica 97259bc285 Auto-updated build strings.
Former-commit-id: e3473dde27b1cc8aaa1ae555158171d25941710f
2019-02-05 00:01:28 +01:00
fbsanchez 89af077b52 Servers get server string name
Former-commit-id: e67755e9a86872ba65c5768191cba80fbd879322
2019-02-04 19:16:50 +01:00
fbsanchez 53947de42a minor changes - constants style
Former-commit-id: 3482cb88dc0884ea3c1742eb8fef4ac7c603a849
2019-02-04 19:14:02 +01:00
fermin831 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
manuel.montes 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
fermin831 d2a3d3bbbc Added all users in global notifications config
Former-commit-id: d4bf0067f3ffe2e4fdef25158579716bdfd78d5d
2019-02-04 10:41:35 +01:00
Alejandro Gallardo Escobar 4c735762dc Merge branch 'develop' into cursed-format-change
Former-commit-id: a986a0245f7f0cce5ea7fc3c33503bc53e85242a
2019-02-04 09:11:39 +01:00
artica af1f081e5c Auto-updated build strings.
Former-commit-id: e75f41146e01ab55222c3b4176a50aee7e9246df
2019-02-04 00:01:33 +01:00
artica 934533141e Auto-updated build strings.
Former-commit-id: ac84c1e47dd82d12c0b83a0a79b044ca26fc8d8e
2019-02-03 00:01:26 +01:00
artica 24e799f18e Auto-updated build strings.
Former-commit-id: 0e390ddd2b2294dbd043bc7c94dd9a82c228c80f
2019-02-02 00:01:29 +01:00
fermin831 50030b6933 Added notify all users and disable on first load
Former-commit-id: d193a8375ce00f3f2cf2c1fc181d4eef47c92eb2
2019-02-01 14:48:52 +01:00
fermin831 a8b85d2593 Added missing docs
Former-commit-id: 807c7466b60e4c8ecb77fb8d94102300e9bcd780
2019-02-01 13:53:22 +01:00
fermin831 315a51c5e7 Added only read selector global notification setup
Former-commit-id: bd6262cda30c0bb5a63b106e6c3832efbcfc63b9
2019-02-01 13:46:58 +01:00
Alejandro Gallardo Escobar d38236091b Format fixes
Former-commit-id: 58823652a8bda566d0b0e340a1249abb4f7f219e
2019-02-01 09:55:29 +01:00
artica 62461525e8 Auto-updated build strings.
Former-commit-id: 899c65040831974e16b76b37348dea7d428a7af3
2019-02-01 00:01:36 +01:00
fermin831 1c0a5ca247 Added pospone select (fixme)
Former-commit-id: 428b4424a15ef54c4d95a2eb4af07a334366577a
2019-01-31 20:11:43 +01:00
fermin831 75eaa875c9 Added checkboxes to notifications global configuration
Former-commit-id: 79df159f003292dfef697773fe8daa25b77f04c2
2019-01-31 19:43:13 +01:00
fermin831 01bc0775bc Added notification global configuration (only enable and disable)
Former-commit-id: 850d4dd1d8e30fc66623308b8ab148eaeadb5015
2019-01-31 19:13:51 +01:00
fermin831 b589826c86 Added HTML switch element
Former-commit-id: 426557a47577fd9b5b2002ed02d70f1effb92162
2019-01-31 19:11:59 +01:00
fermin831 95f3c063a5 Added tnotification_source_group_user table
Former-commit-id: e1b542a76ceb0e80f49904c16a98e44c14fff1ff
2019-01-31 16:27:55 +01:00
fermin831 397f2964da Added messages notification ball
Former-commit-id: c44a99cf63bc7451890389e4d234fd8aa7b62cbc
2019-01-31 15:16:56 +01:00