* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
pandoradb.sql: Removed some indexes that caused deadlocks on high
load scenarios.
* godmode/setup/setup_general.php,
include/functions_config.php: Added support for event storm
protection.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7557 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/styles/jquery-ui-1.10.0.custom.css,
include/styles/images/ui-*,
include/javascript/jquery.jquery-ui-1.10.0.custom.js,
include/javascript/jquery-1.9.0.js: added the last version of
jquery and jqueryUI.
* godmode/reporting/visual_console_builder.editor.js,
include/ajax/events.php, include/functions_events.php,
include/functions_reporting.php,
include/javascript/pandora_events.js,
include/javascript/jquery.scrollTo.js,
include/javascript/jquery.tablesorter.pager.js,
include/javascript/jquery.tablesorter.js, include/functions_ui.php,
extensions/update_manager/lib/functions.php,
extensions/update_manager/main.php, extensions/agents_alerts.php,
operation/events/events.php, general/login_page.php,
general/logoff.php, general/header.php,
general/login_help_dialog.php: fixes about the new jquery and
jqueryUI version.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7554 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/estado_generalagente.php,
include/functions_graph.php, include/graphs/functions_flot.php,
include/graphs/fgraph.php, include/graphs/flot/pandora.flot.js:
fixed the graph of events, now the pie graphs in "flot mode" has
a parammeter to force the position of legend.
Fixes: #3602206
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7553 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/modificar_agente.php: fixed the menu to showing
in the link to view agent.
* operation/agentes/estado_monitores.php: cleaned source code style.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7551 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Fixed help popups to
be used from metaconsole too
* godmode/events/event_responses.editor.php: Added
a little help tip in the windows type of event
responses editor
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7548 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: fixed the lost columns in the
item general and added what "agent-module(op)" is the max and min
and added in the resume the units.
Fixes: #3602208
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7545 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* general/shortcut_bar.php, godmode/alerts/alert_actions.php,
godmode/category/edit_category.php, include/functions_reports.php,
include/db/postgresql.php, include/functions_gis.php,
include/functions_treeview.php,
include/functions_network_components.php: improved the code style.
* include/javascript/pandora.js: in function
"agent_changed_by_multiple_agents" added hook for to call any
function when loaded the module list. (now used in the wizzard
of reports in enterprise).
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7540 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_treeview.php
operation/tree.php: Added module info table to the
tree view and fix the hash of instances when is in
metaconsole mode
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7539 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: fixed the calculate the min,
max and avg of exception item and show the operation column.
Fixes: #3602229
* godmode/reporting/reporting_builder.item_editor.php: fixed lost
vars from the metaconsole that makes PHP notices.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7537 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* ggodmode/massive/massive_operations.php,
godmode/massive/massive_edit_modules.php: fixed the form editor for
modules, now set the strings instruction for the unknown, warning
and critical, set only for the selected modules (instead the all
modules the bug).
Fixes: #3602361
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7536 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Modified the alerts default data to
have basic wizard access by default
* godmode/alerts/configure_alert_template.php: Modify the
alert templates form to define wizard access only in metaconsole
and nowizard or respect the current value from the normal console
* include/javascript/jquery.pandora.js: Add a hack to
the license modal window to use it from metaconsole too
* operation/events/events.build_table.php
operation/events/events_list.php
operation/events/events.php: Encapsulate the table build
of the events list to reuse it from other views like tactical
view in metaconsole
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7535 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_networkmap.php,
operation/agentes/networkmap.topology.php,
operation/agentes/networkmap.groups.php: fixed the lost parameter
in the generation of networkmap with a text filter.
Fixes: #3602233
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7532 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/help/ja/help_events_replication.php,
include/help/ja/help_events_history.php: Added new help files.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7530 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/help/ja/help_alert_macros.php: Changed description for
_event_id_ macro to make easier to read.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7528 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map_editor.php: fixed the default value
for the period in the data item.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7526 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_netflow.php,
operation/reporting/reporting_xml.php: fixed to show netflow data
in the XML report.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7525 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.postgreSQL.sql, pandoradb.oracle.sql, pandoradb.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: changed in the
table "tlayout_data" the field "label" to text without limits.
* godmode/extensions.php, include/functions_tags.php,
include/functions_ui.php, include/functions_agents.php,
include/functions_config.php: cleaned source code style.
* godmode/reporting/visual_console_builder.editor.js,
godmode/reporting/visual_console_builder.editor.php,
include/styles/pandora.css, include/styles/pandora_legacy.css,
include/functions_visual_map.php,
include/ajax/visual_console_builder.ajax.php,
include/functions_visual_map_editor.php: added the formatted label
into the item label with the help of tiny_mce.
* include/javascript/tiny_mce/*: update the last version of
tiny_mce.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7524 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/auth/mysql.php: Fixed update of the last password
change when edit a user in the classic way
* godmode/users/configure_user.php
godmode/modules/manage_network_components_form_common.php
godmode/modules/manage_network_components.php: Fix wizard
level and metaconsole access default values when charge to
keep data of items created with metaconsole from the standard
console
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7523 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/help/en/help_alert_macros.php,
include/help/es/help_alert_macros.php,
include/help/ja/help_alert_macros.php: Added the new _event_id_ macro
to help files.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7522 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Updated
the user, module and components tables to have nowizard value
by default (to normal console) and basic in default elements
creation (to metaconsole)
* godmode/users/configure_user.php: Updated the metaconsole
access control in user form to be showed only in metaconsole
and with only basic/advanced options for the new meta concept
* include/config_process.php: Store the metaconsole access
of the current user in $config
* operation/tree.php: Fixed pandora instances links from
tree in metaconsole mode
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7521 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/setup_netflow.php,
operation/netflow/nf_live_view.php,
include/functions_config.php: Added support for disabling custom
filters in the netflow live viewer.
* include/functions_graph.php: Added min, max and avg values to
unaggregated netflow charts.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7518 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_tags.php: Fix a empty value return
to array() to avoid foreach problems
* index.php: Redirect to metaconsole when activate it
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7517 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_users.php
godmode/groups/configure_group.php: fixed a problem retrieving
the groups to the combo of set group parent
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7515 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php
include/help/en/help_events_replication.php
include/help/en/help_module_interval.php
include/help/en/help_events_history.php
include/help/es/help_events_replication.php
include/help/es/help_events_history.php
operation/events/events.php: Fixed bug #3599448 of
setup javascript error.
Added help documents to events history and events
replication. Typo fix in other help document
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7506 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_rss.php
operation/events/export_csv.php
operation/events/events_list.php
operation/events/events.php
operation/events/events.build_query.php: Fixed tag filters in
event view and other filter elements missed in the csv and rss
tools. Merged from 4.0.3
Now the code of query conditions for events is common for
all of the pages where is retrieved
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7505 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Fixed cache control for
avoid send each time static contents. 0 is "always"
instead "never" :-S
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7494 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php
images/books.png
godmode/reporting/reporting_builder.item_editor.php: Adapt
the reports item of events to metaconsole, add a new
image to history events and fix little bugs in events list
as parameters pass in pagination
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7491 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/ajax/events.php
include/functions_graph.php
include/functions_events.php
include/javascript/pandora_events.js
include/functions_config.php
operation/events/events_list.php
operation/events/events.php: Create a new
event visor to metaconsole history events
* include/functions_api.php: Added a new API function
to create netflow filters
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7483 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions.php
include/constants.php
operation/events/events_list.php: Added two new
criticity modes in the event filter. Critical or warning
and not normal
* operation/menu.php: Delete the metaconsole menu enterprise call
from operation menu
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7473 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map.php: Now modules with warning
status and alert fired are in yellow with orange border, before
they were red with orange border.
* include/constants.php: Mew constant for visual map to
identify modules with warning status and alerts fired.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/db/postgresql.php
include/db/mysql.php
include/db/oracle.php: Fixed function get_system_time when
timesource is system.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7470 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/alert_list.list.php
godmode/alerts/alert_list.php: Fix ACLs bug of AD flag
and aesthetic issues
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* images/skin/skin_default/include/styles/pandora.css: Fixed small
bug in default skin css.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php
include/functions.php
operation/agentes/alerts_status.php
operation/agentes/estado_agente.php
godmode/agentes/module_manager.php
godmode/agentes/modificar_agente.php
godmode/agentes/configurar_agente.php
godmode/menu.php
godmode/alerts/alert_list.list.php
godmode/alerts/alert_list.php: Added checks to new flag AD
in godmode views for agents, modules and alerts. Clean
some old extra_sql (policy acls) code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_component_groups.php
godmode/modules/manage_network_components.php: Don't remove
parent component groups with childs assigned to components.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/local_components.postgreSQL.sql,
extras/local_components.mysql.sql,
extras/local_components.oracle.sql: Create new sql script to
add new network components and groups by yourself if something
fails.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added network
components and groups to migration script.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Added network
components and groups to migration script.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/setup_netflow.php: Fixed a string.
* include/functions_config.php,
operation/menu.php,
godmode/menu.php: Added support for the log viewer.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_component_groups.php
godmode/modules/manage_network_components.php
godmode/modules/manage_nc_groups.php: Added tree format for
component groups and make more restrictive filters in local/network
components.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7440 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Ported new network componentes and groups
to oracle and postgres.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php
include/functions_agents.php
include/functions_tags.php
operation/tree.php
operation/agentes/status_monitor.php
operation/agentes/alerts_status.php
operation/agentes/estado_ultimopaquete.php
operation/agentes/estado_agente.php
operation/agentes/status_events.php
operation/agentes/estado_monitores.php
operation/agentes/tactical.php
operation/agentes/group_view.php
operation/agentes/networkmap.php
operation/events/events_list.php
general/logon_ok.php
godmode/agentes/module_manager.php
godmode/alerts/alert_list.list.php: Add tags acl checks to modules
and alerts view. Add warn messages to zones with status counts when the
user has acl tags assigned
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
include/functions_config.php
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql
godmode/setup/performance.php: Max recommended number of files in
attachment directory parametrized.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_networkmap.php: Fixed entity problem in
networkmap and hided agents without alerts if "only module with
alerts" option enabled.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.php,
godmode/reporting/reporting_builder.item_editor.php,
godmode/agentes/agent_manager.php, include/functions_events.php,
include/functions_reporting.php: added the option "no validaded" in
the items for events.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/constants.php: added the default weight for unknown status
for agent, module or service in the services.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php: Changed constraint in agent creation
about the interval (now only greater than zero).
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql:
Add profile tags to the database structure
* include/ajax/events.php
include/functions.php
include/functions_events.php
include/functions_reporting.php
include/functions_treeview.php
include/functions_profile.php
include/constants.php
include/functions_tags.php
operation/tree.php
operation/users/user_edit.php
operation/events/events_list.php
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql
godmode/users/configure_user.php: Add new acl control with
tags in events and tree views. Fix a lot of little bugs like ACLs
in tree view (tags mode), add the tags mode on tree view of the normal
console, pass the ACL flag to some forgotten functions, etc.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions.php: Fixed that the console sometimes shows
negative timestamp (e.g. '-2 sec') when using 'comparison in
roll-over' format. Merged from 4.0.x.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager.php: Fixed a problem with link to module
library because in trunk version there is an additional field to search
modules.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.php: Added a default cover
for PDF reports.
include/help/ja/help_reporting_advanced_tab.php,
include/help/en/help_reporting_advanced_tab.php,
include/help/es/help_reporting_advanced_tab.php: Documented new macro
called REPORT_NAME
MERGED FROM 4.0.3
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager.php: Added a link to module library
in create module view.
MERGED FROM 4.0.3
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/graph_builder.php: Fixed bug that
unspecified graph name was displayed in the header line
when creating a new custom graph. Merged from branch 4.0.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/help/en/help_alert_macros.php
include/help/es/help_alert_macros.php: Added macro _email_tag_
to these help screens.
* include/functions_reports.php: Added exception to templates when
report types are displayed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/resource_registration.php,
extensions/resource_exportation.php,
operation/events/event_statistics.php,
operation/events/events_list.php,
operation/reporting/reporting_viewer.php,
godmode/reporting/reporting_builder.php,
godmode/reporting/reporting_builder.item_editor.php,
include/functions_alerts.php, include/functions_reports.php,
include/functions_events.php, include/graphs/fgraph.php,
include/functions_graph.php, include/styles/pandora.css,
include/functions_reporting.php, include/functions_agents.php: a lot
of changes and fixes from the branch for the reports.
MERGED FROM PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* general/logon_ok.php: Fixed typo. (fixed a bug that the
number of "Alerts defined" at Pandora Main Page showed always "-")
Merged from branch 4.0.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7335 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/agent_template.php,
godmode/agentes/configurar_agente.php,
godmode/agentes/module_manager.php,
include/functions_modules.php: Implemented a real not-init status.
Small fixes.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7325 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/tree.php
operation/events/events_list.php
operation/events/events.php
godmode/events/event_edit_filter.php
godmode/events/event_responses.list.php
godmode/events/custom_events.php
godmode/events/events.php
godmode/events/event_filter.php
godmode/events/event_responses.editor.php: Fix several links
in events manager for metaconsole (things like pure parameter)
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7318 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/ajax/events.php
include/functions_events.php
include/javascript/pandora_events.js: Adapt responses
to metaconsole connection (retrieving of event address macro)
and set format to tags in event view
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7317 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_groups.php: Added missed translation of
All group name
* operation/events/events_list.php: Added compatibility on groups
filter in events for metaconsole.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7316 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/ajax/agent.php
include/functions_ui.php
include/constants.php
operation/events/events_list.php: Modify the event list
filter to adapt the agent search to metaconsole.
Fix little bug of autocomplete control too
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7314 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/module_groups.php: Fixed view, colors in cells were
bad printed and alert popup also had sql errors.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7310 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php
godmode/events/custom_events.php: Fixed
a couple of bugs of style and event viewer
normal
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7301 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php: Resize URL item report to make it
taller.
Merged from branches.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7300 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php: Fixed a typo (have a small
meaning for localization). Merged from branch 4.x
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/alert_list.php,
godmode/alerts/configure_alert_template.php,
godmode/alerts/alert_templates.php,
godmode/alerts/alert_list.builder.php,
operation/messages/message_edit.php, include/functions_api.php,
operation/reporting/reporting_xml.php,
godmode/reporting/graph_builder.graph_editor.php: cleaned source
code style.
* include/functions_io.php: improved the function "__" for to hook
the translations from metaconsole.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7292 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/file_manager.php, include/functions_filemanager.php:
some fixes and added support for the metaconsole.
* include/get_file.php: fixed lost check "is_user".
* operation/netflow/nf_live_view.php: cleaned source code style.
* include/functions_config.php: added check the flag of "is_admin"
when try to change some config from setup.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/javascript/pandora.js: fixed lost var id_server.
* operation/agentes/ver_agente.php: fixed call of get modules for
to get modules.
* godmode/reporting/visual_console_builder.php: fixed lost var.
* godmode/reporting/visual_console_builder.editor.js: fixed check
the var metaconsole in firefox.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7281 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_config.php: Changed parameter names of
some replication event options of the setup
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7279 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php,
operation/netflow/nf_live_view.php: Fixes to the metaconsole part of
the viewer.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7276 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.list_items.php: Fixed the
modules/agents shown in the table of report items in inventory
kind
merged from 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7271 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_visual_map_editor.php: increased the size of
agent autocomplete widget.
* include/functions_visual_map.php: in the function
"visual_map_print_visual_map" changed for to print corretly the
urls in public view in metaconsole.
* include/ajax/agent.php: restore the search for any string in
the autocomplete agent.
* operation/reporting/reporting_xml.php,
operation/search_results.php,
operation/visual_console/public_console.php,
godmode/setup/setup_auth.php, godmode/servers/modificar_server.php:
cleaned source code style.
* godmode/reporting/visual_console_builder.editor.js: fixed when
finish a resize action or put the grid, before these actions
was make a corrupt data of items.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7269 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql,
include/functions_config.php,
include/functions_netflow.php,
operation/netflow/nf_live_view.php,
pandoradb.data.postgreSQL.sql,
pandoradb.data.oracle.sql,
godmode/setup/setup_netflow.php: Added the maximum netflow chart
resolution to the setup. Added byte and byteperseconds units.
Small improvements.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7268 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor.php: Fixed a bug only
for the Enterprise version. When 'Remote Configuration' is
enabled and you try to create new module, which name includes
meta characters, you will get the error "The field name and
name in module_name in data configuration are different."
Merged from branch 4.x.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7263 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_netflow.php: Added a new way of retrieving netflow
data using multiple calls to nfdump that vastly improves the
performance of netfow data charts.
* operation/netflow/nf_live_view.php: Check that the nfdump binary
exists.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7260 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_html.php
include/functions.php
include/functions_config.php
godmode/setup/setup_visuals.php: Add interval values
configuration into visual setup and limit the
advanced control of interval combos only for
administrators
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7259 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql, pandoradb.sql,
pandoradb.postgreSQL.sql, pandoradb.oracle.sql: in the table
"tlayout_data" added the column "id_metaconsole" for to show
visualmaps in the metaconsole.
* operation/visual_console/render_view.php,
include/functions_visual_map.php, operation/agentes/ver_agente.php,
godmode/reporting/visual_console_builder.wizard.php,
godmode/reporting/visual_console_builder.php,
godmode/reporting/visual_console_builder.data.php,
godmode/reporting/visual_console_builder.editor.js,
godmode/reporting/visual_console_builder.elements.php,
godmode/reporting/visual_console_builder.editor.php,
godmode/reporting/map_builder.php,
include/ajax/visual_console_builder.ajax.php,
include/ajax/agent.php, include/functions_visual_map_editor.php,
* operation/agentes/datos_agente.php,
include/functions_netflow.php: cleaned source code style.
* include/functions_ui.php: in function
"ui_require_javascript_file_enterprise" fixed when need a
enterprise javascript instead metaconsole enterprise path.
* include/javascript/pandora.js: fixed the function
"agent_changed_by_multiple_agents" that needs in the metaconsole.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7258 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_groups.php: Fixed propagate parameter in
function groups_get_parent.
* extensions/update_manager.php: Check UM is installed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7256 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_network_components.php: Improve
network component retrieving to get the category name too
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7255 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/module_manager_editor_common.php
godmode/agentes/module_manager_editor.php: Fix tags and
latest fields on web modules editor
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql: Replaced ^---.. comments with "-- -.." to avoid problems
with MySQL 5.0.x
* include/config_process.php: Fixed some problems with default timezone, because
config function was called before timezone was setup.
* include/styles/pandora.css: Added new style for netflow report render (HTML).
* include/functions_netflow.php: Replaced some code for use new CSS styles.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7243 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
Ported new feature (Command Snapshot) from 4.0.3 code.
* include/javascript/pandora.js: Added new javascript function
to open a generic URL with custom width / height.
* operation/agentes/snapshot_view.php: New feature for command
snapshot rendering.
* operation/agentes/datos_agente.php,
operation/agentes/estado_monitores.php: Changes for new feature
command snapshot monitoring.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7242 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php, include/functions_html.php,
include/functions_netflow.php: cleaned source code style.
* include/db/mysql.php: fixed into the function
"mysql_db_process_sql" a big bug that runs fine the select querys in
a metaconsole enviorement with several DBs but the insert querys
make in the previous connection.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7235 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql,
include/functions_config.php,
include/functions_netflow.php,
operation/netflow/nf_live_view.php,
pandoradb.data.postgreSQL.sql,
pandoradb.data.oracle.sql,
godmode/setup/setup_netflow.php,
godmode/netflow/nf_edit_form.php: Performance improvements. Use csv
output to avoid using regular expressions. Removed byte, flow and
packet unit and added kilobyte, megabyte, kilobytes per second and
megabytes per second.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7232 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/lib/libupdate_manager_client.php,
extensions/update_manager/lib/libupdate_manager.php,
operation/agentes/ver_agente.php,
operation/agentes/status_monitor.php,
operation/agentes/estado_ultimopaquete.php,
operation/agentes/estado_agente.php,
operation/integria_incidents/incident.php,
operation/reporting/reporting_xml.php,
godmode/reporting/visual_console_builder.editor.js,
godmode/reporting/visual_console_builder.wizard.php,
godmode/reporting/visual_console_builder.elements.php,
include/functions_visual_map.php,
include/functions_visual_map_editor.php: uploaded the changes of
source code style previous to my next commit for to make the next
commit more easy.
* godmode/reporting/visual_console_builder.php: set empty string
for the new visualmap.
* include/ajax/visual_console_builder.ajax.php: fixed the regular
expresion to extract the url for the graph.
* include/functions_html.php: fixed into the function
"html_print_select_groups" lost code for to show the selectbox.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/dbmanager.php
godmode/servers/recon_script.php: Comment missed check_referer
calls to disable it by the moment
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7226 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/reporting/reporting_builder.php,
godmode/reporting/map_builder.php,
godmode/reporting/visual_console_builder.php,
godmode/reporting/visual_console_builder.data.php,
include/functions_visual_map_editor.php,
operation/reporting/reporting_xml.php,
operation/agentes/exportdata.excel.php,
operation/agentes/ver_agente.php,
operation/agentes/status_monitor.php,
operation/agentes/alerts_status.php,
operation/agentes/exportdata.csv.php: uploaded the changes of source
code style previous to my next commit for to make the next commit
more easy.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Added meta_num_elements token in tconfig
to support metaconsole views with a lot of elements.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7222 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_html.php: Use "autocomplete=off" in all
password fields (this is re-apply of rev5823, that was
dropped at rev6607). Merged from branch 4.x.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7215 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/setup/setup.php: Changed not to depend on DateTimeZone
constants with timezone setting to support php 5.2.x.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7213 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_treeview.php,
include/config_process.php,
operation/tree.php,
godmode/setup/setup.php: Manually defined DateTimeZone constants
since they don't seem to be available in certain PHP versions.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7202 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/netflow/nf_live_view.php
godmode/netflow/nf_edit_form.php
godmode/netflow/nf_edit.php: Pass the parameter pure
to keep full screen
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php
include/functions_graph.php
include/functions_reporting.php
include/functions_networkmap.php
operation/reporting/reporting_viewer.php
godmode/reporting/reporting_builder.php: Fix a lot of bugs of reports and
networkmap like foreach problems and filter issues
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7199 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_groups.php,
include/functions_treeview.php,
include/functions_os.php,
include/functions_tags.php,
operation/tree.php: Small fixes to the treeview.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7195 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_treeview.php,
operation/tree.php: Added support for agent and module navigation
from the metaconsole.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7193 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php
operation/reporting/reporting_viewer.php: Fix some bugs of
reports on metaconsole
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7191 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive/massive_delete_modules.php: Fixed a bug
on massive delete modules due of a copypaste
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7186 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_agents.php
include/functions_networkmap.php
operation/agentes/status_monitor.php
operation/netflow/nf_live_view.php: Improve the
performance of networkmap with the new status counts.
Modify some common code between console and metaconsole
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7185 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_groups.php,
include/functions_agents.php,
include/functions_treeview.php,
include/functions_os.php,
include/functions_tags.php,
operation/tree.php: Added metaconsole support to the tree view.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7184 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/integria_incidents/incident.php: Fixed a bug in integration
between Integria and Pandora on Incident management.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7179 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extensions/update_manager/load_updatemanager.php,
extensions/update_manager/debug.php: fixed the execution of keygen
when there is some wrong in the execution the message for user is
more clean now show "Error in execution the keygen." instead the
message "Error Server authorisation rejected". And added other forms
to get debugData for the update.
MERGED FROM THE BRANCH PANDORA_4.0
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7176 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/integria_incidents/incident.list.php: Fixed a problem with
incident search, in incident integrated with Integria.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7169 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/integria_incidents/incident.php: Fixed an error printing messages
which appear before the header.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7161 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/integria_incidents/incident.list.php,
operation/integria_incidents/incident.incident.php,
operation/integria_incidents/incident.php,
operation/integria_incidents/incident.files.php,
operation/integria_incidents/incident.workunits.php: Fixed several errors
in behavior, added messages about operation result and added style to buttons.
MERGED FROM 4.0.2
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7160 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/planned_downtime.editor.php: Allowed to change
type of planned downtime while it's not active.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7153 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_modules.php,
pandoradb.sql,
pandoradb.postgreSQL.sql,
pandoradb.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
godmode/agentes/agent_template.php,
godmode/agentes/module_manager.php,
godmode/agentes/agent_manager.php: Added support for server-side
module status calculation.
* godmode/agentes/configurar_agente.php: Show 'None' when no server is
selected for an agent.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7148 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events.php, include/functions_tags.php: cleaned
source code style.
* godmode/events/event_edit_filter.php: fixed the lost vars in
the javascript code for the none elements in the tag select widgets.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7138 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_graph.php
include/graphs/pChart/pData.class.php
include/functions_reporting.php
include/constants.php: Improve performance to the SLA
report items, added unknown periods and fix planned downtimes
in SLAs. Adapt the default pchart graph engine colors to pandora
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7136 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* index.php: cleaned source code style.
* pandoradb.sql, pandoradb.postgreSQL.sql, pandoradb.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql: added the field
"tag_with" and "tag_without", and removed the field "tags" in the
table "tevent_filter".
* operation/events/events_list.php,
godmode/events/event_edit_filter.php: added widgets for to filter
the events by tags with the events or and tags without the
events.
* include/functions_tags.php: cleaned source code style, and
clarifity the function "tags_search_tag".
* include/functions_html.php: into the function
"html_print_input_hidden" fixed when the value have double quotes or
single quotes.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_command.php, index.php: cleaned
source code style.
* godmode/alerts/alert_commands.php: fixed the check the name of
command that it did not make the update the data.
MERGED FROM THE BRANCH PANDORA_4.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7134 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql,
pandoradb.postgreSQL.sql,
pandoradb.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added a new
column to tagente_estado to store possible errors.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7132 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/events/events_list.php: fixed the lost tag span (with
styles) in the Event description.
* operation/events/events.php: fixed the default value for id_agent
set 0 (as All) in the filter of events.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7131 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: improved the function
"ui_print_agent_autocomplete_input" to get the default value for
"hidden_input_idagent_value" from the GET or POST instead to set
as 0.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7130 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* operation/agentes/status_monitor.php: improved the page status
monitor, show in another column the tags and added a select box with
the tags in user in the filter form.
Pending task: #3581578
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7124 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/planned_downtime.editor.php: Fixed that time range
of once planned downtime cannot be changed.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7123 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/planned_downtime.list.php: Improved to show time
range of periodically planned downtime.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7122 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_reporting.php, extensions/update_manager.php:
cleaned source code style.
* include/functions_ui.php: fixed or improved the function
"ui_print_agent_autocomplete_input" for to get the data when the
user stop to typing and lost the focus this widget.
Fixes: #3573762
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7120 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/help/ja/help_alert_fields_description.php,
include/help/ja/help_alert_fields_values.php: Added new help files.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7118 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql
pandoradb.data.postgreSQL.sql
pandoradb.data.oracle.sql: Changed the default data
of alert commands to fields customization
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7117 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/javascript/pandora_alerts.js
godmode/alerts/configure_alert_action.php: Fix some bugs in
the action form (jquery headache)
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7116 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f