* include/javascript/jquery.ui.datepicker.js, include/javascript/jquery.js,
include/javascript/jquery.ui.core.js,
include/javascript/tiny_mce/tiny_mce_popup.js,
include/javascript/OpenLayers/OpenLayers.js,
include/javascript/jquery.ui.resizable.js,
include/javascript/jquery.timeentry.js: : delete unpacked source code of js.
* include/functions_alerts.php: added header comment to function
"create_alert_action".
* godmode/alerts/alert_list.php: fixed the return status for message status
in actions "delete_alert", "add_action" and "delete_action".
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3477 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive/massive_enable_disable_alerts.php: Improved template
selection to be selected more than one. Added agent selection. (It can
also be selected more than one.)
* godmode/include/functions_alerts.php: Added a argument, $id_agents
array, to get_agents_with_alert_template(). It is used to select
specific agents in the function.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3426 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/massive/massive_add_action_alerts.php,
godmode/massive/massive_delete_action_alerts.php: Fixed
addition/deletion for compound alerts does not work.
* include/functions_alerts.php: To fix above problem, added a function,
delete_alert_compound_action().
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3264 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_events.php
pandoradb.sql
extras/pandoradb_migrate_v3.1_to_v3.2.sql
operation/events/events_validate.php
operation/events/events_list.php
operation/events/events.php: Deleted several
columns from the events view and adding a
show/hide advanced fields feature.
Added a new state 'in process' to validation
and an input comment when a status is changed.
* include/fgraph.php: Fixed quotes
in constant definition
* include/functions_ui.php
include/functions_agents.php
include/functions_alerts.php
operation/agentes/alerts_status.php
operation/agentes/alerts_status.functions.php
images/bell_pause.png
godmode/alerts/alert_list.list.php
godmode/alerts/alert_list.php
godmode/massive/massive_operations.php
godmode/massive/massive_standby_alerts.php: Added
the feature of set and set off on standby an alert
in the alets management and view if an alert is in
standby in the rest of views.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3251 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb_data.sql: added default value for "sound_alert",
"sound_critical" and "sound_warning" into table "tconfig".
* include/functions_config.php: in function "update_config" added to
update sounds.
* include/functions_alerts.php: added function "get_event_status_group" for
scan the events.
* operation/events/sound_events.php: added first version of event sound
window.
* operation/events/events.php: added the request for ajax of sound event
window.
* images/pause.button.png, images/ok.button.png,images/music_note.png,
images/play.button.png: added images for sound event window and button in
the head of events.
* godmode/setup/setup.php: added source code for to config the sounds of
events.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3219 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: Fixed a typo bug for show
the message of succefully copied when you clone an alert action
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3116 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: Alert information now show the default
actions properly,and the action conditions (max/min).
* include/functions_alerts.php: Added support on get_alert_templates_types
for new alert type "onchange".
* pandoradb.sql,
extras/pandoradb_migrate_v3.0_to_v3.1.sql: Added new support for alert
type "onchange".
* godmode/alerts/alert_list.php: Alert information now shows the default
action (if exist) and have a link to edit the template directly from here.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_ui.php: fix bug that show SQL error message and don't
show the actions for compound alerts.
* include/functions_alerts.php: in function "get_alert_agent_module_actions"
add the parameter compound for search compound actions.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2241 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: fix the select box of correlation alerts,
now it has the XOR operation.
Fixes: 2849260
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2150 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: fix deletion of compound alerts in the
function "delete_alert_agent_module".
Fixes: 2902618
* godmode/agentes/configurar_agente.php: use the "delete_alert_agent_module"
instead the sql method.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2145 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: add more values into function
"get_alert_template_threshold_values", values as 1 week, 2 weeks, 1 month
and 6 months.
* godmode/alerts/configure_alert_template.php: change the default value
to 1 day.
Fixes: 2902458
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2135 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandora_console/include/functions_events.php: fix the insert event,
before Pandora console inserted timestamp as string timestamp, now Pandora
console insert the event with clean and numeric unix timestamp.
* pandora_console/include/functions_alerts.php: cleanup the sourcecode.
Fixes: 2854087
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1952 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: Added get_agents_with_alert_template().
Added extra filter to delete_alert_agent_module().
* godmode/agentes/massive_delete_alerts.php: Completely changed the way it
works. Fixes#2707976.
* images/mod_keepalive.png: Replaced with tango icon.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1694 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/funtions_ui.php: Added get_full_url(). Some changes in
get_url_refresh() to make it more powerful. The URL is now optional
in pagination(). It's also possible to give the parameter name
of the offset so there could be more than one paginations now.
* operation/agentes/estado_agente.php,
general/header.php: Changes in get_url_refresh().
* godmode/agentes/massive_operations.php: Changed edit icon.
* godmode/agentes/module_manager.php: Enterprise API changes.
* godmode/agentes/module_manager_editor_network.php: Style corrections.
* include/styles/pandora.css: Added conf_error class to textarea
elements.
* include/functions.php: Added index_array(). Useful to manage database
results.
* include/functions_alerts.php: Cast some values to integer.
* operation/agentes/alerts_status.php: Removed offset parameters,
used default value.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1678 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* extras/pandoradb_migrate_v2.x_to_v3.0.sql: Removed id on tconfig
inserts.
* godmode/agentes/configurar_agente.php: Min and max module values
were not being updated.
* godmode/alerts/configure_alert_template.php: Removed duplicated
example. Added support for next warning and critical template types.
* include/functions_ui.php, include/functions_alerts.php: Added new
alert template types.
* include/functions_db.php: temp_sql_delete() moved out of
delete_agent() because there were errors if it was calling more than
once.
* include/functions_reports.php: Fixed doc for get_reports().
* include/config_process.php: Updated build number.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1589 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: Finished the alerts API by removing
useless and focus of problems clean_*(). All the functions now uses
process_sql_*().
* godmode/alerts/alert_actions.php,
godmode/alerts/alert_commands.php: Adapted to changes in
functions_alerts.php.
* godmode/alerts/configure_alert_template.php: Fixed default action
updating when it's set to None. Fixed textarea height.
* include/functions_reports.php: Added to repository. API to manage
user reports.
* include/functions_db.php: Moved get_reports() to
functions_reports.php. Escape ` on get_db_value(). Use
format_array_to_update_sql() on process_sql_update().
* godmode/reporting/reporting_builder.php: Use functions from reports
API.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1560 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_compound.php: Fixed clean up div for
variable width styles. Min and max fire values commented because it's
not implemented yet.
* include/config_process.php: Keep database connection resource in
config.
* include/functions.php: Use mysql_real_escape_string(), replacing
deprecated function.
* include/functions_alerts.php: Updated to use process_sql_*
functions. Many fixes done such as updating a template name or
escaping the value when duplicating a template.
* include/functions_ui.php: Fixed an error on refresh header when
using other web servers like Cherokee.
* operation/agentes/estado_agente.php: Style corrections.
* reporting/fgraph.php: Fixed a typo on grafico_db_agentes_paquetes().
* pandora_db.sql, extras/pandoradb_migrate_v2.x_to_v3.0.sql: Added
foreign key on treport_content and id field on
talert_compound_actions.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1555 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/massive_edit_modules.php: The module selection is
now done using cascade selects instead of having a confusing tree on
the select.
* godmode/alerts/alert_list.php: Fixed a bug when getting the latest
module value.
* godmode/alerts/alert_templates.php: Fixed an error that didn't allow
deletion on some cases. Added an option to duplicate a template
easily.
* godmode/alerts/configure_alert_template.php: Added template
duplication support. Fixed a mismatch on field1, field2 and field3
which required to have a default action to be updated. This values are
not loaded anymore from default action.
* godmode/db/db_purge.php: Many styles correction. Use pandora
functions for the bottom table.
* include/functions_alerts.php: Added duplicate_alert_template().
* include/functions_db.php: Added a parameter to get_agent_modules()
to enable or disable the return of indexed values.
* operation/agentes/sla_view.php: Style correction.
* operation/agentes/ver_agente.php: Added support for indexed flag on
get_agent_modules_json AJAX operation.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1553 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_db.php: Fixed a bug in
format_array_to_where_clause_sql() when only offset and limit where
given. A new parameter was added to solve it, so the behaviour is a
bit different now (take a look to the doc examples). Changes were also
done in other functions to reflect this new situation.
* include/functions_alerts.php, include/functions_modules.php: Updated
to changes in format_array_to_where_clause_sql()
* include/functions_ui.php: Added a class to each link of the
paginator. Style correction.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1479 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/alert_manager.php: Removed from repository. Agent
alerts manager is now done in alerts/alert_list.php
* godmode/agentes/manage_config.php, godmode/alerts/configure_alert,
godmode/agentes/configurar_agente.php: Use alerts/alert_list.php
instead of deleted agentes/alert_manager.php.
* godmode/alerts/alert_list.php: It can handle now a list of agents or
be included by configurar_agente. Now it's a single page to manage all
the alerts defined in agents.
* godmode/reporting/map_builder.php: Javascript style correction.
* include/javascript/jquery.pandora.controls.js: Added
pandoraSelectAgent which allows the loading of a module list from an
agent list.
* include/styles/pandora.css: Styles for alert_list.
* include/functions_agents.php: Added options to
get_agent_alerts_compound() and get_agent_alerts_simple() to add extra
user filtering.
* pandoradb.sql, pandoradb_migrate_20_to_21.sql,
include/functions_alerts.php: Actions in an alert module has now id or
they cannot be removed.
* include/functions_db.php: format_array_to_where_clause_sql() can now
get limit and offset values.
* include/functions_html.php: Removed select- prefix to print_select
elements because it was breaking javascript code. Needs more works on
that.
* operation/agentes/estado_agente.php: Added
get_agent_module_last_value AJAX operation.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/javascript/jquery.pandora.controls.js: Added to repository.
New file to hold all common jQuery Pandora operations. Currently it
holds a generic process to loads a list of agents from a group
dropdown menu.
* godmode/agentes/manage_config.php: Loading spinners moved next to
the label because it was causing some ugly flickers due to 100%
width elements. Use code from jquery.pandora.controls.js.
* godmode/alerts/alert_compounds.php: Rewritten to be more user
friendly. Filtering is now possible. New operations like
enable/disable or delete are now available.
* include/styles/pandora.css: Added style for alert_compounds.php.
* include/functions.php: Make offset parameter optional in
pagination(). Style correction.
* include/functions_alerts.php: Added delete_alert_compound().
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/alert_manager.php: Moved AJAX interface for
get_agent_alerts_simple operation here.
* godmode/agentes/manage_config.php: Complete rewritten to give
support to new alert system and a new improved UI.
* godmode/alerts/configure_alert_compound.php: Removed AJAX code
relative to groups and agents. Include jQuery and style files with the
new way.
* godmode/groups/group_list.php: Moved AJAX interface for
get_group_agents operation here.
* include/styles/pandora.css: Added styling for new manage config
interface. Added style for fieldset elements.
* include/functions_alerts.php: Added filter parameter to
get_alerts_agent_module(). Added
copy_alert_agent_module_to_agent_module().
* include/functions_db.php: Added special character * to
get_agent_modules() to get all the row. Added
format_array_to_where_clause_sql() to transform an array of values to
a WHERE clause. Use this function in process_sql_update().
* include/functions_modules.php: Added to repository. New file to add
modules operation functions. Added copy_agent_module_to_agent()
* operation/agentes/ver_agente.php: AJAX interface for
get_agent_modules_json can now receive an additional filter.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_compound.php: Added support to
update alert elements. Also default operator for first element is NOP.
* include/functions_alerts.php: Added delete_alert_compound_elements().
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* general/main_menu.php, include/styles/menu.css: Selected menu style
is done with a CSS classs. Slide effect removed. Submenus have now
white background.
* godmode/agentes/alert_manager.php: Allow creation of alerts without
actions which have sense in compound alerts.
* include/javascript/jquery.pandora.js: Added showMessage() function.
* godmode/agentes/module_manager_editor.php: Use new showMessage()
jQuery function.
* godmode/alerts/configure_alert_compound.php: Added to repository.
New compound alert editor interface.
* godmode/alerts/alert_compounds.php: Added to repository. Compound
alert list.
* godmode/alerts/configure_alert_template.php: Better style for steps
of the editor.
* godmode/menu.php: Added compound alerts option. Changed default page
on Manage alerts.
* include/styles/pandora.css: Added style for editor steps. Added new
generic classes.
* include/functions.php: Added a new line when creating script list.
* include/functions_agents.php: Fixed alert tables fields. Renamed
get_agent_alerts_compound() and improved the returning value of
get_agent_alerts().
* include/functions_alerts.php: Added new functions to manage compound
alerts. Avoid SQL errors when using process_sql functions.
* include/functions_reporting.php: Temporary disabled compound alert
reports.
* include/functions_ui.php: Fixed format_alert_row() to fit compound
alerts.
* operation/agentes/alerts_status.php: Allow compound alert
validation. Removed effect of cluetip.
* pandoradb.sql, pandoradb_migrate_20_to_21.sql: New compound alert
tables (talert_compound, talert_compound_elements and
talert_compound_actions).
* godmode/alerts/alert_list.php: Added to repository. Shows a list of
all the alerts defined. Would be improved in the future to allow
sorting and filtering.
* index.php, godmode/snmpconsole/snmp_alert.php,
include/functions_db.php: Code style correction.
* godmode/agentes/configurar_agente.php: Removed old compound alerts
code
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1443 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/alert_manager.php: Added support to disable or
enable an alert. Improved a bit the interface to make it cleaner
because the modules are a bit separated now.
* include/functions_alerts.php: Added support to disable or enable an
alert via set_alerts_agent_module_disable(). Added a flag to choose
wether to get disabled alerts on an agent or not.
* ChangeLog: Style correction again. Please, be careful.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/alert_manager.php: Added the hability to delete
actions and alert (only when it has no actions).
* include/functions_alerts.php: Added delete_alert_agent_module() and
delete_alert_agent_module_action().
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_template.php,
include/functions_alerts.php: Added missing matches_value field on
creation and updating.
* ChangeLog: Added missing path to files on previous commit.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1376 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* pandoradb.sql: Added new field to talert_templates to specify if the
alert should fire when on match or mismatch of the values.
* general/header.php: Fixed the columns width. Added a control when
the autorefresh is clicked so the user can select the refresh time. A
countdown is also shown when the page is set to refresh.
* godmode/alerts/configure_alert_template.php: Control the new flag on
templates. Added an explanation to explain when the alert is going to
fire.
* include/javascript/jquery.js: Updated to v1.3. It promise to be
quicker in a lot of situations.
* include/javascript/jquery.countdown.js: Updated to latest version.
* include/styles/pandora.css: Fixed duplicated input.ok. Style
correction. Added invisible class and a style for alert templates
page.
* include/functions_alerts.php: Fixed a notice error on
clean_alert_template_values().
* operation/visual_console/render_view.php: Removed jquery inclusion
because it's already done in the index page.
* general/main_menu.php: Do not add refr if it's zero.
* index.php: Avoid the recursive addition of 1=1 when autorefresh is
set.
* pandoradb_migrate_20_to_21.sql: Added new fields on the tables.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1350 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_template.php: The steps are now
available as soon as the alert is created.
* include/functions_alerts.php: Added validate_alert_agent_module().
* include/functions_db.php: Removed deprecated
process_alerts_validate(). Improved process_sql_update() to add
a row selection parameter, the documentation and a bit fix when
joining the fields with a coma.
* operation/agentes/alerts_status.php: Use new functions to validate
an alert.
* operation/agentes/ver_agente.php: Removed validation alert codes
since it doesn't belong here.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1346 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/alerts/configure_alert_template.php: Max and min alerts
were ignored.
* include/functions_alerts.php: Ensure the max and min alert values
order.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1345 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/styles/menu.css: Changed the z-index property of the menu
which was overlapped in some cases.
* include/functions.php: format_alert_row() moved to functions_ui.php
* include/functions_ui.php: Added format_alert_row() from function.php
* include/functions_agents.php: Added to repository.
* include/functions_alerts.php: Added new functions
get_alerts_agent_module_disabled(),
set_alerts_agent_module_force_execution(),
get_alerts_agent_module_last_fired().
* include/functions_db.php, operation/agentes/estado_agente.php,
operation/agentes/networkmap.php: Style correction.
* include/functions_reporting.php: Use new functions_agent.php. Added
a bit of documentation and style correction.
* godmode/alerts/alert_templates.php: Improved a bit the template
tooltip.
* operation/agentes/alerts_status.php: Added to repository. New
interface to list agent alerts.
* operation/agentes/estado_alertas.php: Removed from repository.
Replaced by alert_status.php.
* operation/agentes/ver_agente.php: Removed flag_alert code snippet.
Use new files added. Style correction.
* operation/menu.php: Old files references replaced by new ones.
* index.php: Removed build and pandora version references.
* pandoradb.sql: Removed useless module_type field in
talert_templates.
* pandoradb_migrate_20_to_21.sql: Removed duplicate fields addition.
Fixed some warnings. Added custom_id field to tagente. Style
correction.
* include/config_process.php: Updated build version.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1344 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* include/functions_alerts.php: Removed debug output. Show no SQL
error on delete_alert_* functions.
* index.php: Added missing jQuery script.
* godmode/alerts/alert_templates.php: Added a missing br. Show "empty"
string if no value was set.
* godmode/alerts/alert_commands.php: Added a check to avoid internal
commands removal.
* pandoradb.sql: Removed talerta table.
* pandoradb_data.sql: Data from talerta moved to talert_commands.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1332 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
* godmode/agentes/alert_manager.php: Complete rewritten of the alert
system when assigned alerts to an agent.
* pandoradb.sql: New tables for alert system. These are:
talert_commands, talert_actions, talert_templates,
talert_template_modules, talert_template_module_actions. No migration
tool is available yet.
* godmode/alerts/configure_alert_template.php,
godmode/alerts/configure_alert_action.php,
godmode/alerts/alert_templates.php,
godmode/alerts/configure_alert_command.php,
godmode/alerts/alert_actions.php: Added to repository. Administration
interface to new alert system.
* godmode/alerts/modify_alert.php: Deleted from repository.
* godmode/setup/setup.php: Added an example of the date format. Main
table has now percentage width.
* godmode/menu.php, operation/menu.php: Added new alert options.
Removed refr value when it's not neccesary.
* include/styles/pandora.css: Added width to textarea elements. Style
correction and cleanup. Tables doesn't have a odd-even pattern, but
the hovered row now changes its colour. New styles for alert pages.
* include/functions_custom_graphs.php: Added to repository. custom
graphs functions moved here.
* include/functions_incidents.php, include/functions_events.php: Moved
to LGPL. Style comment corrections.
* include/functions_html.php: Documentation style correction. Added
print_input_file() and print_label().
* include/functions_ui.php: Doc style correction.
* operation/reporting/graph_viewer.php: Include new function file with
custom graphs. Use generic functions.
* index.php: Unset pass from POST and REQUEST arrays.
* include/functions_db.php: Some documentation updated to new format.
Added format_array_to_update_sql() to generate SQL sentences for
updates. Style correction.
* godmode/agentes/configurar_agente.php: Variables renamed to have a
meaning.
* extensions/update_manager/main.php: Mark an string translatable.
* extensions/update_manager/lib/libupdate_manager_client.php,
godmode/alerts/configure_alert.php, include/functions.php,
godmode/agentes/module_manager.php, operation/agentes/networkmap.php,
operation/reporting/reporting_viewer.php,
godmode/agentes/manage_config.php: Style correction.
git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@1331 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
mdtrooper
jsatoh
zarzuelo
slerena