diff --git a/libraries/classes/Server/Status/Monitor.php b/libraries/classes/Server/Status/Monitor.php
new file mode 100644
index 0000000000..513007c01f
--- /dev/null
+++ b/libraries/classes/Server/Status/Monitor.php
@@ -0,0 +1,827 @@
+';
+ $retval .= '';
+ $retval .= '
';
+
+ $retval .= '';
+
+ return $retval;
+ }
+
+ /**
+ * Returns html for Analyse Dialog
+ *
+ * @return string
+ */
+ public static function getHtmlForAnalyseDialog()
+ {
+ $retval = '';
+ $retval .= '
' . __('Selected time range:');
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Only retrieve SELECT,INSERT,UPDATE and DELETE Statements');
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Remove variable data in INSERT statements for better grouping');
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= __(
+ 'Choose from which log you want the statistics to be generated from.'
+ );
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Results are grouped by query text.');
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __(
+ 'The phpMyAdmin Monitor can assist you in optimizing the server'
+ . ' configuration and track down time intensive queries. For the latter you'
+ . ' will need to set log_output to \'TABLE\' and have either the'
+ . ' slow_query_log or general_log enabled. Note however, that the'
+ . ' general_log produces a lot of data and increases server load'
+ . ' by up to 15%.'
+ );
+
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Using the monitor:');
+ $retval .= ' ';
+ $retval .= __(
+ 'Your browser will refresh all displayed charts in a regular interval.'
+ . ' You may add charts and change the refresh rate under \'Settings\','
+ . ' or remove any chart using the cog icon on each respective chart.'
+ );
+ $retval .= '
';
+ $retval .= __(
+ 'To display queries from the logs, select the relevant time span on any'
+ . ' chart by holding down the left mouse button and panning over the'
+ . ' chart. Once confirmed, this will load a table of grouped queries,'
+ . ' there you may click on any occurring SELECT statements to further'
+ . ' analyze them.'
+ );
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= Util::getImage('s_attention.png');
+ $retval .= '';
+ $retval .= __('Please note:');
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
' . __('Preset chart') . ' ';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Status variable(s)');
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '
' . __('Select series:') . ' ';
+ $retval .= '
';
+ $retval .= '' . __('Commonly monitored') . ' ';
+ $retval .= 'Processes ';
+ $retval .= 'Questions ';
+ $retval .= 'Connections ';
+ $retval .= 'Bytes_sent ';
+ $retval .= 'Bytes_received ';
+ $retval .= 'Threads_connected ';
+ $retval .= 'Created_tmp_disk_tables ';
+ $retval .= 'Handler_read_first ';
+ $retval .= 'Innodb_buffer_pool_wait_free ';
+ $retval .= 'Key_reads ';
+ $retval .= 'Open_tables ';
+ $retval .= 'Select_full_join ';
+ $retval .= 'Slow_queries ';
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= __('or type variable name:');
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Display as differential value');
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '
' . __('Apply a divisor') . ' ';
+ $retval .= '
';
+ $retval .= '' . __('KiB') . ' , ';
+ $retval .= '' . __('MiB') . ' )';
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= __('Append unit to data values');
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '' . __('Add this series') . ' ';
+ $retval .= ' | ' . __('Clear series') . ' ';
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= __('Series in chart:');
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '' . __('None') . ' ';
+ $retval .= ' ';
+ $retval .= '
';
+ $retval .= '
';
+ $retval .= '
';
+ $links .= Util::showMySQLDocu('general-thread-states');
+ $links .= '
';
+ $links .= '';
+ $links .= Util::showMySQLDocu('explain-output');
+ $links .= '
';
+
+ return $form . $links;
+ }
+
+ /***************************Ajax request function***********************************/
+
+ /**
+ * Returns JSon for real-time charting data
+ *
+ * @return array
+ */
+ public static function getJsonForChartingData()
+ {
+ $ret = json_decode($_REQUEST['requiredData'], true);
+ $statusVars = array();
+ $serverVars = array();
+ $sysinfo = $cpuload = $memory = 0;
+
+ /* Accumulate all required variables and data */
+ list($serverVars, $statusVars, $ret) = self::getJsonForChartingDataGet(
+ $ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
+ );
+
+ // Retrieve all required status variables
+ if (count($statusVars)) {
+ $statusVarValues = $GLOBALS['dbi']->fetchResult(
+ "SHOW GLOBAL STATUS WHERE Variable_name='"
+ . implode("' OR Variable_name='", $statusVars) . "'",
+ 0,
+ 1
+ );
+ } else {
+ $statusVarValues = array();
+ }
+
+ // Retrieve all required server variables
+ if (count($serverVars)) {
+ $serverVarValues = $GLOBALS['dbi']->fetchResult(
+ "SHOW GLOBAL VARIABLES WHERE Variable_name='"
+ . implode("' OR Variable_name='", $serverVars) . "'",
+ 0,
+ 1
+ );
+ } else {
+ $serverVarValues = array();
+ }
+
+ // ...and now assign them
+ $ret = self::getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues);
+
+ $ret['x'] = microtime(true) * 1000;
+ return $ret;
+ }
+
+ /**
+ * Assign the variables for real-time charting data
+ *
+ * @param array $ret Real-time charting data
+ * @param array $statusVarValues Status variable values
+ * @param array $serverVarValues Server variable values
+ *
+ * @return array
+ */
+ public static function getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues)
+ {
+ foreach ($ret as $chart_id => $chartNodes) {
+ foreach ($chartNodes as $node_id => $nodeDataPoints) {
+ foreach ($nodeDataPoints as $point_id => $dataPoint) {
+ switch ($dataPoint['type']) {
+ case 'statusvar':
+ $ret[$chart_id][$node_id][$point_id]['value']
+ = $statusVarValues[$dataPoint['name']];
+ break;
+ case 'servervar':
+ $ret[$chart_id][$node_id][$point_id]['value']
+ = $serverVarValues[$dataPoint['name']];
+ break;
+ }
+ }
+ }
+ }
+ return $ret;
+ }
+
+ /**
+ * Get called to get JSON for charting data
+ *
+ * @param array $ret Real-time charting data
+ * @param array $serverVars Server variable values
+ * @param array $statusVars Status variable values
+ * @param mixed $sysinfo System info
+ * @param mixed $cpuload CPU load
+ * @param mixed $memory Memory
+ *
+ * @return array
+ */
+ public static function getJsonForChartingDataGet(
+ $ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
+ ) {
+ // For each chart
+ foreach ($ret as $chart_id => $chartNodes) {
+ // For each data series
+ foreach ($chartNodes as $node_id => $nodeDataPoints) {
+ // For each data point in the series (usually just 1)
+ foreach ($nodeDataPoints as $point_id => $dataPoint) {
+ list($serverVars, $statusVars, $ret[$chart_id][$node_id][$point_id])
+ = self::getJsonForChartingDataSwitch(
+ $dataPoint['type'], $dataPoint['name'], $serverVars,
+ $statusVars, $ret[$chart_id][$node_id][$point_id],
+ $sysinfo, $cpuload, $memory
+ );
+ } /* foreach */
+ } /* foreach */
+ }
+ return array($serverVars, $statusVars, $ret);
+ }
+
+ /**
+ * Switch called to get JSON for charting data
+ *
+ * @param string $type Type
+ * @param string $pName Name
+ * @param array $serverVars Server variable values
+ * @param array $statusVars Status variable values
+ * @param array $ret Real-time charting data
+ * @param mixed $sysinfo System info
+ * @param mixed $cpuload CPU load
+ * @param mixed $memory Memory
+ *
+ * @return array
+ */
+ public static function getJsonForChartingDataSwitch(
+ $type, $pName, $serverVars, $statusVars, $ret,
+ $sysinfo, $cpuload, $memory
+ ) {
+ switch ($type) {
+ /* We only collect the status and server variables here to
+ * read them all in one query,
+ * and only afterwards assign them.
+ * Also do some white list filtering on the names
+ */
+ case 'servervar':
+ if (!preg_match('/[^a-zA-Z_]+/', $pName)) {
+ $serverVars[] = $pName;
+ }
+ break;
+
+ case 'statusvar':
+ if (!preg_match('/[^a-zA-Z_]+/', $pName)) {
+ $statusVars[] = $pName;
+ }
+ break;
+
+ case 'proc':
+ $result = $GLOBALS['dbi']->query('SHOW PROCESSLIST');
+ $ret['value'] = $GLOBALS['dbi']->numRows($result);
+ break;
+
+ case 'cpu':
+ if (!$sysinfo) {
+ include_once 'libraries/sysinfo.lib.php';
+ $sysinfo = PMA_getSysInfo();
+ }
+ if (!$cpuload) {
+ $cpuload = $sysinfo->loadavg();
+ }
+
+ if (PMA_getSysInfoOs() == 'Linux') {
+ $ret['idle'] = $cpuload['idle'];
+ $ret['busy'] = $cpuload['busy'];
+ } else {
+ $ret['value'] = $cpuload['loadavg'];
+ }
+
+ break;
+
+ case 'memory':
+ if (!$sysinfo) {
+ include_once 'libraries/sysinfo.lib.php';
+ $sysinfo = PMA_getSysInfo();
+ }
+ if (!$memory) {
+ $memory = $sysinfo->memory();
+ }
+
+ $ret['value'] = isset($memory[$pName]) ? $memory[$pName] : 0;
+ break;
+ }
+
+ return array($serverVars, $statusVars, $ret);
+ }
+
+ /**
+ * Returns JSon for log data with type: slow
+ *
+ * @param int $start Unix Time: Start time for query
+ * @param int $end Unix Time: End time for query
+ *
+ * @return array
+ */
+ public static function getJsonForLogDataTypeSlow($start, $end)
+ {
+ $query = 'SELECT start_time, user_host, ';
+ $query .= 'Sec_to_Time(Sum(Time_to_Sec(query_time))) as query_time, ';
+ $query .= 'Sec_to_Time(Sum(Time_to_Sec(lock_time))) as lock_time, ';
+ $query .= 'SUM(rows_sent) AS rows_sent, ';
+ $query .= 'SUM(rows_examined) AS rows_examined, db, sql_text, ';
+ $query .= 'COUNT(sql_text) AS \'#\' ';
+ $query .= 'FROM `mysql`.`slow_log` ';
+ $query .= 'WHERE start_time > FROM_UNIXTIME(' . $start . ') ';
+ $query .= 'AND start_time < FROM_UNIXTIME(' . $end . ') GROUP BY sql_text';
+
+ $result = $GLOBALS['dbi']->tryQuery($query);
+
+ $return = array('rows' => array(), 'sum' => array());
+
+ while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
+ $type = mb_strtolower(
+ mb_substr(
+ $row['sql_text'],
+ 0,
+ mb_strpos($row['sql_text'], ' ')
+ )
+ );
+
+ switch($type) {
+ case 'insert':
+ case 'update':
+ //Cut off big inserts and updates, but append byte count instead
+ if (mb_strlen($row['sql_text']) > 220) {
+ $implode_sql_text = implode(
+ ' ',
+ Util::formatByteDown(
+ mb_strlen($row['sql_text']), 2, 2
+ )
+ );
+ $row['sql_text'] = mb_substr($row['sql_text'], 0, 200)
+ . '... [' . $implode_sql_text . ']';
+ }
+ break;
+ default:
+ break;
+ }
+
+ if (! isset($return['sum'][$type])) {
+ $return['sum'][$type] = 0;
+ }
+ $return['sum'][$type] += $row['#'];
+ $return['rows'][] = $row;
+ }
+
+ $return['sum']['TOTAL'] = array_sum($return['sum']);
+ $return['numRows'] = count($return['rows']);
+
+ $GLOBALS['dbi']->freeResult($result);
+ return $return;
+ }
+
+ /**
+ * Returns JSon for log data with type: general
+ *
+ * @param int $start Unix Time: Start time for query
+ * @param int $end Unix Time: End time for query
+ *
+ * @return array
+ */
+ public static function getJsonForLogDataTypeGeneral($start, $end)
+ {
+ $limitTypes = '';
+ if (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) {
+ $limitTypes
+ = 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ';
+ }
+
+ $query = 'SELECT TIME(event_time) as event_time, user_host, thread_id, ';
+ $query .= 'server_id, argument, count(argument) as \'#\' ';
+ $query .= 'FROM `mysql`.`general_log` ';
+ $query .= 'WHERE command_type=\'Query\' ';
+ $query .= 'AND event_time > FROM_UNIXTIME(' . $start . ') ';
+ $query .= 'AND event_time < FROM_UNIXTIME(' . $end . ') ';
+ $query .= $limitTypes . 'GROUP by argument'; // HAVING count > 1';
+
+ $result = $GLOBALS['dbi']->tryQuery($query);
+
+ $return = array('rows' => array(), 'sum' => array());
+ $insertTables = array();
+ $insertTablesFirst = -1;
+ $i = 0;
+ $removeVars = isset($_REQUEST['removeVariables'])
+ && $_REQUEST['removeVariables'];
+
+ while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
+ preg_match('/^(\w+)\s/', $row['argument'], $match);
+ $type = mb_strtolower($match[1]);
+
+ if (! isset($return['sum'][$type])) {
+ $return['sum'][$type] = 0;
+ }
+ $return['sum'][$type] += $row['#'];
+
+ switch($type) {
+ /** @noinspection PhpMissingBreakStatementInspection */
+ case 'insert':
+ // Group inserts if selected
+ if ($removeVars
+ && preg_match(
+ '/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',
+ $row['argument'], $matches
+ )
+ ) {
+ $insertTables[$matches[2]]++;
+ if ($insertTables[$matches[2]] > 1) {
+ $return['rows'][$insertTablesFirst]['#']
+ = $insertTables[$matches[2]];
+
+ // Add a ... to the end of this query to indicate that
+ // there's been other queries
+ $temp = $return['rows'][$insertTablesFirst]['argument'];
+ $return['rows'][$insertTablesFirst]['argument']
+ .= self::getSuspensionPoints(
+ $temp[strlen($temp) - 1]
+ );
+
+ // Group this value, thus do not add to the result list
+ continue 2;
+ } else {
+ $insertTablesFirst = $i;
+ $insertTables[$matches[2]] += $row['#'] - 1;
+ }
+ }
+ // No break here
+
+ case 'update':
+ // Cut off big inserts and updates,
+ // but append byte count therefor
+ if (mb_strlen($row['argument']) > 220) {
+ $row['argument'] = mb_substr($row['argument'], 0, 200)
+ . '... ['
+ . implode(
+ ' ',
+ Util::formatByteDown(
+ mb_strlen($row['argument']),
+ 2,
+ 2
+ )
+ )
+ . ']';
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ $return['rows'][] = $row;
+ $i++;
+ }
+
+ $return['sum']['TOTAL'] = array_sum($return['sum']);
+ $return['numRows'] = count($return['rows']);
+
+ $GLOBALS['dbi']->freeResult($result);
+
+ return $return;
+ }
+
+ /**
+ * Return suspension points if needed
+ *
+ * @param string $lastChar Last char
+ *
+ * @return null|string Return suspension points if needed
+ */
+ public static function getSuspensionPoints($lastChar)
+ {
+ if ($lastChar != '.') {
+ return '';
- $retval .= '
';
-
- $retval .= '';
-
- return $retval;
-}
-
-/**
- * Returns html for Analyse Dialog
- *
- * @return string
- */
-function PMA_getHtmlForAnalyseDialog()
-{
- $retval = '';
- $retval .= '
' . __('Selected time range:');
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Only retrieve SELECT,INSERT,UPDATE and DELETE Statements');
- $retval .= ' ';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Remove variable data in INSERT statements for better grouping');
- $retval .= ' ';
- $retval .= '
';
- $retval .= __(
- 'Choose from which log you want the statistics to be generated from.'
- );
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Results are grouped by query text.');
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= __(
- 'The phpMyAdmin Monitor can assist you in optimizing the server'
- . ' configuration and track down time intensive queries. For the latter you'
- . ' will need to set log_output to \'TABLE\' and have either the'
- . ' slow_query_log or general_log enabled. Note however, that the'
- . ' general_log produces a lot of data and increases server load'
- . ' by up to 15%.'
- );
-
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Using the monitor:');
- $retval .= ' ';
- $retval .= __(
- 'Your browser will refresh all displayed charts in a regular interval.'
- . ' You may add charts and change the refresh rate under \'Settings\','
- . ' or remove any chart using the cog icon on each respective chart.'
- );
- $retval .= '
';
- $retval .= __(
- 'To display queries from the logs, select the relevant time span on any'
- . ' chart by holding down the left mouse button and panning over the'
- . ' chart. Once confirmed, this will load a table of grouped queries,'
- . ' there you may click on any occurring SELECT statements to further'
- . ' analyze them.'
- );
- $retval .= '
';
- $retval .= '
';
- $retval .= PhpMyAdmin\Util::getImage('s_attention.png');
- $retval .= '';
- $retval .= __('Please note:');
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
' . __('Preset chart') . ' ';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Status variable(s)');
- $retval .= ' ';
- $retval .= '
';
- $retval .= '
' . __('Select series:') . ' ';
- $retval .= '
';
- $retval .= '' . __('Commonly monitored') . ' ';
- $retval .= 'Processes ';
- $retval .= 'Questions ';
- $retval .= 'Connections ';
- $retval .= 'Bytes_sent ';
- $retval .= 'Bytes_received ';
- $retval .= 'Threads_connected ';
- $retval .= 'Created_tmp_disk_tables ';
- $retval .= 'Handler_read_first ';
- $retval .= 'Innodb_buffer_pool_wait_free ';
- $retval .= 'Key_reads ';
- $retval .= 'Open_tables ';
- $retval .= 'Select_full_join ';
- $retval .= 'Slow_queries ';
- $retval .= ' ';
- $retval .= '
';
- $retval .= __('or type variable name:');
- $retval .= ' ';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Display as differential value');
- $retval .= ' ';
- $retval .= '
';
- $retval .= '
' . __('Apply a divisor') . ' ';
- $retval .= '
';
- $retval .= '' . __('KiB') . ' , ';
- $retval .= '' . __('MiB') . ' )';
- $retval .= ' ';
- $retval .= '
';
- $retval .= '
';
- $retval .= __('Append unit to data values');
- $retval .= ' ';
- $retval .= '
';
- $retval .= ' ';
- $retval .= '
';
- $retval .= '' . __('Add this series') . ' ';
- $retval .= ' | ' . __('Clear series') . ' ';
- $retval .= ' ';
- $retval .= '
';
- $retval .= __('Series in chart:');
- $retval .= '
';
- $retval .= '
';
- $retval .= '' . __('None') . ' ';
- $retval .= ' ';
- $retval .= '
';
- $retval .= '
';
- $retval .= '
';
- $links .= PhpMyAdmin\Util::showMySQLDocu('general-thread-states');
- $links .= '
';
- $links .= '';
- $links .= PhpMyAdmin\Util::showMySQLDocu('explain-output');
- $links .= '
';
-
- return $form . $links;
-}
-
-/***************************Ajax request function***********************************/
-
-/**
- * Returns JSon for real-time charting data
- *
- * @return array
- */
-function PMA_getJsonForChartingData()
-{
- $ret = json_decode($_REQUEST['requiredData'], true);
- $statusVars = array();
- $serverVars = array();
- $sysinfo = $cpuload = $memory = 0;
-
- /* Accumulate all required variables and data */
- list($serverVars, $statusVars, $ret) = PMA_getJsonForChartingDataGet(
- $ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
- );
-
- // Retrieve all required status variables
- if (count($statusVars)) {
- $statusVarValues = $GLOBALS['dbi']->fetchResult(
- "SHOW GLOBAL STATUS WHERE Variable_name='"
- . implode("' OR Variable_name='", $statusVars) . "'",
- 0,
- 1
- );
- } else {
- $statusVarValues = array();
- }
-
- // Retrieve all required server variables
- if (count($serverVars)) {
- $serverVarValues = $GLOBALS['dbi']->fetchResult(
- "SHOW GLOBAL VARIABLES WHERE Variable_name='"
- . implode("' OR Variable_name='", $serverVars) . "'",
- 0,
- 1
- );
- } else {
- $serverVarValues = array();
- }
-
- // ...and now assign them
- $ret = PMA_getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues);
-
- $ret['x'] = microtime(true) * 1000;
- return $ret;
-}
-
-/**
- * Assign the variables for real-time charting data
- *
- * @param array $ret Real-time charting data
- * @param array $statusVarValues Status variable values
- * @param array $serverVarValues Server variable values
- *
- * @return array
- */
-function PMA_getJsonForChartingDataSet($ret, $statusVarValues, $serverVarValues)
-{
- foreach ($ret as $chart_id => $chartNodes) {
- foreach ($chartNodes as $node_id => $nodeDataPoints) {
- foreach ($nodeDataPoints as $point_id => $dataPoint) {
- switch ($dataPoint['type']) {
- case 'statusvar':
- $ret[$chart_id][$node_id][$point_id]['value']
- = $statusVarValues[$dataPoint['name']];
- break;
- case 'servervar':
- $ret[$chart_id][$node_id][$point_id]['value']
- = $serverVarValues[$dataPoint['name']];
- break;
- }
- }
- }
- }
- return $ret;
-}
-
-/**
- * Get called to get JSON for charting data
- *
- * @param array $ret Real-time charting data
- * @param array $serverVars Server variable values
- * @param array $statusVars Status variable values
- * @param mixed $sysinfo System info
- * @param mixed $cpuload CPU load
- * @param mixed $memory Memory
- *
- * @return array
- */
-function PMA_getJsonForChartingDataGet(
- $ret, $serverVars, $statusVars, $sysinfo, $cpuload, $memory
-) {
- // For each chart
- foreach ($ret as $chart_id => $chartNodes) {
- // For each data series
- foreach ($chartNodes as $node_id => $nodeDataPoints) {
- // For each data point in the series (usually just 1)
- foreach ($nodeDataPoints as $point_id => $dataPoint) {
- list($serverVars, $statusVars, $ret[$chart_id][$node_id][$point_id])
- = PMA_getJsonForChartingDataSwitch(
- $dataPoint['type'], $dataPoint['name'], $serverVars,
- $statusVars, $ret[$chart_id][$node_id][$point_id],
- $sysinfo, $cpuload, $memory
- );
- } /* foreach */
- } /* foreach */
- }
- return array($serverVars, $statusVars, $ret);
-}
-
-/**
- * Switch called to get JSON for charting data
- *
- * @param string $type Type
- * @param string $pName Name
- * @param array $serverVars Server variable values
- * @param array $statusVars Status variable values
- * @param array $ret Real-time charting data
- * @param mixed $sysinfo System info
- * @param mixed $cpuload CPU load
- * @param mixed $memory Memory
- *
- * @return array
- */
-function PMA_getJsonForChartingDataSwitch(
- $type, $pName, $serverVars, $statusVars, $ret,
- $sysinfo, $cpuload, $memory
-) {
- switch ($type) {
- /* We only collect the status and server variables here to
- * read them all in one query,
- * and only afterwards assign them.
- * Also do some white list filtering on the names
- */
- case 'servervar':
- if (!preg_match('/[^a-zA-Z_]+/', $pName)) {
- $serverVars[] = $pName;
- }
- break;
-
- case 'statusvar':
- if (!preg_match('/[^a-zA-Z_]+/', $pName)) {
- $statusVars[] = $pName;
- }
- break;
-
- case 'proc':
- $result = $GLOBALS['dbi']->query('SHOW PROCESSLIST');
- $ret['value'] = $GLOBALS['dbi']->numRows($result);
- break;
-
- case 'cpu':
- if (!$sysinfo) {
- include_once 'libraries/sysinfo.lib.php';
- $sysinfo = PMA_getSysInfo();
- }
- if (!$cpuload) {
- $cpuload = $sysinfo->loadavg();
- }
-
- if (PMA_getSysInfoOs() == 'Linux') {
- $ret['idle'] = $cpuload['idle'];
- $ret['busy'] = $cpuload['busy'];
- } else {
- $ret['value'] = $cpuload['loadavg'];
- }
-
- break;
-
- case 'memory':
- if (!$sysinfo) {
- include_once 'libraries/sysinfo.lib.php';
- $sysinfo = PMA_getSysInfo();
- }
- if (!$memory) {
- $memory = $sysinfo->memory();
- }
-
- $ret['value'] = isset($memory[$pName]) ? $memory[$pName] : 0;
- break;
- }
-
- return array($serverVars, $statusVars, $ret);
-}
-
-/**
- * Returns JSon for log data with type: slow
- *
- * @param int $start Unix Time: Start time for query
- * @param int $end Unix Time: End time for query
- *
- * @return array
- */
-function PMA_getJsonForLogDataTypeSlow($start, $end)
-{
- $query = 'SELECT start_time, user_host, ';
- $query .= 'Sec_to_Time(Sum(Time_to_Sec(query_time))) as query_time, ';
- $query .= 'Sec_to_Time(Sum(Time_to_Sec(lock_time))) as lock_time, ';
- $query .= 'SUM(rows_sent) AS rows_sent, ';
- $query .= 'SUM(rows_examined) AS rows_examined, db, sql_text, ';
- $query .= 'COUNT(sql_text) AS \'#\' ';
- $query .= 'FROM `mysql`.`slow_log` ';
- $query .= 'WHERE start_time > FROM_UNIXTIME(' . $start . ') ';
- $query .= 'AND start_time < FROM_UNIXTIME(' . $end . ') GROUP BY sql_text';
-
- $result = $GLOBALS['dbi']->tryQuery($query);
-
- $return = array('rows' => array(), 'sum' => array());
-
- while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
- $type = mb_strtolower(
- mb_substr(
- $row['sql_text'],
- 0,
- mb_strpos($row['sql_text'], ' ')
- )
- );
-
- switch($type) {
- case 'insert':
- case 'update':
- //Cut off big inserts and updates, but append byte count instead
- if (mb_strlen($row['sql_text']) > 220) {
- $implode_sql_text = implode(
- ' ',
- PhpMyAdmin\Util::formatByteDown(
- mb_strlen($row['sql_text']), 2, 2
- )
- );
- $row['sql_text'] = mb_substr($row['sql_text'], 0, 200)
- . '... [' . $implode_sql_text . ']';
- }
- break;
- default:
- break;
- }
-
- if (! isset($return['sum'][$type])) {
- $return['sum'][$type] = 0;
- }
- $return['sum'][$type] += $row['#'];
- $return['rows'][] = $row;
- }
-
- $return['sum']['TOTAL'] = array_sum($return['sum']);
- $return['numRows'] = count($return['rows']);
-
- $GLOBALS['dbi']->freeResult($result);
- return $return;
-}
-
-/**
- * Returns JSon for log data with type: general
- *
- * @param int $start Unix Time: Start time for query
- * @param int $end Unix Time: End time for query
- *
- * @return array
- */
-function PMA_getJsonForLogDataTypeGeneral($start, $end)
-{
- $limitTypes = '';
- if (isset($_REQUEST['limitTypes']) && $_REQUEST['limitTypes']) {
- $limitTypes
- = 'AND argument REGEXP \'^(INSERT|SELECT|UPDATE|DELETE)\' ';
- }
-
- $query = 'SELECT TIME(event_time) as event_time, user_host, thread_id, ';
- $query .= 'server_id, argument, count(argument) as \'#\' ';
- $query .= 'FROM `mysql`.`general_log` ';
- $query .= 'WHERE command_type=\'Query\' ';
- $query .= 'AND event_time > FROM_UNIXTIME(' . $start . ') ';
- $query .= 'AND event_time < FROM_UNIXTIME(' . $end . ') ';
- $query .= $limitTypes . 'GROUP by argument'; // HAVING count > 1';
-
- $result = $GLOBALS['dbi']->tryQuery($query);
-
- $return = array('rows' => array(), 'sum' => array());
- $insertTables = array();
- $insertTablesFirst = -1;
- $i = 0;
- $removeVars = isset($_REQUEST['removeVariables'])
- && $_REQUEST['removeVariables'];
-
- while ($row = $GLOBALS['dbi']->fetchAssoc($result)) {
- preg_match('/^(\w+)\s/', $row['argument'], $match);
- $type = mb_strtolower($match[1]);
-
- if (! isset($return['sum'][$type])) {
- $return['sum'][$type] = 0;
- }
- $return['sum'][$type] += $row['#'];
-
- switch($type) {
- /** @noinspection PhpMissingBreakStatementInspection */
- case 'insert':
- // Group inserts if selected
- if ($removeVars
- && preg_match(
- '/^INSERT INTO (`|\'|"|)([^\s\\1]+)\\1/i',
- $row['argument'], $matches
- )
- ) {
- $insertTables[$matches[2]]++;
- if ($insertTables[$matches[2]] > 1) {
- $return['rows'][$insertTablesFirst]['#']
- = $insertTables[$matches[2]];
-
- // Add a ... to the end of this query to indicate that
- // there's been other queries
- $temp = $return['rows'][$insertTablesFirst]['argument'];
- $return['rows'][$insertTablesFirst]['argument']
- .= PMA_getSuspensionPoints(
- $temp[strlen($temp) - 1]
- );
-
- // Group this value, thus do not add to the result list
- continue 2;
- } else {
- $insertTablesFirst = $i;
- $insertTables[$matches[2]] += $row['#'] - 1;
- }
- }
- // No break here
-
- case 'update':
- // Cut off big inserts and updates,
- // but append byte count therefor
- if (mb_strlen($row['argument']) > 220) {
- $row['argument'] = mb_substr($row['argument'], 0, 200)
- . '... ['
- . implode(
- ' ',
- PhpMyAdmin\Util::formatByteDown(
- mb_strlen($row['argument']),
- 2,
- 2
- )
- )
- . ']';
- }
- break;
-
- default:
- break;
- }
-
- $return['rows'][] = $row;
- $i++;
- }
-
- $return['sum']['TOTAL'] = array_sum($return['sum']);
- $return['numRows'] = count($return['rows']);
-
- $GLOBALS['dbi']->freeResult($result);
-
- return $return;
-}
-
-/**
- * Return suspension points if needed
- *
- * @param string $lastChar Last char
- *
- * @return null|string Return suspension points if needed
- */
-function PMA_getSuspensionPoints($lastChar)
-{
- if ($lastChar != '.') {
- return '');
$response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(PMA_getHtmlForMonitor($ServerStatusData));
-$response->addHTML(PMA_getHtmlForClientSideDataAndLinks($ServerStatusData));
+$response->addHTML(Monitor::getHtmlForMonitor($ServerStatusData));
+$response->addHTML(Monitor::getHtmlForClientSideDataAndLinks($ServerStatusData));
$response->addHTML('
');
exit;
diff --git a/test/libraries/PMA_server_status_monitor_test.php b/test/classes/Server/Status/MonitorTest.php
similarity index 89%
rename from test/libraries/PMA_server_status_monitor_test.php
rename to test/classes/Server/Status/MonitorTest.php
index fc55bb61bd..9f78085751 100644
--- a/test/libraries/PMA_server_status_monitor_test.php
+++ b/test/classes/Server/Status/MonitorTest.php
@@ -1,25 +1,23 @@
ServerStatusData);
+ $html = Monitor::getHtmlForMonitor($this->ServerStatusData);
- //validate 1: PMA_getHtmlForTabLinks
+ //validate 1: Monitor::getHtmlForTabLinks
$this->assertContains(
'',
$html
@@ -143,7 +141,7 @@ class PMA_ServerStatusMonitor_Test extends PHPUnit_Framework_TestCase
__('Done dragging (rearranging) charts'),
$html
);
- //validate 2: PMA_getHtmlForSettingsDialog
+ //validate 2: Monitor::getHtmlForSettingsDialog
$this->assertContains(
'
';
+ $retval .= '';
+ $retval .= '';
+ $retval .= '
';
- $retval .= '';
- $retval .= '';
- $retval .= '