Add additional metric types

config/collector.php

@@ -2,20 +2,25 @@
 
 return [
 
+    /**
+     * Enable or disable the collector
+     */
+    'enabled'   =>  true,
+
 	/**
 	 * The API endpoint for logs
 	 */
-    'endpoint' => 'http://collector.test:8000',
+    'endpoint'  => 'http://collector.test:8000',
 
     /**
      * Your API key
      */
-    'api_key'  => '123456',
+    'api_key'   => '123456',
 
     /**
      * Should batch requests
      */
-    'batch'    => true,
+    'batch'     => true,
 
     /**
      * The default key used to store

src/Collector.php

@@ -47,19 +47,28 @@ public function setCount($count)
 
     public function send()
     {
+        if(!config('collector.enabled'))
+            return;
+
         $generator = new Generator();
         $generator->fire($this->metric);
     }
 
     public function queue()
     {
+        if(!config('collector.enabled'))
+            return;
+
         CreateMetric::dispatch($this->metric);
     }
 
     public function batch()
     {
 
-        $data = Cache::get(config('collector.cache_key'));
+        if(!config('collector.enabled'))
+            return;
+
+        $data = Cache::get(config('collector.cache_key') . '_' . $this->metric->type);
 
         if(is_array($data)){
             $data[] = $this->metric;
@@ -69,6 +78,6 @@ public function batch()
             $data[] = $this->metric;
         }
 
-        Cache::put(config('collector.cache_key'), $data);
+        Cache::put(config('collector.cache_key') . '_' . $this->metric->type, $data);
     }
 }

src/Collector/Generator.php

@@ -6,14 +6,14 @@
 
 class Generator
 {
-	private function endPoint()
+	private function endPoint($uri)
 	{
-		return config('collector.endpoint') . '/collect';
+		return config('collector.endpoint')."/{$uri}/add";
 	}
 
-	private function batchEndPoint()
+	private function batchEndPoint($uri)
 	{
-		return config('collector.endpoint') . '/collect/batch';
+		return config('collector.endpoint')."/{$uri}/batch";
 	}
 
 	private function apiKey()
@@ -28,15 +28,22 @@ private function httpClient()
 
 	public function fire($metric)
 	{
+		$data['metrics'] = $metric;
+
 		$client = $this->httpClient();	
-		$response = $client->request('POST',$this->endPoint(), ['form_params' => $metric]);
+		$response = $client->request('POST',$this->endPoint($metric->type), ['form_params' => $data]);
 		return $this->handleResponse($response);
 	}
 
 	public function batchFire($metric_array)
 	{
+		if(!is_array($metric_array))
+			return;
+
+		$data['metrics'] = $metric_array;
+
 		$client = $this->httpClient();	
-		$response = $client->request('POST',$this->batchEndPoint(), ['form_params' => $metric_array]);
+		$response = $client->request('POST',$this->batchEndPoint($metric_array[0]->type), ['form_params' => $data]);
 		return $this->handleResponse($response);
 	}
 

src/ExampleMetric/GenericCounter.php

@@ -5,49 +5,22 @@
 class GenericCounter 
 {
 
-	/**
-	 * The name of the counter
-	 * @var string
-	 */
-	public $name = '';
-
-	/**
-	 * The description of what this counter means
-	 * 
-	 * @var string
-	 */
-	public $description = '';
-
-	/**
-	 * The X-Axis label
-	 * 
-	 * @var string
-	 */
-	public $x_axis = '';
-
-	/**
-	 * The Y-Axis label
-	 * 
-	 * @var string
-	 */
-	public $y_axis = '';
-
 	/**
 	 * The type of Sample
+	 *
+	 * Monotonically incrementing counter
+	 * 
 	 * 	- counter
-	 * 	- gauge
-	 * 	- histogram
 	 * 	
 	 * @var string
 	 */
-	public $type = '';
+	public $type = 'counter';
 
 	/**
-	 * The api_key for authorization
-	 * 
+	 * The name of the counter
 	 * @var string
 	 */
-	public $api_key = '';
+	public $name = '';
 
 	/**
 	 * The datetime of the counter measurement
@@ -64,6 +37,6 @@ class GenericCounter
 	 * 
 	 * @var integer
 	 */
-	public $counter = 0;
+	public $metric = 0;
 
 }

src/ExampleMetric/GenericGauge.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Turbo124\Collector\ExampleMetric;
+
+class GenericGauge 
+{
+
+	/**
+	 * The type of Sample
+	 *
+	 *	A gauge can be used to measure a given value 
+	 *	per time interval
+	 * 
+	 * 	- gauge
+	 * 	
+	 * @var string
+	 */
+	public $type = 'gauge';
+
+	/**
+	 * The name of the counter
+	 * @var string
+	 */
+	public $name = '';
+
+	/**
+	 * The datetime of the counter measurement
+	 *
+	 * date("Y-m-d H:i:s")
+	 * 
+	 * @var DateTime 
+	 */
+	public $datetime;
+
+	/**
+	 * The increment amount... should always be 
+	 * set to 0
+	 * 
+	 * @var double
+	 */
+	public $metric = 0;
+
+}

src/ExampleMetric/GenericMultiMetric.php

@@ -0,0 +1,76 @@
+<?php
+
+namespace Turbo124\Collector\ExampleMetric;
+
+class GenericMultiMetric 
+{
+
+	/**
+	 * The type of Sample
+	 *
+	 *	A multric metric allows for multiple
+	 *	datapoints per time interval
+	 * 
+	 * 	- multi_metric
+	 * 	
+	 * @var string
+	 */
+	public $type = 'multi_metric';
+
+	/**
+	 * The name of the counter
+	 * @var string
+	 */
+	public $name = '';
+
+	/**
+	 * The datetime of the counter measurement
+	 *
+	 * date("Y-m-d H:i:s")
+	 * 
+	 * @var DateTime 
+	 */
+	public $datetime;
+
+	/**
+	 * The metric value
+	 * set to 0
+	 * 
+	 * @var double
+	 */
+	public $metric1 = 0;
+
+	/**
+	 * The metric value
+	 * set to 0
+	 * 
+	 * @var double
+	 */
+	public $metric2 = 0;
+
+	/**
+	 * The metric value
+	 * set to 0
+	 * 
+	 * @var double
+	 */
+	public $metric3 = 0;
+
+	/**
+	 * The metric value
+	 * set to 0
+	 * 
+	 * @var double
+	 */
+	public $metric4 = 0;
+
+	/**
+	 * The metric value
+	 * set to 0
+	 * 
+	 * @var double
+	 */
+	public $metric5 = 0;
+
+
+}

src/Jobs/BatchMetrics.php

@@ -30,7 +30,7 @@ public function handle()
     {
 
         $metrics = Cache::get(config('collector.cache_key'));
-
+        
         $generator = new Generator();
         $generator->batchFire($metrics);