diff --git a/pandora_console/include/class/ConsoleSupervisor.php b/pandora_console/include/class/ConsoleSupervisor.php index 107b13e5c7..a4267706ce 100644 --- a/pandora_console/include/class/ConsoleSupervisor.php +++ b/pandora_console/include/class/ConsoleSupervisor.php @@ -444,7 +444,7 @@ class ConsoleSupervisor 'send_email_user', [ $user['id_user'], - io_safe_output($notification['mensaje']).'

'.ui_get_full_url($notification['url']), + io_safe_output($notification['mensaje']).'

'.$notification['url'], io_safe_output($notification['subject']), ] ); @@ -478,7 +478,7 @@ class ConsoleSupervisor 'send_email_group', [ $group['id_group'], - io_safe_output($notification['mensaje']).'

'.ui_get_full_url($notification['url']), + io_safe_output($notification['mensaje']).'

'.$notification['url'], io_safe_output($notification['subject']), null, $blacklist, @@ -689,9 +689,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.LICENSE_EXPIRATION', - 'title' => __('License is going to expire.'), + 'title' => __('License is about to expire'), 'message' => __( - 'Your license is going to expire in %d days. Please contact sales.', + 'Your license will expire in %d days. Please, contact our sales department.', $days_to_expiry ), 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/license', @@ -702,8 +702,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.LICENSE.EXPIRATION', - 'title' => __('License is expired.'), - 'message' => __('Your license has expired. Please contact sales.'), + 'title' => __('Expired license'), + 'message' => __('Your license has expired. Please, contact our sales department.'), 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/license', ] ); @@ -776,9 +776,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.WRITABLE.ATTACHMENT', - 'title' => __('Attachment directory is not writable.'), + 'title' => __('Attachment directory is not writable'), 'message' => __( - 'Directory %s is not writable. Please configure proper permissions.', + 'Directory %s is not writable. Please, configure corresponding permissions.', $config['attachment_store'] ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', @@ -798,9 +798,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.FILES.ATTACHMENT', - 'title' => __('There are too much files in attachment directory.'), + 'title' => __('There are too many files in attachment directory'), 'message' => __( - 'There are more than %d files in attachment, you should consider cleaning up your attachment directory manually.', + 'There are more than %d files in attachment, consider cleaning up attachment directory manually.', $config['num_files_attachment'] ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', @@ -830,9 +830,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PERMISSIONS.REMOTE_CONFIG', - 'title' => __('Remote configuration directory is not readable.'), + 'title' => __('Remote configuration directory is not readable'), 'message' => __( - 'Remote configuration directory %s is not readable. Please configure it.', + 'Remote configuration directory %s is not readable. Please, adjust configuration.', $config['remote_config'] ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', @@ -849,9 +849,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PERMISSIONS.REMOTE_CONFIG.CONF', - 'title' => __('Remote configuration directory is not writable.'), + 'title' => __('Remote configuration directory is not writable'), 'message' => __( - 'Remote configuration directory %s is not writable. Please configure it.', + 'Remote configuration directory %s is not writable. Please, adjust configuration.', $config['remote_config'].'/conf' ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', @@ -867,9 +867,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PERMISSIONS.REMOTE_CONFIG.COLLECTIONS', - 'title' => __('Remote collections directory is not writable.'), + 'title' => __('Remote collections directory is not writable'), 'message' => __( - 'Collections directory %s is not writable. Please configure it.', + 'Collections directory %s is not writable. Please, adjust configuration.', $config['remote_config'].'/collections' ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', @@ -885,9 +885,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PERMISSIONS.REMOTE_CONFIG.MD5', - 'title' => __('Remote md5 directory is not writable.'), + 'title' => __('Remote md5 directory is not writable'), 'message' => __( - 'MD5 directory %s is not writable. Please configure it.', + 'MD5 directory %s is not writable. Please, adjust configuration.', $config['remote_config'].'/md5' ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=general', @@ -917,7 +917,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.FILES.DATAIN', 'title' => __('There are too much files in spool').'.', 'message' => __( - 'There are more than %d files in %s, you should consider checking DataServer performance', + 'There are more than %d files in %s. Consider checking DataServer performance', $MAX_FILES_DATA_IN, $config['remote_config'] ), @@ -938,9 +938,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.FILES.DATAIN.BADXML', - 'title' => __('There are too much BADXML files in spool.'), + 'title' => __('There are too many BADXML files in spool'), 'message' => __( - 'There are more than %d files in %s, you should consider checking software agents.', + 'There are more than %d files in %s. Consider checking software agents.', $MAX_BADXML_FILES_DATA_IN, $config['remote_config'] ), @@ -1012,7 +1012,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.SERVER.QUEUE.'.$key, 'title' => __( - '%s (%s) performance is being lacked.', + '%s (%s) is lacking performance.', servers_get_server_string_name($type), $queue['name'] ), @@ -1079,12 +1079,10 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.SERVER.STATUS', 'title' => __('No servers available.'), - 'message' => __('There are no servers registered in this console, please check installation guide.'), + 'message' => __('There are no servers registered in this console. Please, check installation guide.'), 'url' => $url, ] ); - - return; } // At this point there's no servers with issues. @@ -1096,25 +1094,25 @@ class ConsoleSupervisor if ($server['status'] == 1) { // Fatal error. Component has die. $msg = __( - '%s (%s) crashed.', + '%s (%s) has crashed.', servers_get_server_string_name($server['server_type']), $server['name'] ); $description = __( - '%s (%s) has died, please check log files', + '%s (%s) has crashed, please check log files.', servers_get_server_string_name($server['server_type']), $server['name'] ); } else { // Non-fatal error. Controlated exit. Component is not running. $msg = __( - '%s (%s) is stopped.', + '%s (%s) is not running.', servers_get_server_string_name($server['server_type']), $server['name'] ); $description = __( - '%s (%s) is stopped, please check configuration file or remove this server from server list.', + '%s (%s) is not running. Please, check configuration file or remove this server from server list.', servers_get_server_string_name($server['server_type']), $server['name'] ); @@ -1165,7 +1163,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.SERVER.MASTER', 'title' => __('No master servers found.'), - 'message' => __('You should define at last one server to run as master, please check documentation.'), + 'message' => __('At least one server must be defined to run as master. Please, check documentation.'), 'url' => $url, ] ); @@ -1209,8 +1207,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PHP.SAFE_MODE', - 'title' => __('PHP safe mode is enabled. Some features may not properly work.'), - 'message' => __('To disable, change it on your PHP configuration file (php.ini) and put safe_mode = Off (Dont forget restart apache process after changes)'), + 'title' => __('PHP safe mode is enabled. Some features may not work properly'), + 'message' => __('To disable it, go to your PHP configuration file (php.ini) and put safe_mode = Off (Do not forget to restart apache process after changes)'), 'url' => 'index.php', ] ); @@ -1223,13 +1221,13 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.PHP.INPUT_TIME', 'title' => sprintf( - __("Not recommended '%s' value in PHP configuration"), + __("'%s' value in PHP configuration is not recommended"), 'max_input_time' ), 'message' => sprintf( __('Recommended value is %s'), '-1 ('.__('Unlimited').')' - ).'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), + ).'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Do not forget to restart Apache process after)'), 'url' => 'index.php', ] ); @@ -1298,8 +1296,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PHP.DISABLE_FUNCTIONS', - 'title' => __('Problems with disable functions in PHP.INI'), - 'message' => __('Variable disable_functions containts functions system() or exec(), in PHP configuration file (php.ini)').'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), + 'title' => __('Problems with disable_functions in php.ini'), + 'message' => __('The variable disable_functions contains functions system() or exec() in PHP configuration file (php.ini)').'

'.__('Please, change it on your PHP configuration file (php.ini) or contact with administrator (Dont forget restart apache process after changes)'), 'url' => 'index.php', ] ); @@ -1316,8 +1314,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PHP.PHANTOMJS', - 'title' => __('phantomjs is not installed'), - 'message' => __('To be able to create images of the graphs for PDFs, please install the phantom.js extension. For that, it is necessary to follow these steps:'), + 'title' => __('PhantomJS is not installed'), + 'message' => __('To be able to create images of the graphs for PDFs, please install the PhantomJS extension. For that, it is necessary to follow these steps:'), 'url' => $url, ] ); @@ -1377,7 +1375,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.HISTORYDB', 'title' => __('Historical database not available'), - 'message' => __('Historical database is enabled. But not available using given configuration. Please check it.'), + 'message' => __('Historical database is enabled, though not accessible with the current configuration.'), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=hist_db', ] ); @@ -1420,9 +1418,9 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.PANDORADB', - 'title' => __('Database maintance problem'), + 'title' => __('Database maintenance problem'), 'message' => __( - 'Your database is not maintained correctly. It seems that more than 48hrs have passed without proper maintenance. Please review documents of %s on how to perform this maintenance process (DB Tool) and enable it as soon as possible.', + 'Your database hasn\'t been through maintenance for 48hrs. Please, check documentation on how to perform this maintenance process on %s and enable it as soon as possible.', io_safe_output(get_product_name()) ), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', @@ -1482,9 +1480,9 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.PANDORADB.HISTORY', 'title' => __( - 'Historical database maintance problem.' + 'Historical database maintenance problem.' ), - 'message' => __('Your historical database is not being maintained correctly. It seems that more than 48hrs have passed without proper maintenance. Please review documents of %s on how to perform this maintenance process (DB Tool) and enable it as soon as possible.', get_product_name()), + 'message' => __('Your historical database hasn\'t been through maintenance for 48hrs. Please, check documentation on how to perform this maintenance process on %s and enable it as soon as possible.', get_product_name()), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=perf', ] ); @@ -1522,8 +1520,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.HISTORYDB.MR', - 'title' => __('Historical database MR missmatch'), - 'message' => __('Your historical database is not using the same schema of main DB. This could produce anomalyes while storing historical data.'), + 'title' => __('Historical database MR mismatch'), + 'message' => __('Your historical database is not using the same schema as the main DB. This could produce anomalies while storing historical data.'), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=hist_db', ] ); @@ -1565,7 +1563,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.EXT.ELASTICSEARCH', 'title' => __('Log collector cannot connect to ElasticSearch'), - 'message' => __('ElasticSearch is not available using current configuration. Please check it.'), + 'message' => __('ElasticSearch is not available using current configuration.'), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=log', ] ); @@ -1635,7 +1633,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.METACONSOLE.DB_CONNECTION', 'title' => __('Metaconsole DB is not available.'), - 'message' => __('Cannot connect with Metaconsole DB using stored configuration. Please check it.'), + 'message' => __('Cannot connect with Metaconsole DB using current configuration.'), 'url' => 'index.php?sec=general&sec2=godmode/setup/setup§ion=enterprise', ] ); @@ -1664,7 +1662,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.DOWNTIME', 'title' => __('Scheduled downtime running.'), - 'message' => __('A scheduled downtime is running. Some monitorization data won\'t be available while downtime is taking place.'), + 'message' => __('A scheduled downtime is running. Some monitoring data won\'t be available while downtime is taking place.'), 'url' => 'index.php?sec=gagente&sec2=godmode/agentes/planned_downtime.list', ] ); @@ -1822,7 +1820,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.DOWNTIME', 'title' => __('Downtime scheduled soon.'), 'message' => __( - 'A scheduled downtime is going to be executed from %s to %s. Some monitorization data won\'t be available while downtime is taking place.', + 'A scheduled downtime is going to be executed from %s to %s. Some monitoring data won\'t be available while downtime is taking place.', date('M j, G:i:s ', $next_downtime_begin), date('M j, G:i:s ', $next_downtime_end) ), @@ -1858,7 +1856,7 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.UPDATEMANAGER.REGISTRATION', - 'title' => __('This instance is not registered in the Update manager'), + 'title' => __('This instance is not registered in the Update manager section'), 'message' => __('Click here to start the registration process'), 'url' => 'javascript: force_run_register();', ] @@ -1897,7 +1895,7 @@ class ConsoleSupervisor [ 'type' => 'NOTIF.NEWSLETTER.SUBSCRIPTION', 'title' => __('Not subscribed to the newsletter'), - 'message' => __('Click here to start the newsletter subscription process'), + 'message' => __('Click here to subscribe to the newsletter'), 'url' => 'javascript: force_run_newsletter();', ] ); @@ -1929,8 +1927,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.SECURITY.DEFAULT_PASSWORD', - 'title' => __('Default password for "Admin" user has not been changed.'), - 'message' => __('Please change the default password because is a common vulnerability reported.'), + 'title' => __('Default password for "Admin" user has not been changed'), + 'message' => __('Please, change the default password since it is a commonly reported vulnerability.'), 'url' => 'index.php?sec=gusuarios&sec2=godmode/users/user_list', ] ); @@ -1955,8 +1953,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.MISC.FONTPATH', - 'title' => __('Default font doesnt exist'), - 'message' => __('Your defined font doesnt exist or is not defined. Please check font parameters in your config'), + 'title' => __('Default font doesn\'t exist'), + 'message' => __('Your defined font doesn\'t exist or is not defined. Please, check font parameters in your config'), 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=vis', ] ); @@ -1981,7 +1979,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.MISC.DEVELOPBYPASS', 'title' => __('Developer mode is enabled'), 'message' => __( - 'Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production system. This value is written in the main index.php file', + 'Your %s has the "develop_bypass" mode enabled. This is a developer mode and should be disabled in a production environment. This value is located in the main index.php file', get_product_name() ), 'url' => 'index.php', @@ -2005,8 +2003,8 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.MISC.EVENTSTORMPROTECTION', - 'title' => __('Event storm protection is activated.'), - 'message' => __('You need to restart server after altering this configuration setting. No events will be generated during this mode.'), + 'title' => __('Event storm protection is enabled.'), + 'message' => __('Some events may get lost while this mode is enabled. The server must be restarted after altering this setting.'), 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=general', ] ); @@ -2032,7 +2030,7 @@ class ConsoleSupervisor $this->notify( [ 'type' => 'NOTIF.UPDATEMANAGER.OPENSETUP', - 'title' => __('Error, first setup "Open update".'), + 'title' => __('Failed to retrieve updates, please configure utility'), 'message' => $message, 'url' => 'index.php?sec=gsetup&sec2=godmode/setup/setup§ion=general', ] @@ -2089,7 +2087,7 @@ class ConsoleSupervisor 'type' => 'NOTIF.UPDATEMANAGER.MINOR', 'title' => __('Minor release/s available'), 'message' => __( - 'There are one or more minor releases waiting for update. .About minor release update.', + 'There is one or more minor releases available. .About minor release update.', $url ), 'url' => $url, @@ -2115,9 +2113,9 @@ class ConsoleSupervisor if ($config['cron_last_run'] == 0 || (get_system_time() - $config['cron_last_run']) > 3600 ) { - $message_conf_cron = __('DiscoveryConsoleTasks is not running properly.').' '; + $message_conf_cron = __('DiscoveryConsoleTasks is not running properly'); if (strtoupper(substr(PHP_OS, 0, 3)) != 'WIN') { - $message_conf_cron .= __('Discovery relies on a proper setup of cron, the time-based scheduling service'); + $message_conf_cron .= __('Discovery relies on an appropriate cron setup.'); $message_conf_cron .= '. '.__('Please, add the following line to your crontab file:'); $message_conf_cron .= '
* * * * * <user> wget -q -O - --no-check-certificate ';
                 $message_conf_cron .= str_replace(
@@ -2133,7 +2131,7 @@ class ConsoleSupervisor
             if (isset($config['cron_last_run']) === true) {
                 $message_conf_cron .= __('Last execution').': ';
                 $message_conf_cron .= date('Y/m/d H:i:s', $config['cron_last_run']);
-                $message_conf_cron .= __('Please check process is no locked.');
+                $message_conf_cron .= __('Please, make sure process is not locked.');
             }
 
             $this->notify(