nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-30 16:14:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/0.3.1'

Browse Source
This commit is contained in:
Walter Dal Mut
2015-03-20 20:47:45 +01:00
parent f8f33bd16a 704ea74277
commit b690eb9748
5 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
0.3.0 0.3.1
spec/InfluxDB/Filter/ColumnsPointsFilterSpec.php
+3 -3
View File
@@ -19,7 +19,7 @@ class ColumnsPointsFilterSpec extends ObjectBehavior
function it_should_map_columns_with_points() function it_should_map_columns_with_points()
{ {
$response = json_decode('[{"name":"hd_used","columns":["time","sequence_number","value","host","mount","time_precision"],"points":[[1410591684,11820001,23.2,"serverA","/mnt","s"]]}]'); $response = json_decode('[{"name":"hd_used","columns":["time","sequence_number","value","host","mount","time_precision"],"points":[[1410591684,11820001,23.2,"serverA","/mnt","s"]]}]', true);
$this->filter($response)->shouldBeEqualTo([ $this->filter($response)->shouldBeEqualTo([
"hd_used" => [ "hd_used" => [
@@ -37,7 +37,7 @@ class ColumnsPointsFilterSpec extends ObjectBehavior
function it_should_map_also_a_series_list() function it_should_map_also_a_series_list()
{ {
$response = json_decode('[{"name":"list_series_result","columns":["time","name"],"points":[[0,"hd_used"]]}]'); $response = json_decode('[{"name":"list_series_result","columns":["time","name"],"points":[[0,"hd_used"]]}]', true);
$this->filter($response)->shouldBeEqualTo([ $this->filter($response)->shouldBeEqualTo([
"list_series_result" => [ "list_series_result" => [
@@ -51,7 +51,7 @@ class ColumnsPointsFilterSpec extends ObjectBehavior
function it_should_reply_to_an_empty_set() function it_should_reply_to_an_empty_set()
{ {
$response = json_decode('[]'); $response = json_decode('[]', true);
$this->filter($response)->shouldBeEqualTo([]); $this->filter($response)->shouldBeEqualTo([]);
} }
src/InfluxDB/Filter/ColumnsPointsFilter.php
+4 -4
View File
@@ -15,11 +15,11 @@ class ColumnsPointsFilter implements FilterInterface
$response = []; $response = [];
foreach ($metrics as $metric) { foreach ($metrics as $metric) {
$columns = $metric->columns; $columns = $metric["columns"];
$response[$metric->name] = []; $response[$metric["name"]] = [];
foreach ($metric->points as $point) { foreach ($metric["points"] as $point) {
$response[$metric->name][] = array_combine($columns, $point); $response[$metric["name"]][] = array_combine($columns, $point);
} }
} }
tests/InfluxDB/ClientTest.php
+16
View File
@@ -5,6 +5,7 @@ use InfluxDB\Adapter\GuzzleAdapter as InfluxHttpAdapter;
use InfluxDB\Options; use InfluxDB\Options;
use InfluxDB\Adapter\UdpAdapter; use InfluxDB\Adapter\UdpAdapter;
use GuzzleHttp\Client as GuzzleHttpClient; use GuzzleHttp\Client as GuzzleHttpClient;
use InfluxDB\Filter\ColumnsPointsFilter;
class ClientTest extends \PHPUnit_Framework_TestCase class ClientTest extends \PHPUnit_Framework_TestCase
{ {
@@ -146,6 +147,21 @@ class ClientTest extends \PHPUnit_Framework_TestCase
$this->assertEquals("udp.test", $body[0]["name"]); $this->assertEquals("udp.test", $body[0]["name"]);
} }
/**
* @group filter
*/
public function testColumnsPointsFilterWorksCorrectly()
{
$this->object->setFilter(new ColumnsPointsFilter());
$this->object->mark("tcp.test", ["time" => 1410591552, "mark" => "element"], "s");
$body = $this->object->query("select mark from tcp.test", "ms");
$this->assertCount(1, $body);
$this->assertEquals("element", $body["tcp.test"][0]["mark"]);
$this->assertSame(1410591552000, $body["tcp.test"][0]["time"]);
}
public function testListActiveDatabses() public function testListActiveDatabses()
{ {
$databases = $this->object->getDatabases(); $databases = $this->object->getDatabases();
tests/InfluxDB/HttpAdapterTest.php
+16
View File
@@ -3,6 +3,7 @@ namespace InfluxDB;
use InfluxDB\Adapter\HttpAdapter; use InfluxDB\Adapter\HttpAdapter;
use InfluxDB\Adapter\UdpAdapter; use InfluxDB\Adapter\UdpAdapter;
use InfluxDB\Filter\ColumnsPointsFilter;
class HttpAdapterTest extends \PHPUnit_Framework_TestCase class HttpAdapterTest extends \PHPUnit_Framework_TestCase
{ {
@@ -109,6 +110,21 @@ class HttpAdapterTest extends \PHPUnit_Framework_TestCase
$this->assertEquals("1410591552000", $body[0]["points"][0][0]); $this->assertEquals("1410591552000", $body[0]["points"][0][0]);
} }
/**
* @group filter
*/
public function testColumnsPointsFilterWorksCorrectly()
{
$this->object->setFilter(new ColumnsPointsFilter());
$this->object->mark("tcp.test", ["time" => 1410591552, "mark" => "element"], "s");
$body = $this->object->query("select mark from tcp.test", "ms");
$this->assertCount(1, $body);
$this->assertEquals("element", $body["tcp.test"][0]["mark"]);
$this->assertSame(1410591552000, $body["tcp.test"][0]["time"]);
}
public function testListActiveDatabses() public function testListActiveDatabses()
{ {
$databases = $this->object->getDatabases(); $databases = $this->object->getDatabases();