improve status page

diff --git a/data/templates/status.htm b/data/templates/status.htm
index a5699efa663fed4aabc60f9d76b01f895dc45576..79e875e21c5f81f4a7f4d79e93405d5a9a4dbaf3 100644 (file)
--- a/data/templates/status.htm
+++ b/data/templates/status.htm
@@ -15,26 +15,33 @@
 <table class="table table-striped">
  <thead>
   <tr>
 <table class="table table-striped">
  <thead>
   <tr>

+   <th>Group</th>

    <th>Item</th>
    <th>Item</th>

-   <th>Number</th>
+   <th style="text-align: right">Number</th>

   </tr>
  </thead>
  <tbody>
   <tr>
   </tr>
  </thead>
  <tbody>
   <tr>

-   <td>Elasticsearch documents</td>
-   <td>{{esDocs}}</td>
+   <td rowspan="2">Elasticsearch</td>
+   <td>Documents</td>
+   <td style="text-align: right">{{esStatus.documents}}</td>

   </tr>
   <tr>
   </tr>
   <tr>

+   <td>Index size</td>
+   <td style="text-align: right">{{esStatus.size_human}}</td>
+  </tr>
+  <tr>
+   <td rowspan="3">Gearman</td>

    <td>Open tasks</td>
    <td>Open tasks</td>

-   <td>{{gearStatus.tasks}}</td>
+   <td style="text-align: right">{{gearStatus.tasks}}</td>

   </tr>
   <tr>
    <td>Tasks being processed</td>
   </tr>
   <tr>
    <td>Tasks being processed</td>

-   <td>{{gearStatus.processing}}</td>
+   <td style="text-align: right">{{gearStatus.processing}}</td>

   </tr>
   <tr>
    <td>Task workers</td>
   </tr>
   <tr>
    <td>Task workers</td>

-   <td>{{gearStatus.workers}}</td>
+   <td style="text-align: right">{{gearStatus.workers}}</td>

   </tr>
  </tbody>
 </table>
   </tr>
  </tbody>
 </table>

diff --git a/src/phinde/Elasticsearch.php b/src/phinde/Elasticsearch.php
index 069cf1fefd74b495ea3a7aa6b4d11da8bf242a45..6c90480475d152a361ea0eb645dfb842265310a7 100644 (file)
--- a/src/phinde/Elasticsearch.php
+++ b/src/phinde/Elasticsearch.php
@@ -58,14 +58,18 @@ class Elasticsearch
         $r->send();
     }
 
         $r->send();
     }
 

-    public function countDocuments()
+    public function getIndexStatus()

     {
         $r = new Elasticsearch_Request(
     {
         $r = new Elasticsearch_Request(

-            $this->baseUrl . 'document/_count',
+            $this->baseUrl . '_stats/docs,store',

             \HTTP_Request2::METHOD_GET
         );
         $res = $r->send();
             \HTTP_Request2::METHOD_GET
         );
         $res = $r->send();

-        return json_decode($res->getBody())->count;
+        $data = json_decode($res->getBody());
+        return array(
+            'documents' => $data->_all->total->docs->count,
+            'size'      => $data->_all->total->store->size_in_bytes,
+        );

     }
 
     public function search($query, $filters, $site, $page, $perPage, $sort)
     }
 
     public function search($query, $filters, $site, $page, $perPage, $sort)

diff --git a/www/status.php b/www/status.php
index 3bc52cf832a4385957e7e485bf82d9c0237b4234..08e2a0dfd906dd81a0b9e34194e32dbdcdb20313 100644 (file)
--- a/www/status.php
+++ b/www/status.php
@@ -3,15 +3,28 @@ namespace phinde;
 require 'www-header.php';
 
 $es = new Elasticsearch($GLOBALS['phinde']['elasticsearch']);
 require 'www-header.php';
 
 $es = new Elasticsearch($GLOBALS['phinde']['elasticsearch']);

-$esDocs = $es->countDocuments();
+$esStatus = $es->getIndexStatus();

 
 $queue = new Queue();
 $gearStatus = $queue->getServerStatus();
 
 
 $queue = new Queue();
 $gearStatus = $queue->getServerStatus();
 

+/**
+ * @link http://jeffreysambells.com/2012/10/25/human-readable-filesize-php
+ */
+function human_filesize($bytes, $decimals = 2)
+{
+    $size = array('B','kiB','MiB','GiB','TiB','PiB','EiB','ZiB','YiB');
+    $factor = floor((strlen($bytes) - 1) / 3);
+    return sprintf("%.{$decimals}f", $bytes / pow(1024, $factor))
+        . ' ' . @$size[$factor];
+}
+
+$esStatus['size_human'] = human_filesize($esStatus['size']);
+

 render(
     'status',
     array(
 render(
     'status',
     array(

-        'esDocs' => $esDocs,
+        'esStatus'   => $esStatus,

         'gearStatus' => $gearStatus,
     )
 );
         'gearStatus' => $gearStatus,
     )
 );